From d509c12c1e02e79c247c162ca7f28b15532301d5 Mon Sep 17 00:00:00 2001
From: Johannes Knutsen <johannes@knutseninfo.no>
Date: Tue, 10 Aug 2010 13:24:58 +0200
Subject: [PATCH] emit end-of-stream in end of track callback, pull for
 gstreamer end-of-stream messages and send end of track mpd command

---
 mopidy/backends/libspotify.py | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/mopidy/backends/libspotify.py b/mopidy/backends/libspotify.py
index 8e193949..159cbf75 100644
--- a/mopidy/backends/libspotify.py
+++ b/mopidy/backends/libspotify.py
@@ -196,6 +196,21 @@ class LibspotifyTranslator(object):
             tracks=[cls.to_mopidy_track(t) for t in spotify_playlist],
         )
 
+class GstreamerMessageBusProcess(threading.Thread):
+    def __init__(self, core_queue, pipeline):
+        super(GstreamerMessageBusProcess, self).__init__()
+        self.core_queue = core_queue
+        self.bus = pipeline.get_bus()
+
+    def run(self):
+        while True:
+            message = self.bus.pop()
+            if message is not None:
+                logger.debug('Got Gstreamer message of type: %s' % message.type)
+            if message is not None and (
+                    message.type == gst.MESSAGE_EOS
+                    or message.type == gst.MESSAGE_ERROR):
+                self.core_queue.put({'command': 'end_of_track'})
 
 class LibspotifySessionManager(SpotifySessionManager, threading.Thread):
     cache_location = os.path.expanduser(settings.SPOTIFY_LIB_CACHE)
@@ -229,6 +244,9 @@ class LibspotifySessionManager(SpotifySessionManager, threading.Thread):
 
         gst.element_link_many(self.gsrc, self.gsink)
 
+        message_process = GstreamerMessageBusProcess(self.core_queue, self.gstreamer_pipeline)
+        message_process.start()
+
     def run(self):
         self.connect()
 
@@ -292,8 +310,9 @@ class LibspotifySessionManager(SpotifySessionManager, threading.Thread):
 
     def end_of_track(self, session):
         """Callback used by pyspotify"""
-        logger.debug('End of track')
-        self.core_queue.put({'command': 'end_of_track'})
+        logger.debug('End of track.')
+        self.gsrc.emit('end-of-stream')
+        logger.debug('End of stream sent to gstreamer.')
 
     def search(self, query, connection):
         """Search method used by Mopidy backend"""