diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2006-01-27 16:25:44 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2006-01-27 16:25:44 +0000 |
commit | a4f8d1c621ee1ad1e9649e2e84dddac3108d73b6 (patch) | |
tree | b68c7e30eccd593e0514061577cb411cfc82707d /apps/pcmbuf.c | |
parent | b7c29193f99537e4def128cc2dcf4d36edc5ac26 (diff) | |
download | rockbox-a4f8d1c621ee1ad1e9649e2e84dddac3108d73b6.tar.gz rockbox-a4f8d1c621ee1ad1e9649e2e84dddac3108d73b6.zip |
Don't use crossfader mix mode when skipping tracks manually.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8470 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/pcmbuf.c')
-rw-r--r-- | apps/pcmbuf.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c index e21f735bbb..f184672bd1 100644 --- a/apps/pcmbuf.c +++ b/apps/pcmbuf.c @@ -233,7 +233,7 @@ bool pcmbuf_is_lowdata(void) return false; } -bool pcmbuf_crossfade_init(void) +bool pcmbuf_crossfade_init(bool manual_skip) { if (pcmbuf_size - audiobuffer_free < CHUNK_SIZE * 8 || !pcmbuf_is_crossfade_enabled() @@ -244,8 +244,12 @@ bool pcmbuf_crossfade_init(void) logf("pcmbuf_crossfade_init"); pcmbuf_boost(true); - crossfade_mode = global_settings.crossfade_fade_out_mixmode - ? CFM_MIX : CFM_CROSSFADE; + /* Don't enable mix mode when skipping tracks manually. */ + if (manual_skip) + crossfade_mode = CFM_CROSSFADE; + else + crossfade_mode = global_settings.crossfade_fade_out_mixmode + ? CFM_MIX : CFM_CROSSFADE; crossfade_init = true; return true; |