playlist: implement Fisher-Yates shuffle properly
MPD's shuffling algorithm was not implemented well: it considers songs which were already swapped, making it somewhat non-random. Fix the Fisher-Yates shuffle algorithm by passing the proper bounds to the PRNG.
This commit is contained in:
parent
e7c7e652a3
commit
d8fc8ca7ba
|
@ -1118,7 +1118,7 @@ static void randomizeOrder(int start, int end)
|
|||
clearPlayerQueue();
|
||||
|
||||
for (i = start; i <= end; i++) {
|
||||
ri = g_rand_int_range(g_rand, start, end + 1);
|
||||
ri = g_rand_int_range(g_rand, i, end + 1);
|
||||
if (ri == playlist.current)
|
||||
playlist.current = i;
|
||||
else if (i == playlist.current)
|
||||
|
@ -1201,7 +1201,7 @@ void shufflePlaylist(void)
|
|||
}
|
||||
/* shuffle the rest of the list */
|
||||
for (; i < playlist.length; i++) {
|
||||
ri = g_rand_int_range(g_rand, 1, playlist.length);
|
||||
ri = g_rand_int_range(g_rand, i, playlist.length);
|
||||
swapSongs(i, ri);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue