better handling of "end of playlist"

1 files changed, 12 insertions, 0 deletions

diff --git a/streamer.c b/streamer.c
index 4d2973d7..3cfb5ce4 100644
--- a/streamer.c
+++ b/streamer.c
@@ -27,6 +27,8 @@
 #include "common.h"
 #include "streamer.h"
 #include "playback.h"
+#include "messagepump.h"
+#include "messages.h"
 
 static SRC_STATE *src;
 static SRC_DATA srcdata;
@@ -83,6 +85,16 @@ streamer_thread (uintptr_t ctx) {
                 p_pause ();
             }
         }
+        else if (nextsong == -2) {
+            nextsong = -1;
+            p_stop ();
+            messagepump_push (M_SONGCHANGED, 0, pl_get_idx_of (playlist_current_ptr), -1);
+            continue;
+        }
+        else if (p_isstopped ()) {
+            usleep (3000);
+            continue;
+        }
         streamer_lock ();
         if (streambuffer_fill < STREAM_BUFFER_SIZE) {
             int sz = STREAM_BUFFER_SIZE - streambuffer_fill;