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

If reshuffling with repeat all songs in queue active, set shuffle-head

Browse Source 
to current playing song. Previously the shuffle-head was set to the next
song after the current, therefor the UpNext-queue appeared empty after
adding new songs to the queue.
This commit is contained in:
chme 2014-07-25 18:51:34 +02:00
parent 87b415b0d4
commit a6c2a25642
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/player.c
View File

@ -982,7 +982,7 @@ source_stop(struct player_source *ps)
/*
* Shuffles the items between head and tail (excluding head and tail)
*/
static struct player_source *
static void
source_shuffle(struct player_source *head, struct player_source *tail)
{
struct player_source *ps;
@ -991,10 +991,10 @@ source_shuffle(struct player_source *head, struct player_source *tail)
int i;
if (!head)
return NULL;
return;
if (!tail)
return NULL;
return;
if (!shuffle)
{
@ -1019,14 +1019,14 @@ source_shuffle(struct player_source *head, struct player_source *tail)
// Do not reshuffle queue with one item
if (nitems < 1)
return NULL;
return;
// Construct array for number of items in queue
ps_array = (struct player_source **)malloc(nitems * sizeof(struct player_source *));
if (!ps_array)
{
DPRINTF(E_LOG, L_PLAYER, "Could not allocate memory for shuffle array\n");
return NULL;
return;
}
// Fill array with items in queue (excluding head and tail)
@ -1060,17 +1060,14 @@ source_shuffle(struct player_source *head, struct player_source *tail)
head->shuffle_next = ps_array[0];
tail->shuffle_prev = ps_array[nitems - 1];
ps = ps_array[0];
free(ps_array);
return ps;
return;
}
static void
source_reshuffle(void)
{
struct player_source *ps;
struct player_source *head;
struct player_source *tail;
@ -1086,13 +1083,10 @@ source_reshuffle(void)
else
tail = source_head;
ps = source_shuffle(head, tail);
if (!ps)
return;
source_shuffle(head, tail);
if (repeat == REPEAT_ALL)
shuffle_head = ps;
shuffle_head = head;
}
/* Helper */