Changeset 8631 for branches/gajim_0.11.1/src/music_track_listener.py

Timestamp:

08/30/07 22:33:19 (15 months ago)

Author:

roidelapluie

Message:

0.11.2: [tristil] better banshee music player support. fixes #2940

Files:

• branches/gajim_0.11.1/src/music_track_listener.py (modified) (4 diffs)

branches/gajim_0.11.1/src/music_track_listener.py

@@ -25 +25 @@
 
 class MusicTrackInfo(object):
-        __slots__ = ['title', 'album', 'artist', 'duration', 'track_number']
+        __slots__ = ['title', 'album', 'artist', 'duration', 'track_number',
+                'paused']
 
 
@@ -64 +65 @@
                 ## Banshee
                 banshee_bus = dbus.SessionBus()
-                dubus = banshee_bus.get_object('org.freedesktop.DBus', '/org/freedesktop/dbus')
+                dubus = banshee_bus.get_object('org.freedesktop.DBus',
+                        '/org/freedesktop/dbus')
                 self.dubus_methods = dbus.Interface(dubus, 'org.freedesktop.DBus')
+                self.current_banshee_title = ''
+                self.banshee_paused_before = False
+                self.banshee_is_here = False
+                gobject.timeout_add(10000, self._check_if_banshee_bus)
                 if self.dubus_methods.NameHasOwner('org.gnome.Banshee'):
                         self._get_banshee_bus()
+                        self.banshee_is_here = True
                 # Otherwise, it opens Banshee!
                 self.banshee_props ={}
-                self.current_banshee_title = ''
                 gobject.timeout_add(1000, self._banshee_check_track_status)
-
+        
+        def _check_if_banshee_bus(self):
+                if self.dubus_methods.NameHasOwner('org.gnome.Banshee'):
+                        self._get_banshee_bus()
+                        self.banshee_is_here = True
+                else:
+                        self.banshee_is_here = False
+                return True
+
+                
         def _get_banshee_bus(self):
                 bus = dbus.SessionBus()
@@ -130 +145 @@
                         self._get_banshee_bus()
 
-                if self.dubus_methods.NameHasOwner('org.gnome.Banshee'):
-                        self.banshee_props['title'] = self.banshee_methods.GetPlayingTitle()
-                        self.banshee_props['album'] = self.banshee_methods.GetPlayingAlbum()
-                        self.banshee_props['artist'] = self.banshee_methods.GetPlayingArtist()
-                        self.banshee_props['duration'] = \
+                if self.dubus_methods.NameHasOwner('org.gnome.Banshee') and self.banshee_is_here:
+                        try:
+                                self.banshee_props['title'] = self.banshee_methods.GetPlayingTitle()
+                                self.banshee_props['album'] = self.banshee_methods.GetPlayingAlbum()
+                                self.banshee_props['artist'] = self.banshee_methods.\
+                                        GetPlayingArtist()
+                                self.banshee_props['duration'] = \
                                 self.banshee_methods.GetPlayingDuration()
-                        info = self._banshee_properties_extract(self.banshee_props)
+                                self.banshee_props['paused'] = self.banshee_methods.\
+                                        GetPlayingStatus()
+                                info = self._banshee_properties_extract(self.banshee_props)
+                        except dbus.DBusException, err:
+                                info = None
+
+                                for key in self.banshee_props.keys():
+                                        self.banshee_props[key] = ''
+                                self.banshee_is_here = False
+
                         if self.current_banshee_title != self.banshee_props['title']:
                                 self.emit('music-track-changed', info)
+                                self.banshee_paused_before = False
+                        if self.banshee_props['paused'] == 0 and self.banshee_paused_before ==\
+                        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
                         self.current_banshee_title = self.banshee_props['title']
                 return 1
@@ -152 +187 @@
                 info.artist = props['artist']
                 info.duration = int(props['duration'])
+                info.paused = props['paused']
                 return info