3 files changed, 79 insertions, 5 deletions

diff --git a/playlist.c b/playlist.c
index 58d3680c..934132c3 100644
--- a/playlist.c
+++ b/playlist.c
@@ -54,8 +54,12 @@ playItem_t *playlist_tail[PL_MAX_ITERATORS];
 int playlist_current_row[PL_MAX_ITERATORS];
 
 playItem_t *playlist_current_ptr;
-int pl_count = 0;
-float pl_totaltime = 0;
+static int pl_count = 0;
+static float pl_totaltime = 0;
+
+#define PLAYQUEUE_SIZE 100
+static playItem_t *playqueue[100];
+static int playqueue_count = 0;
 
 void
 pl_free (void) {
@@ -687,6 +691,7 @@ pl_remove (playItem_t *it) {
     if (playlist_current_ptr == it) {
         playlist_current_ptr = NULL;
     }
+    pl_playqueue_remove (it);
 
     // remove from linear list
     if (it->prev[PL_MAIN]) {
@@ -877,6 +882,7 @@ pl_item_free (playItem_t *it) {
 
 int
 pl_prevsong (void) {
+    pl_playqueue_clear ();
     if (!playlist_head[PL_MAIN]) {
         streamer_set_nextsong (-2, 1);
         return 0;
@@ -949,6 +955,14 @@ pl_prevsong (void) {
 
 int
 pl_nextsong (int reason) {
+    if (playqueue_count > 0) {
+        playItem_t *it = playqueue[0];
+        pl_playqueue_pop ();
+        int r = pl_get_idx_of (it);
+        streamer_set_nextsong (r, 1);
+        return 0;
+    }
+
     playItem_t *curr = streamer_get_streaming_track ();
     if (!playlist_head[PL_MAIN]) {
         streamer_set_nextsong (-2, 1);
@@ -1908,3 +1922,50 @@ pl_process_search (const char *text) {
     }
     return search_count;
 }
+
+int
+pl_playqueue_push (playItem_t *it) {
+    if (playqueue_count == PLAYQUEUE_SIZE) {
+        trace ("playqueue is full\n");
+        return -1;
+    }
+    playqueue[playqueue_count++] = it;
+    return 0;
+}
+
+void
+pl_playqueue_clear (void) {
+    playqueue_count = 0;
+}
+
+void
+pl_playqueue_pop (void) {
+    if (!playqueue_count) {
+        return;
+    }
+    if (playqueue_count == 1) {
+        playqueue_count = 0;
+        return;
+    }
+    memmove (&playqueue[0], &playqueue[1], (playqueue_count-1) * sizeof (playItem_t*));
+    playqueue_count--;
+}
+
+void
+pl_playqueue_remove (playItem_t *it) {
+    for (;;) {
+        int i;
+        for (i = 0; i < playqueue_count; i++) {
+            if (playqueue[i] == it) {
+                if (i < playqueue_count-1) {
+                    memmove (&playqueue[i], &playqueue[i+1], (playqueue_count-i) * sizeof (playItem_t*));
+                }
+                playqueue_count--;
+                break;
+            }
+        }
+        if (i == playqueue_count) {
+            break;
+        }
+    }
+}
diff --git a/playlist.h b/playlist.h
index 7350227e..c24392ea 100644
--- a/playlist.h
+++ b/playlist.h
@@ -58,9 +58,6 @@ extern playItem_t *playlist_tail[PL_MAX_ITERATORS]; // tail of linked list
 extern int playlist_current_row[PL_MAX_ITERATORS]; // current row (cursor)
 extern playItem_t *playlist_current_ptr; // pointer to a real current playlist item (or NULL)
 
-extern int pl_count;
-extern float pl_totaltime;
-
 int
 pl_add_dir (const char *dirname, int (*cb)(playItem_t *it, void *data), void *user_data);
 
@@ -214,4 +211,17 @@ pl_process_search (const char *text);
 void
 pl_sort (int iter, int id, const char *format, int ascending);
 
+// playqueue support functions
+int
+pl_playqueue_push (playItem_t *it);
+
+void
+pl_playqueue_clear (void);
+
+void
+pl_playqueue_pop (void);
+
+void
+pl_playqueue_remove (playItem_t *it);
+
 #endif // __PLAYLIST_H
diff --git a/streamer.c b/streamer.c
index 1fae0256..abd57c2b 100644
--- a/streamer.c
+++ b/streamer.c
@@ -910,14 +910,17 @@ streamer_configchanged (void) {
 void
 streamer_play_current_track (void) {
     if (p_ispaused ()) {
+        // unpause currently paused track
         p_unpause ();
         plug_trigger_event_paused (0);
     }
     else if (playlist_current_row[PL_MAIN] != -1) {
+        // play currently selected track
         p_stop ();
         streamer_set_nextsong (playlist_current_row[PL_MAIN], 1);
     }
     else {
+        // restart currently playing track
         p_stop ();
         streamer_set_nextsong (0, 1);
     }