diff options
author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-07-10 17:06:52 +0200 |
---|---|---|
committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-07-10 17:06:52 +0200 |
commit | 859b8bb032ac6cb4f1118b869cd115c561d4f2f5 (patch) | |
tree | 6488d677bc9e4e8061ac1da5c20bb3909ed276ad /src/media-player.vala | |
parent | 503210d8ee47e21370fc2751ca88b89715221449 (diff) | |
download | ayatana-indicator-sound-859b8bb032ac6cb4f1118b869cd115c561d4f2f5.tar.gz ayatana-indicator-sound-859b8bb032ac6cb4f1118b869cd115c561d4f2f5.tar.bz2 ayatana-indicator-sound-859b8bb032ac6cb4f1118b869cd115c561d4f2f5.zip |
Expose playlists in the menu if the player exports them
Diffstat (limited to 'src/media-player.vala')
-rw-r--r-- | src/media-player.vala | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/src/media-player.vala b/src/media-player.vala index 9c18f10..7326708 100644 --- a/src/media-player.vala +++ b/src/media-player.vala @@ -84,6 +84,8 @@ public class MediaPlayer: Object { get; set; } + public signal void playlists_changed (); + /** * Attach this object to a process of the associated media player. The player must own @dbus_name and * implement the org.mpris.MediaPlayer2.Player interface. @@ -98,6 +100,8 @@ public class MediaPlayer: Object { this._dbus_name = dbus_name; Bus.get_proxy.begin<MprisPlayer> (BusType.SESSION, dbus_name, "/org/mpris/MediaPlayer2", DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, got_proxy); + Bus.get_proxy.begin<MprisPlaylists> (BusType.SESSION, dbus_name, "/org/mpris/MediaPlayer2", + DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, got_playlists_proxy); } /** @@ -160,10 +164,31 @@ public class MediaPlayer: Object { this.proxy.Previous.begin (); } + public uint get_n_playlists () { + return this.playlists != null ? this.playlists.length : 0; + } + + public string get_playlist_id (int index) { + return_val_if_fail (index < this.playlists.length, ""); + return this.playlists[index].path; + } + + public string get_playlist_name (int index) { + return_val_if_fail (index < this.playlists.length, ""); + return this.playlists[index].name; + } + + public void activate_playlist_by_name (string name) { + if (this.playlists_proxy != null) + this.playlists_proxy.ActivatePlaylist.begin (new ObjectPath (name)); + } + DesktopAppInfo appinfo; MprisPlayer? proxy; + MprisPlaylists ?playlists_proxy; string _dbus_name; bool play_when_attached = false; + PlaylistDetails[] playlists = null; void got_proxy (Object? obj, AsyncResult res) { try { @@ -191,6 +216,42 @@ public class MediaPlayer: Object { } } + void fetch_playlists () { + /* The proxy is created even when the interface is not supported. GDBusProxy will + return 0 for the PlaylistCount property in that case. */ + if (this.playlists_proxy != null && this.playlists_proxy.PlaylistCount > 0) { + this.playlists_proxy.GetPlaylists.begin (0, 100, "Alphabetical", false, (obj, res) => { + try { + this.playlists = playlists_proxy.GetPlaylists.end (res); + this.playlists_changed (); + } + catch (Error e) { + warning ("could not fetch playlists: %s", e.message); + this.playlists = null; + } + }); + } + else { + this.playlists = null; + this.playlists_changed (); + } + } + + void got_playlists_proxy (Object? obj, AsyncResult res) { + try { + this.playlists_proxy = Bus.get_proxy.end (res); + + var gproxy = this.proxy as DBusProxy; + gproxy.g_properties_changed.connect (this.playlists_proxy_properties_changed); + } + catch (Error e) { + warning ("unable to create mpris plalists proxy: %s", e.message); + return; + } + + Timeout.add (500, () => { this.fetch_playlists (); return false; } ); + } + /* some players (e.g. Spotify) don't follow the spec closely and pass single strings in metadata fields * where an array of string is expected */ static string sanitize_metadata_value (Variant? v) { @@ -215,6 +276,11 @@ public class MediaPlayer: Object { this.update_current_track (metadata); } + void playlists_proxy_properties_changed (DBusProxy proxy, Variant changed_properties, string[] invalidated_properties) { + if (changed_properties.lookup ("PlaylistCount", "u", null)) + this.fetch_playlists (); + } + void update_current_track (Variant metadata) { if (metadata != null) { this.current_track = new Track ( |