From: Ed Page <eopage@byu.net>
Date: Wed, 12 May 2010 11:08:11 +0000 (-0500)
Subject: Presenter now does play when not active rather than stop
X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=commitdiff_plain;h=26178fdaeca905e3c74e464a4d6e5b6510cb4f44

Presenter now does play when not active rather than stop
---

diff --git a/src/mormonchannel_gtk.py b/src/mormonchannel_gtk.py
index 64762d3..aa31895 100755
--- a/src/mormonchannel_gtk.py
+++ b/src/mormonchannel_gtk.py
@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 """
-@todo Switch presenters to show Play when not active rather than Stop
 @todo Implement Jump TO
 @todo Implement highlighting of current track
 @todo Restructure so there is a windows/ folder with a file per source
diff --git a/src/windows.py b/src/windows.py
index fd7ece3..9b38968 100644
--- a/src/windows.py
+++ b/src/windows.py
@@ -343,7 +343,7 @@ class RadioWindow(BasicWindow):
 			if self._active:
 				self._presenter.set_state(self._store.STORE_LOOKUP["pause"])
 			else:
-				self._presenter.set_state(self._store.STORE_LOOKUP["stop"])
+				self._presenter.set_state(self._store.STORE_LOOKUP["play"])
 		elif state == self._player.STATE_PAUSE:
 			self._presenter.set_state(self._store.STORE_LOOKUP["play"])
 		elif state == self._player.STATE_STOP:
@@ -401,7 +401,7 @@ class RadioWindow(BasicWindow):
 				if self._active:
 					imageName = "pause"
 				else:
-					imageName = "stop"
+					imageName = "play"
 			elif self._player.state == self._player.STATE_PAUSE:
 				imageName = "play"
 			elif self._player.state == self._player.STATE_STOP:
@@ -429,7 +429,8 @@ class RadioWindow(BasicWindow):
 				if self._active:
 					self._player.pause()
 				else:
-					self._player.stop()
+					self._player.set_piece_by_node(self._childNode)
+					self._player.play()
 			elif self._player.state == self._player.STATE_PAUSE:
 				self._player.play()
 			elif self._player.state == self._player.STATE_STOP:
@@ -828,7 +829,7 @@ class ConferenceTalkWindow(BasicWindow):
 			if self._active:
 				self._presenter.set_state(self._store.STORE_LOOKUP["pause"])
 			else:
-				self._presenter.set_state(self._store.STORE_LOOKUP["stop"])
+				self._presenter.set_state(self._store.STORE_LOOKUP["play"])
 		elif state == self._player.STATE_PAUSE:
 			self._presenter.set_state(self._store.STORE_LOOKUP["play"])
 		elif state == self._player.STATE_STOP:
@@ -865,7 +866,7 @@ class ConferenceTalkWindow(BasicWindow):
 				if self._active:
 					imageName = "pause"
 				else:
-					imageName = "stop"
+					imageName = "play"
 			elif self._player.state == self._player.STATE_PAUSE:
 				imageName = "play"
 			elif self._player.state == self._player.STATE_STOP:
@@ -892,7 +893,8 @@ class ConferenceTalkWindow(BasicWindow):
 				if self._active:
 					self._player.pause()
 				else:
-					self._player.stop()
+					self._player.set_piece_by_node(self._node)
+					self._player.play()
 			elif self._player.state == self._player.STATE_PAUSE:
 				self._player.play()
 			elif self._player.state == self._player.STATE_STOP: