better handling of "end of playlist"

1 files changed, 23 insertions, 1 deletions

diff --git a/playlist.c b/playlist.c
index 60c9f6d9..7769bfb0 100644
--- a/playlist.c
+++ b/playlist.c
@@ -710,7 +710,8 @@ pl_nextsong (int reason) {
                     it = playlist_head[PL_SHUFFLE];
                 }
                 else {
-                    return -1;
+                    streamer_set_nextsong (-2, 1);
+                    return 0;
                 }
             }
             if (!it) {
@@ -735,6 +736,10 @@ pl_nextsong (int reason) {
             if (pl_loop_mode == 0) {
                 it = playlist_head[PL_MAIN];
             }
+            else {
+                streamer_set_nextsong (-2, 1);
+                return 0;
+            }
         }
         if (!it) {
             return -1;
@@ -881,6 +886,17 @@ pl_delete_selected (void) {
 }
 
 void
+pl_crop_selected (void) {
+    playItem_t *next = NULL;
+    for (playItem_t *it = playlist_head[PL_MAIN]; it; it = next) {
+        next = it->next[PL_MAIN];
+        if (!it->selected) {
+            pl_remove (it);
+        }
+    }
+}
+
+void
 pl_set_order (int order) {
     pl_order = order;
 }
@@ -1153,3 +1169,9 @@ load_fail:
     return -1;
 }
 
+void
+pl_select_all (void) {
+    for (playItem_t *it = playlist_head[PL_MAIN]; it; it = it->next[PL_MAIN]) {
+        it->selected = 1;
+    }
+}