From dd93ef41bb9a75e92b664b97bc34f2bcf17edcde Mon Sep 17 00:00:00 2001 From: Jeffrey Goode Date: Tue, 10 Nov 2009 04:21:40 +0000 Subject: HAVE_CROSSFADE defs: fix yellow and red git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23598 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_tokens.c | 4 ++++ apps/pcmbuf.c | 2 ++ 2 files changed, 6 insertions(+) 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, #if (CONFIG_CODEC == SWCODEC) case WPS_TOKEN_CROSSFADE: +#ifdef HAVE_CROSSFADE if (intval) *intval = global_settings.crossfade + 1; snprintf(buf, buf_size, "%d", global_settings.crossfade); return buf; +#else + return NULL; +#endif case WPS_TOKEN_REPLAYGAIN: { 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) crossfade_mixmode = auto_skip && global_settings.crossfade_fade_out_mixmode; crossfade_track_change_started = true; +#else + (void)auto_skip; #endif } -- cgit v1.2.3