summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Goode <jeffg7@gmail.com>2009-11-10 04:21:40 +0000
committerJeffrey Goode <jeffg7@gmail.com>2009-11-10 04:21:40 +0000
commitdd93ef41bb9a75e92b664b97bc34f2bcf17edcde (patch)
treec4ca9e1d1e400ebb52b8a9afacd50523319d4f64
parent9e0953432a3a73cd42e77c804a4557b5337e0d0f (diff)
downloadrockbox-dd93ef41bb9a75e92b664b97bc34f2bcf17edcde.tar.gz
rockbox-dd93ef41bb9a75e92b664b97bc34f2bcf17edcde.zip
HAVE_CROSSFADE defs: fix yellow and red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23598 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_tokens.c4
-rw-r--r--apps/pcmbuf.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index b271bfedfc..a456bbca23 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -766,10 +766,14 @@ const char *get_token_value(struct gui_wps *gwps,
766 766
767#if (CONFIG_CODEC == SWCODEC) 767#if (CONFIG_CODEC == SWCODEC)
768 case WPS_TOKEN_CROSSFADE: 768 case WPS_TOKEN_CROSSFADE:
769#ifdef HAVE_CROSSFADE
769 if (intval) 770 if (intval)
770 *intval = global_settings.crossfade + 1; 771 *intval = global_settings.crossfade + 1;
771 snprintf(buf, buf_size, "%d", global_settings.crossfade); 772 snprintf(buf, buf_size, "%d", global_settings.crossfade);
772 return buf; 773 return buf;
774#else
775 return NULL;
776#endif
773 777
774 case WPS_TOKEN_REPLAYGAIN: 778 case WPS_TOKEN_REPLAYGAIN:
775 { 779 {
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index 6f3dd80ed2..75d8152f7e 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -534,6 +534,8 @@ static void start_processed_track_change(bool auto_skip)
534 crossfade_mixmode = auto_skip && global_settings.crossfade_fade_out_mixmode; 534 crossfade_mixmode = auto_skip && global_settings.crossfade_fade_out_mixmode;
535 535
536 crossfade_track_change_started = true; 536 crossfade_track_change_started = true;
537#else
538 (void)auto_skip;
537#endif 539#endif
538} 540}
539 541