diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-12-27 01:51:33 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-12-27 01:51:33 +0000 |
commit | 594099f1735e4ca92a9cc10d8375e728a72256f1 (patch) | |
tree | bf38aaceaa0f4d07657c12f7ce595aa118be97d5 /apps | |
parent | 022f7bbd605e4316eb0a2c7aff3197a8391fe60d (diff) | |
download | rockbox-594099f1735e4ca92a9cc10d8375e728a72256f1.tar.gz rockbox-594099f1735e4ca92a9cc10d8375e728a72256f1.zip |
Fix fs#6293. Repeat Shuffle will now shuffle the playlist if shuffle is
off.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11845 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/playlist.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/playlist.c b/apps/playlist.c index 27c8676b96..2928db8a4f 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
@@ -1033,8 +1033,7 @@ static int get_next_index(const struct playlist_info* playlist, int steps, | |||
1033 | if (repeat_mode == -1) | 1033 | if (repeat_mode == -1) |
1034 | repeat_mode = global_settings.repeat_mode; | 1034 | repeat_mode = global_settings.repeat_mode; |
1035 | 1035 | ||
1036 | if (repeat_mode == REPEAT_SHUFFLE && | 1036 | if (repeat_mode == REPEAT_SHUFFLE && playlist->amount <= 1) |
1037 | (!global_settings.playlist_shuffle || playlist->amount <= 1)) | ||
1038 | repeat_mode = REPEAT_ALL; | 1037 | repeat_mode = REPEAT_ALL; |
1039 | 1038 | ||
1040 | steps = calculate_step_count(playlist, steps); | 1039 | steps = calculate_step_count(playlist, steps); |
@@ -2505,8 +2504,7 @@ int playlist_next(int steps) | |||
2505 | if (index < 0) | 2504 | if (index < 0) |
2506 | { | 2505 | { |
2507 | /* end of playlist... or is it */ | 2506 | /* end of playlist... or is it */ |
2508 | if (global_settings.repeat_mode == REPEAT_SHUFFLE && | 2507 | if (global_settings.repeat_mode == REPEAT_SHUFFLE && |
2509 | global_settings.playlist_shuffle && | ||
2510 | playlist->amount > 1) | 2508 | playlist->amount > 1) |
2511 | { | 2509 | { |
2512 | /* Repeat shuffle mode. Re-shuffle playlist and resume play */ | 2510 | /* Repeat shuffle mode. Re-shuffle playlist and resume play */ |