diff options
| author | Jeffrey Goode <jeffg7@gmail.com> | 2009-11-10 03:46:08 +0000 |
|---|---|---|
| committer | Jeffrey Goode <jeffg7@gmail.com> | 2009-11-10 03:46:08 +0000 |
| commit | 9e0953432a3a73cd42e77c804a4557b5337e0d0f (patch) | |
| tree | 49b5a4fadb1d64e9e03228cebd78e4011fde70b1 /apps/menus/playback_menu.c | |
| parent | 78f8667d57e13ef579c892ccc5483b8baafd2fe6 (diff) | |
| download | rockbox-9e0953432a3a73cd42e77c804a4557b5337e0d0f.zip rockbox-9e0953432a3a73cd42e77c804a4557b5337e0d0f.tar.gz rockbox-9e0953432a3a73cd42e77c804a4557b5337e0d0f.tar.bz2 rockbox-9e0953432a3a73cd42e77c804a4557b5337e0d0f.tar.xz | |
Crossfade: carved out crossfade related code with lots of HAVE_CORSSFADE conditionals, eliminated fade buffer on low memory targets
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23597 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/playback_menu.c')
| -rw-r--r-- | apps/menus/playback_menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index 4c4b298..5be7a8c 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c @@ -40,7 +40,7 @@ #endif -#if CONFIG_CODEC == SWCODEC +#if (CONFIG_CODEC == SWCODEC) && defined(HAVE_CROSSFADE) static int setcrossfadeonexit_callback(int action,const struct menu_item_ex *this_item) { (void)this_item; @@ -90,19 +90,19 @@ MENUITEM_SETTING(fade_on_stop, &global_settings.fade_on_stop, NULL); MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL); #if CONFIG_CODEC == SWCODEC +#ifdef HAVE_CROSSFADE /* crossfade submenu */ MENUITEM_SETTING(crossfade, &global_settings.crossfade, setcrossfadeonexit_callback); MENUITEM_SETTING(crossfade_fade_in_delay, - &global_settings.crossfade_fade_in_delay, setcrossfadeonexit_callback); + &global_settings.crossfade_fade_in_delay, NULL); MENUITEM_SETTING(crossfade_fade_in_duration, - &global_settings.crossfade_fade_in_duration, setcrossfadeonexit_callback); + &global_settings.crossfade_fade_in_duration, NULL); MENUITEM_SETTING(crossfade_fade_out_delay, &global_settings.crossfade_fade_out_delay, setcrossfadeonexit_callback); MENUITEM_SETTING(crossfade_fade_out_duration, &global_settings.crossfade_fade_out_duration, setcrossfadeonexit_callback); MENUITEM_SETTING(crossfade_fade_out_mixmode, &global_settings.crossfade_fade_out_mixmode,NULL); -#ifdef HAVE_CROSSFADE MAKE_MENU(crossfade_settings_menu,ID2P(LANG_CROSSFADE),0, Icon_NOICON, &crossfade, &crossfade_fade_in_delay, &crossfade_fade_in_duration, &crossfade_fade_out_delay, &crossfade_fade_out_duration, @@ -187,7 +187,7 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0, #endif &fade_on_stop, &party_mode, -#if CONFIG_CODEC == SWCODEC && defined(HAVE_CROSSFADE) +#if (CONFIG_CODEC == SWCODEC) && defined(HAVE_CROSSFADE) &crossfade_settings_menu, #endif |