From b8793f85a5a5f2c4e89cad7e5696f8553055964e Mon Sep 17 00:00:00 2001 From: Jeffrey Goode Date: Thu, 12 Nov 2009 05:04:23 +0000 Subject: Fix HAVE_CROSSFADE definition in config to apply only to swcodec targets git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23620 a1c6a512-1295-4272-9138-f99709370657 --- apps/menus/settings_menu.c | 2 +- firmware/export/config.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 04de59fe20..5c30e5982f 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -367,7 +367,7 @@ static int talk_callback(int action,const struct menu_item_ex *this_item) oldval = global_settings.talk_file_clip; break; case ACTION_EXIT_MENUITEM: -#if (CONFIG_CODEC == SWCODEC) && defined(HAVE_CROSSFADE) +#ifdef HAVE_CROSSFADE audio_set_crossfade(global_settings.crossfade); #endif if (this_item == &talk_dir_clip_item) diff --git a/firmware/export/config.h b/firmware/export/config.h index bb1c5eab19..9c7beca2bd 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -138,11 +138,6 @@ * for example in hardware, but not controllable*/ #define BACKLIGHT_FADING_TARGET 0x8 -/*include support for crossfading - requires significant PCM buffer space*/ -#if MEMORYSIZE > 2 -#define HAVE_CROSSFADE -#endif - /* CONFIG_CHARGING */ /* Generic types */ @@ -678,6 +673,11 @@ Lyre prototype 1 */ #define HAVE_WAKEUP_OBJECTS #endif +/*include support for crossfading - requires significant PCM buffer space*/ +#if MEMORYSIZE > 2 +#define HAVE_CROSSFADE +#endif + #endif /* (CONFIG_CODEC == SWCODEC) */ /* Determine if accesses should be strictly long aligned. */ -- cgit v1.2.3