Integrating and testing of playback

[watersofshiloah] / src / player.py

diff --git a/src/player.py b/src/player.py
index c4a06de..9288470 100644 (file)
--- a/src/player.py
+++ b/src/player.py
@@ -2,6 +2,9 @@ import logging
 
 import gobject
 
+import util.misc as misc_utils
+import stream
+
 
 _moduleLogger = logging.getLogger(__name__)
 
@@ -19,20 +22,35 @@ class Player(gobject.GObject):
                        gobject.TYPE_NONE,
                        (gobject.TYPE_PYOBJECT, ),
                ),
+               'error' : (
+                       gobject.SIGNAL_RUN_LAST,
+                       gobject.TYPE_NONE,
+                       (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT),
+               ),
        }
 
+       STATE_PLAY = stream.GSTStream.STATE_PLAY
+       STATE_PAUSE = stream.GSTStream.STATE_PAUSE
+       STATE_STOP = stream.GSTStream.STATE_STOP
+
        def __init__(self, index):
                gobject.GObject.__init__(self)
                self._index = index
                self._node = None
-               self._state = "play"
+               self._stream = stream.GSTStream()
+               self._stream.connect("state-change", self._on_stream_state)
+               self._stream.connect("eof", self._on_stream_eof)
+               self._stream.connect("error", self._on_stream_error)
 
        def set_piece_by_node(self, node):
-               assert node.is_leaf() or node is None
+               assert node is None or node.is_leaf(), node
                if self._node is node:
                        return
                self._node = node
-               self.emit("title_change", self._state)
+               if self._node is not None:
+                       self._stream.set_file(self._node.uri)
+               _moduleLogger.info("New node %r" % self._node)
+               self.emit("title_change", self._node)
 
        @property
        def node(self):
@@ -58,29 +76,20 @@ class Player(gobject.GObject):
 
        @property
        def state(self):
-               return self._state
+               return self._stream.state
 
        def play(self):
-               if self._state == "play":
-                       return
-               self._state = "play"
-               self.emit("state_change", self._state)
                _moduleLogger.info("play")
+               self._stream.play()
 
        def pause(self):
-               if self._state == "pause":
-                       return
-               self._state = "pause"
-               self.emit("state_change", self._state)
                _moduleLogger.info("pause")
+               self._stream.pause()
 
        def stop(self):
-               if self._state == "stop":
-                       return
-               self._state = "stop"
-               self.set_piece_by_node(None)
-               self.emit("state_change", self._state)
                _moduleLogger.info("stop")
+               self._stream.stop()
+               self.set_piece_by_node(None)
 
        def back(self):
                _moduleLogger.info("back")
@@ -88,5 +97,20 @@ class Player(gobject.GObject):
        def next(self):
                _moduleLogger.info("next")
 
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_stream_state(self, s, state):
+               _moduleLogger.info("State change %r" % state)
+               self.emit("state_change", state)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_stream_eof(self, s, uri):
+               _moduleLogger.info("EOF %s" % uri)
+               self.next()
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_stream_error(self, s, error, debug):
+               _moduleLogger.info("Error %s %s" % (error, debug))
+               self.emit("error", error, debug)
+
 
 gobject.type_register(Player)