summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2006-05-14 14:08:26 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2006-05-14 14:08:26 +0000
commitc9a1b4e9aaba244d27a1e770052697bab8a6ae3e (patch)
treeff6769999df5307c30f99761c2db928c6e3c70b2
parent784b4c9a5b073a600f451d87b2026f832661530a (diff)
downloadrockbox-c9a1b4e9aaba244d27a1e770052697bab8a6ae3e.tar.gz
rockbox-c9a1b4e9aaba244d27a1e770052697bab8a6ae3e.tar.bz2
rockbox-c9a1b4e9aaba244d27a1e770052697bab8a6ae3e.zip
Correctly enable crossfade mixmode only when not skipping tracks
manually. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9926 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/pcmbuf.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index fda7543c02..6d4c091745 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -65,7 +65,7 @@ static void (*position_callback)(size_t size) IDATA_ATTR;
/* Crossfade related state */
static bool crossfade_enabled;
-static bool crossfade_mode;
+static bool crossfade_mixmode;
static bool crossfade_active IDATA_ATTR;
static bool crossfade_init IDATA_ATTR;
@@ -310,7 +310,11 @@ bool pcmbuf_crossfade_init(bool manual_skip)
pcmbuf_boost(true);
/* Don't enable mix mode when skipping tracks manually. */
- crossfade_mode = manual_skip && global_settings.crossfade_fade_out_mixmode;
+ if (manual_skip)
+ crossfade_mixmode = false;
+ else
+ crossfade_mixmode = global_settings.crossfade_fade_out_mixmode;
+
crossfade_init = true;
return true;
@@ -452,7 +456,7 @@ static bool pcmbuf_flush_fillpos(void)
static void crossfade_process_buffer(size_t fade_in_delay,
size_t fade_out_delay, size_t fade_out_rem)
{
- if (!crossfade_mode)
+ if (!crossfade_mixmode)
{
/* Fade out the specified amount of the already processed audio */
size_t total_fade_out = fade_out_rem;