diff options
| author | Jeffrey Goode <jeffg7@gmail.com> | 2009-11-10 04:21:40 +0000 |
|---|---|---|
| committer | Jeffrey Goode <jeffg7@gmail.com> | 2009-11-10 04:21:40 +0000 |
| commit | dd93ef41bb9a75e92b664b97bc34f2bcf17edcde (patch) | |
| tree | c4ca9e1d1e400ebb52b8a9afacd50523319d4f64 | |
| parent | 9e0953432a3a73cd42e77c804a4557b5337e0d0f (diff) | |
| download | rockbox-dd93ef41bb9a75e92b664b97bc34f2bcf17edcde.zip rockbox-dd93ef41bb9a75e92b664b97bc34f2bcf17edcde.tar.gz rockbox-dd93ef41bb9a75e92b664b97bc34f2bcf17edcde.tar.bz2 rockbox-dd93ef41bb9a75e92b664b97bc34f2bcf17edcde.tar.xz | |
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.c | 4 | ||||
| -rw-r--r-- | apps/pcmbuf.c | 2 |
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 b271bfe..a456bbc 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 6f3dd80..75d8152 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 } |