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.tar.gz rockbox-b8793f85a5a5f2c4e89cad7e5696f8553055964e.zip |
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 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) | |||
367 | oldval = global_settings.talk_file_clip; | 367 | oldval = global_settings.talk_file_clip; |
368 | break; | 368 | break; |
369 | case ACTION_EXIT_MENUITEM: | 369 | case ACTION_EXIT_MENUITEM: |
370 | #if (CONFIG_CODEC == SWCODEC) && defined(HAVE_CROSSFADE) | 370 | #ifdef HAVE_CROSSFADE |
371 | audio_set_crossfade(global_settings.crossfade); | 371 | audio_set_crossfade(global_settings.crossfade); |
372 | #endif | 372 | #endif |
373 | if (this_item == &talk_dir_clip_item) | 373 | 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 @@ | |||
138 | * for example in hardware, but not controllable*/ | 138 | * for example in hardware, but not controllable*/ |
139 | #define BACKLIGHT_FADING_TARGET 0x8 | 139 | #define BACKLIGHT_FADING_TARGET 0x8 |
140 | 140 | ||
141 | /*include support for crossfading - requires significant PCM buffer space*/ | ||
142 | #if MEMORYSIZE > 2 | ||
143 | #define HAVE_CROSSFADE | ||
144 | #endif | ||
145 | |||
146 | /* CONFIG_CHARGING */ | 141 | /* CONFIG_CHARGING */ |
147 | 142 | ||
148 | /* Generic types */ | 143 | /* Generic types */ |
@@ -678,6 +673,11 @@ Lyre prototype 1 */ | |||
678 | #define HAVE_WAKEUP_OBJECTS | 673 | #define HAVE_WAKEUP_OBJECTS |
679 | #endif | 674 | #endif |
680 | 675 | ||
676 | /*include support for crossfading - requires significant PCM buffer space*/ | ||
677 | #if MEMORYSIZE > 2 | ||
678 | #define HAVE_CROSSFADE | ||
679 | #endif | ||
680 | |||
681 | #endif /* (CONFIG_CODEC == SWCODEC) */ | 681 | #endif /* (CONFIG_CODEC == SWCODEC) */ |
682 | 682 | ||
683 | /* Determine if accesses should be strictly long aligned. */ | 683 | /* Determine if accesses should be strictly long aligned. */ |