diff options
| author | Jeffrey Goode <jeffg7@gmail.com> | 2009-11-12 05:04:23 +0000 |
|---|---|---|
| committer | Jeffrey Goode <jeffg7@gmail.com> | 2009-11-12 05:04:23 +0000 |
| commit | b8793f85a5a5f2c4e89cad7e5696f8553055964e (patch) | |
| tree | 0c4af2ef8cdc2dd8fd42f174655c70c5a8e6abcb | |
| parent | 3a17bb909220fb441a28c8a5581eaaf8b96ddebe (diff) | |
| download | rockbox-b8793f85a5a5f2c4e89cad7e5696f8553055964e.zip rockbox-b8793f85a5a5f2c4e89cad7e5696f8553055964e.tar.gz rockbox-b8793f85a5a5f2c4e89cad7e5696f8553055964e.tar.bz2 rockbox-b8793f85a5a5f2c4e89cad7e5696f8553055964e.tar.xz | |
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
| -rw-r--r-- | apps/menus/settings_menu.c | 2 | ||||
| -rw-r--r-- | 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 04de59f..5c30e59 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 bb1c5ea..9c7beca 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. */ |