copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'musiclistener' into 'master'

Browse source 
MusicTrackListener: add support for clementine

See merge request gajim/gajim!199
This commit is contained in:
Yann Leboulanger 2018-01-24 23:35:20 +01:00
commit 90bc646b09
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gajim/music_track_listener.py
View file

@ -35,6 +35,7 @@ def _get_music_players():
players = [ players = [
'org.mpris.MediaPlayer2.audacious', 'org.mpris.MediaPlayer2.audacious',
'org.mpris.MediaPlayer2.bmp', 'org.mpris.MediaPlayer2.bmp',
'org.mpris.MediaPlayer2.clementine',
'org.mpris.MediaPlayer2.GnomeMusic', 'org.mpris.MediaPlayer2.GnomeMusic',
'org.mpris.MediaPlayer2.quodlibet', 'org.mpris.MediaPlayer2.quodlibet',
'org.mpris.MediaPlayer2.rhythmbox', 'org.mpris.MediaPlayer2.rhythmbox',
@ -65,7 +66,6 @@ class MusicTrackListener(GObject.GObject):
def __init__(self): def __init__(self):
super(MusicTrackListener, self).__init__() super(MusicTrackListener, self).__init__()
self._last_playing_music = None
self.con = {} self.con = {}
players = _get_music_players() players = _get_music_players()
@ -92,7 +92,6 @@ class MusicTrackListener(GObject.GObject):
info = self.get_playing_track(name) info = self.get_playing_track(name)
if info is not None: if info is not None:
self._last_playing_music = info
self.emit('music-track-changed', info) self.emit('music-track-changed', info)
def _vanished(self, connection, name, *user_data): def _vanished(self, connection, name, *user_data):
@ -114,7 +113,6 @@ class MusicTrackListener(GObject.GObject):
log.info('Signal received: %s - %s', interface_name, parameters) log.info('Signal received: %s - %s', interface_name, parameters)
info = self.get_playing_track(user_data[0]) info = self.get_playing_track(user_data[0])
self._last_playing_music = info
self.emit('music-track-changed', info) self.emit('music-track-changed', info)
@ -166,7 +164,6 @@ class MusicTrackListener(GObject.GObject):
raise raise
else: else:
info = self._properties_extract(result[0]) info = self._properties_extract(result[0])
self._last_playing_music = info
return info return info