MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-26 07:05:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from chme/playqueuefix

Browse Source 
Fix skip to next song while the last song in Up Next is playing
This commit is contained in:
ejurgensen 2014-08-02 13:27:21 +02:00
commit 191ad341c2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/player.c
View File

@ -1085,6 +1085,7 @@ source_reshuffle(void)
source_shuffle(head, tail); source_shuffle(head, tail);
// Setting shuffle_head to the current song (head) will show all reshuffled songs in the playlist
if (repeat == REPEAT_ALL) if (repeat == REPEAT_ALL)
shuffle_head = head; shuffle_head = head;
} }
@ -1230,7 +1231,12 @@ source_next(int force)
if (cur_streaming && (ps == shuffle_head)) if (cur_streaming && (ps == shuffle_head))
{ {
source_reshuffle(); source_reshuffle();
ps = shuffle_head;
/* After source_reshuffle with "repeat all", shuffle_head is (re-)set to cur_streaming,
* therefor get the next song in queue and set the start of the playlist to this song.
*/
ps = cur_streaming->shuffle_next;
shuffle_head = ps;
} }
limit = shuffle_head; limit = shuffle_head;