Ticket #3946: mpd.diff

src/music_track_listener.py

@@ -95 +95 @@
                         self.banshee_props ={}
                         gobject.timeout_add_seconds(1, self._banshee_check_track_status)
 
+                ## MPD
+                try:
+                        import mpd
+                        self.mpdclient = mpd.MPDClient()
+                        self.mpd_host = 'localhost'
+                        self.mpd_port = 6600
+                        if os.environ.has_key('MPD_HOST'):
+                                self.mpd_host = os.environ['MPD_HOST']
+                        if os.environ.has_key('MPD_PORT'):
+                                self.mpd_port = os.environ['MPD_PORT']
+                        self.mpdclient.connect(self.mpd_host, self.mpd_port)
+                        self.mpd_exists = True
+                        self.mpd_is_here = True
+                        self.mpd_current_song = None
+                        self.mpd_paused_before = False
+                        gobject.timeout_add_seconds(10, self._mpd_check_status)
+                        gobject.timeout_add_seconds(1, self._mpd_check_track_status)
+                except:
+                        self.mpd_exists = False
+                        self.mpd_is_here = False
+
         def _check_if_banshee_bus(self):
                 if self.dubus_methods.NameHasOwner('org.gnome.Banshee'):
                         self._get_banshee_bus()
@@ -222 +243 @@
                         False:
                                 self.emit('music-track-changed', info)
                                 self.banshee_paused_before = True
-                        else: 
-                                if self.banshee_paused_before and self.banshee_props['paused'] == 1:
-                                        self.emit('music-track-changed', info)
-                                        self.banshee_paused_before = False
+                        elif self.banshee_paused_before and self.banshee_props['paused'] == 1:
+                                self.emit('music-track-changed', info)
+                                self.banshee_paused_before = False
                         self.current_banshee_title = self.banshee_props['title']
                 return 1
 
@@ -242 +262 @@
                 info.paused = props['paused']
                 return info
 
+        def _mpd_check_status(self):
+                if self.mpd_exists is True:
+                        try:
+                                self.mpdclient.status()
+                                self.mpd_is_here = True
+                        except:
+                                try:
+                                        self.mpdclient.disconnect()
+                                        self.mpdclient.connect(self.mpd_host, self.mpd_port)
+                                        self.mpd_is_here = True
+                                except:
+                                        self.mpd_is_here = False
+                return True
+
+        def _mpd_check_track_status(self):
+                if not self.mpd_is_here:
+                        return
+
+                try:
+                        self.mpd_song = self.mpdclient.currentsong()
+                        if self.mpdclient.status()['state'] == 'pause':
+                                self.mpd_paused =  0
+                        else:
+                                self.mpd_paused = 1
+
+                        info =  MusicTrackInfo()
+                        info.title = self.mpd_song['title']
+                        info.album = self.mpd_song['album']
+                        info.artist = self.mpd_song['artist']
+                        info.duration = self.mpd_song['time']
+                        info.track_number = self.mpd_song['track']
+                        info.paused = self.mpd_paused
+                except:
+                        info = None
+                        self.mpd_paused = 0
+                        self.mpd_is_here = False
+
+                if self.mpd_current_song != self.mpd_song:
+                        self.emit('music-track-changed', info)
+                        self.mpd_current_song = self.mpd_song
+                if self.mpd_paused == 1 and self.mpd_paused_before == False:
+                        self.emit('music-track-changed', info)
+                        self.mpd_paused_before = True
+                elif self.mpd_paused == 0 and self.mpd_paused_before == True:
+                        self.emit('music-track-changed', info)
+                        self.mpd_paused_before = False
+                return True
+
         def get_playing_track(self):
                 '''Return a MusicTrackInfo for the currently playing
                 song, or None if no song is playing'''