devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix fs#6293. Repeat Shuffle will now shuffle the playlist if shuffle is

Browse source 
off.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11845 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2006-12-27 01:51:33 +00:00
parent 022f7bbd60
commit 594099f173
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/playlist.c
View file

@ -1033,8 +1033,7 @@ static int get_next_index(const struct playlist_info* playlist, int steps,
if (repeat_mode == -1) if (repeat_mode == -1)
repeat_mode = global_settings.repeat_mode; repeat_mode = global_settings.repeat_mode;
if (repeat_mode == REPEAT_SHUFFLE && if (repeat_mode == REPEAT_SHUFFLE && playlist->amount <= 1)
(!global_settings.playlist_shuffle || playlist->amount <= 1))
repeat_mode = REPEAT_ALL; repeat_mode = REPEAT_ALL;
steps = calculate_step_count(playlist, steps); steps = calculate_step_count(playlist, steps);
@ -2506,7 +2505,6 @@ int playlist_next(int steps)
{ {
/* end of playlist... or is it */ /* end of playlist... or is it */
if (global_settings.repeat_mode == REPEAT_SHUFFLE && if (global_settings.repeat_mode == REPEAT_SHUFFLE &&
global_settings.playlist_shuffle &&
playlist->amount > 1) playlist->amount > 1)
{ {
/* Repeat shuffle mode. Re-shuffle playlist and resume play */ /* Repeat shuffle mode. Re-shuffle playlist and resume play */