Merge pull request #341 from grimpy/nowplaying_activatable

Now Playing: Check for mpris service in activatable services
This commit is contained in:
enkore 2016-03-26 21:25:51 +01:00
commit cf8ae97a43

View File

@ -70,8 +70,14 @@ class NowPlaying(IntervalModule):
def find_player(self): def find_player(self):
obj = dbus.SessionBus().get_object("org.freedesktop.DBus", "/org/freedesktop/DBus") obj = dbus.SessionBus().get_object("org.freedesktop.DBus", "/org/freedesktop/DBus")
method = obj.get_dbus_method('ListNames', 'org.freedesktop.DBus')
players = [a for a in method() if a.startswith("org.mpris.MediaPlayer2.")] def get_players(methodname):
method = obj.get_dbus_method(methodname, 'org.freedesktop.DBus')
return [a for a in method() if a.startswith("org.mpris.MediaPlayer2.")]
players = get_players('ListNames')
if not players:
players = get_players('ListActivatableNames')
if self.old_player in players: if self.old_player in players:
return self.old_player return self.old_player
if not players: if not players: