cover art for mpris

src/mpris.vala

@@ -40,7 +40,7 @@ class MprisPlayer : Object {
     internal signal void on_stop ();
     internal signal void on_play ();
     internal signal void on_seek (int64 offset);
-    internal signal void on_set_position (string track_id, int64 position);
+    internal signal void on_set_position (ObjectPath track_id, int64 position);
 
     public void next () throws Error { this.on_next (); }
     public void previous () throws Error { this.on_previous (); }
@@ -49,7 +49,7 @@ class MprisPlayer : Object {
     public void stop () throws Error { this.on_stop (); }
     public void play () throws Error { this.on_play (); }
     public void seek (int64 offset) throws Error { this.on_seek (offset); }
-    public void set_position (string track_id, int64 position) throws Error { this.on_set_position (track_id, position); }
+    public void set_position (ObjectPath track_id, int64 position) throws Error { this.on_set_position (track_id, position); }
     public void open_uri (string uri) throws Error { assert (false); }
 
     public signal void seeked (int64 position);
@@ -72,6 +72,8 @@ class MprisPlayer : Object {
     [CCode (notify = false)]
     public bool can_control { get { return true; } }
 
+    internal Subsonic.Client api { get; set; }
+
     internal MprisPlayer (DBusConnection conn, Playbin playbin) {
         playbin.bind_property (
             "state",
@@ -128,7 +130,7 @@ class MprisPlayer : Object {
             var metadata = new HashTable<string, Variant> (null, null);
             metadata["mpris:trackid"] = new ObjectPath (@"/eu/callcc/audrey/track/$(song.id)");
             metadata["mpris:length"] = (int64) song.duration * 1000000;
-            // TODO: metadata["mpris:artUrl"] = 
+            if (this.api != null) metadata["mpris:artUrl"] = this.api.cover_art_uri (song.id);
             metadata["xesam:album"] = song.album;
             metadata["xesam:artist"] = new string[] {song.artist};
             if (song.genre != null) metadata["xesam:genre"] = song.genre;
@@ -152,6 +154,12 @@ class MprisPlayer : Object {
             if (playbin.state == PlaybinState.PAUSED) playbin.play ();
             else if (playbin.state == PlaybinState.PLAYING) playbin.pause ();
         });
+        this.on_stop.connect (() => {
+            playbin.stop ();
+        });
+
+        // TODO: seeking from mpris
+        // TODO: trigger the seeked signal when applicable
 
         this.notify.connect ((p) => {
             var builder = new VariantBuilder (VariantType.ARRAY);

src/ui/window.vala

@@ -29,6 +29,9 @@ class Ui.Window : Adw.ApplicationWindow {
         Object (application: app);
     }
 
+    private Mpris mpris;
+    private MprisPlayer mpris_player;
+
     private void now_playing (Subsonic.Song song) {
         this.song = song;
         // api.scrobble.begin (this.song.id); TODO
@@ -62,8 +65,11 @@ class Ui.Window : Adw.ApplicationWindow {
             BusNameOwnerFlags.NONE,
             (conn) => {
                 try {
-                    conn.register_object ("/org/mpris/MediaPlayer2", new Mpris (this));
+                    this.mpris = new Mpris (this);
-                    conn.register_object ("/org/mpris/MediaPlayer2", new MprisPlayer (conn, this.playbin));
+                    this.mpris_player = new MprisPlayer (conn, this.playbin);
+
+                    conn.register_object ("/org/mpris/MediaPlayer2", this.mpris);
+                    conn.register_object ("/org/mpris/MediaPlayer2", this.mpris_player);
                 } catch (IOError e) {
                     error ("could not register dbus service: %s", e.message);
                 }
@@ -76,6 +82,7 @@ class Ui.Window : Adw.ApplicationWindow {
         this.setup.connected.connect ((api) => {
             this.api = api;
             this.playbin.api = api;
+            this.mpris_player.api = api;
             this.can_click_shuffle_all = true;
         });
         this.setup.load ();