src/playbin.vala

@@ -40,7 +40,6 @@ class Playbin : GLib.Object {
 
     private bool notify_next_playing;
     public signal void now_playing ();
-    public signal void stopped ();
 
     public double position { get; private set; default = 0.0; }
     public double duration { get; private set; default = 0.0; }
@@ -115,15 +114,10 @@ class Playbin : GLib.Object {
 
                         case 2:
                             assert (data.name == "playlist-pos");
-                            if (data.parse_int64 () < 0) {
-                                debug ("playlist-pos is null, sending stopped event");
-                                this.play_queue_position = this.play_queue.get_n_items ();
-                                this.song = null;
-                                this.state = PlaybinState.STOPPED;
-                                this.stopped ();
+                            if (data.format == Mpv.Format.NONE) {
+                                this.play_queue_position = 0;
                             } else {
                                 this.play_queue_position = (uint) data.parse_int64 ();
-                                debug (@"playlist-pos has been updated to $(this.play_queue_position)");
                             }
                             break;
 
@@ -133,16 +127,17 @@ class Playbin : GLib.Object {
                         }
                         break;
 
-                    case Mpv.EventId.START_FILE:
-                        debug ("START_FILE received");
-                        if (this.play_queue_position < this.play_queue.get_n_items ()) {
+                    case Mpv.EventId.FILE_LOADED:
+                        if (this.notify_next_playing) {
                             this.song = (Subsonic.Song) this.play_queue.get_item (this.play_queue_position);
                             this.now_playing ();
+                        } else {
+                            assert (this.song == (Subsonic.Song) this.play_queue.get_item (this.play_queue_position));
+                            this.notify_next_playing = true;
                         }
                         break;
 
                     case Mpv.EventId.END_FILE:
-                        debug ("END_FILE received");
                         var data = event.parse_end_file ();
                         if (data.error < 0) {
                             warning ("playback of track aborted: %s", data.error.to_string ());

src/ui/window.vala

@@ -82,10 +82,6 @@ class Ui.Window : Adw.ApplicationWindow {
                 }
             });
 
-            this.playbin.stopped.connect (() => {
-                this.playing_cover_art = Gdk.Paintable.empty (1, 1);
-            });
-
             this.play_queue.selection.user_selected.connect ((position) => {
                 this.playbin.select_track (position);
             });