diff options
| author | Jeffrey Goode <jeffg7@gmail.com> | 2009-11-12 15:42:37 +0000 |
|---|---|---|
| committer | Jeffrey Goode <jeffg7@gmail.com> | 2009-11-12 15:42:37 +0000 |
| commit | 29d2711115c81520e1ef27b67594d6ead507d8dd (patch) | |
| tree | 1d4cf7d98d0cc37ac24d16712ad2086dd2c2b171 /apps/pcmbuf.c | |
| parent | b8793f85a5a5f2c4e89cad7e5696f8553055964e (diff) | |
| download | rockbox-29d2711115c81520e1ef27b67594d6ead507d8dd.tar.gz rockbox-29d2711115c81520e1ef27b67594d6ead507d8dd.zip | |
Crossfade: fix shuffle OR manual skip functionality, verbiage and manual
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23621 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/pcmbuf.c')
| -rw-r--r-- | apps/pcmbuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c index 9bf4c96233..da4b76fc20 100644 --- a/apps/pcmbuf.c +++ b/apps/pcmbuf.c | |||
| @@ -493,8 +493,8 @@ void pcmbuf_start_track_change(bool auto_skip) | |||
| 493 | case CROSSFADE_ENABLE_SHUFFLE: | 493 | case CROSSFADE_ENABLE_SHUFFLE: |
| 494 | crossfade = global_settings.playlist_shuffle; | 494 | crossfade = global_settings.playlist_shuffle; |
| 495 | break; | 495 | break; |
| 496 | case CROSSFADE_ENABLE_SHUFFLE_AND_MANSKIP: | 496 | case CROSSFADE_ENABLE_SHUFFLE_OR_MANSKIP: |
| 497 | crossfade = global_settings.playlist_shuffle && !auto_skip; | 497 | crossfade = global_settings.playlist_shuffle || !auto_skip; |
| 498 | break; | 498 | break; |
| 499 | case CROSSFADE_ENABLE_ALWAYS: | 499 | case CROSSFADE_ENABLE_ALWAYS: |
| 500 | crossfade = true; | 500 | crossfade = true; |