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 | |
parent | 78f8667d57e13ef579c892ccc5483b8baafd2fe6 (diff) | |
download | rockbox-9e0953432a3a73cd42e77c804a4557b5337e0d0f.tar.gz rockbox-9e0953432a3a73cd42e77c804a4557b5337e0d0f.zip |
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')
-rw-r--r-- | apps/menus/playback_menu.c | 10 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index 4c4b29871e..5be7a8ca43 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | 42 | ||
43 | #if CONFIG_CODEC == SWCODEC | 43 | #if (CONFIG_CODEC == SWCODEC) && defined(HAVE_CROSSFADE) |
44 | static int setcrossfadeonexit_callback(int action,const struct menu_item_ex *this_item) | 44 | static int setcrossfadeonexit_callback(int action,const struct menu_item_ex *this_item) |
45 | { | 45 | { |
46 | (void)this_item; | 46 | (void)this_item; |
@@ -90,19 +90,19 @@ MENUITEM_SETTING(fade_on_stop, &global_settings.fade_on_stop, NULL); | |||
90 | MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL); | 90 | MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL); |
91 | 91 | ||
92 | #if CONFIG_CODEC == SWCODEC | 92 | #if CONFIG_CODEC == SWCODEC |
93 | #ifdef HAVE_CROSSFADE | ||
93 | /* crossfade submenu */ | 94 | /* crossfade submenu */ |
94 | MENUITEM_SETTING(crossfade, &global_settings.crossfade, setcrossfadeonexit_callback); | 95 | MENUITEM_SETTING(crossfade, &global_settings.crossfade, setcrossfadeonexit_callback); |
95 | MENUITEM_SETTING(crossfade_fade_in_delay, | 96 | MENUITEM_SETTING(crossfade_fade_in_delay, |
96 | &global_settings.crossfade_fade_in_delay, setcrossfadeonexit_callback); | 97 | &global_settings.crossfade_fade_in_delay, NULL); |
97 | MENUITEM_SETTING(crossfade_fade_in_duration, | 98 | MENUITEM_SETTING(crossfade_fade_in_duration, |
98 | &global_settings.crossfade_fade_in_duration, setcrossfadeonexit_callback); | 99 | &global_settings.crossfade_fade_in_duration, NULL); |
99 | MENUITEM_SETTING(crossfade_fade_out_delay, | 100 | MENUITEM_SETTING(crossfade_fade_out_delay, |
100 | &global_settings.crossfade_fade_out_delay, setcrossfadeonexit_callback); | 101 | &global_settings.crossfade_fade_out_delay, setcrossfadeonexit_callback); |
101 | MENUITEM_SETTING(crossfade_fade_out_duration, | 102 | MENUITEM_SETTING(crossfade_fade_out_duration, |
102 | &global_settings.crossfade_fade_out_duration, setcrossfadeonexit_callback); | 103 | &global_settings.crossfade_fade_out_duration, setcrossfadeonexit_callback); |
103 | MENUITEM_SETTING(crossfade_fade_out_mixmode, | 104 | MENUITEM_SETTING(crossfade_fade_out_mixmode, |
104 | &global_settings.crossfade_fade_out_mixmode,NULL); | 105 | &global_settings.crossfade_fade_out_mixmode,NULL); |
105 | #ifdef HAVE_CROSSFADE | ||
106 | MAKE_MENU(crossfade_settings_menu,ID2P(LANG_CROSSFADE),0, Icon_NOICON, | 106 | MAKE_MENU(crossfade_settings_menu,ID2P(LANG_CROSSFADE),0, Icon_NOICON, |
107 | &crossfade, &crossfade_fade_in_delay, &crossfade_fade_in_duration, | 107 | &crossfade, &crossfade_fade_in_delay, &crossfade_fade_in_duration, |
108 | &crossfade_fade_out_delay, &crossfade_fade_out_duration, | 108 | &crossfade_fade_out_delay, &crossfade_fade_out_duration, |
@@ -187,7 +187,7 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0, | |||
187 | #endif | 187 | #endif |
188 | &fade_on_stop, &party_mode, | 188 | &fade_on_stop, &party_mode, |
189 | 189 | ||
190 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_CROSSFADE) | 190 | #if (CONFIG_CODEC == SWCODEC) && defined(HAVE_CROSSFADE) |
191 | &crossfade_settings_menu, | 191 | &crossfade_settings_menu, |
192 | #endif | 192 | #endif |
193 | 193 | ||
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 135e632479..04de59fe20 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 | 370 | #if (CONFIG_CODEC == SWCODEC) && defined(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) |