diff options
author | Alexey Yakovenko <wakeroid@gmail.com> | 2010-04-20 19:21:55 +0200 |
---|---|---|
committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-04-20 19:21:55 +0200 |
commit | 677a6e08e3c47de72257ccd03c75a07c4cd63812 (patch) | |
tree | 951c76ac5379489023938df5094adf3eed605bb8 | |
parent | b27d52578f21130ba5480e44468427528be53b17 (diff) |
fixed reshuffling playlist that is not current
-rw-r--r-- | playlist.c | 8 | ||||
-rw-r--r-- | playlist.h | 3 | ||||
-rw-r--r-- | streamer.c | 4 |
3 files changed, 11 insertions, 4 deletions
@@ -2115,9 +2115,8 @@ pl_select_all (void) { GLOBAL_UNLOCK; } - void -pl_reshuffle (playItem_t **ppmin, playItem_t **ppmax) { +plt_reshuffle (playlist_t *playlist, playItem_t **ppmin, playItem_t **ppmax) { GLOBAL_LOCK; playItem_t *pmin = NULL; playItem_t *pmax = NULL; @@ -2141,6 +2140,11 @@ pl_reshuffle (playItem_t **ppmin, playItem_t **ppmax) { } void +pl_reshuffle (playItem_t **ppmin, playItem_t **ppmax) { + plt_reshuffle (playlist, ppmin, ppmax); +} + +void pl_delete_all_meta (playItem_t *it) { LOCK; while (it->meta) { @@ -225,6 +225,9 @@ void pl_select_all (void); void +plt_reshuffle (playlist_t *playlist, playItem_t **ppmin, playItem_t **ppmax); + +void pl_reshuffle (playItem_t **ppmin, playItem_t **ppmax); // required to calculate total playtime @@ -232,7 +232,7 @@ streamer_move_to_nextsong (int reason) { if (!it) { // all songs played, reshuffle and try again if (pl_loop_mode == PLAYBACK_MODE_LOOP_ALL) { // loop - pl_reshuffle (&it, NULL); + plt_reshuffle (streamer_playlist, &it, NULL); } } if (!it) { @@ -268,7 +268,7 @@ streamer_move_to_nextsong (int reason) { trace ("all songs played! reshuffle\n"); // all songs played, reshuffle and try again if (pl_loop_mode == PLAYBACK_MODE_LOOP_ALL) { // loop - pl_reshuffle (&it, NULL); + plt_reshuffle (streamer_playlist, &it, NULL); } } if (!it) { |