diff options
author | Michael Giacomelli <giac2000@hotmail.com> | 2009-08-11 01:09:05 +0000 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2009-08-11 01:09:05 +0000 |
commit | 47a090105adac2c7d63165a28f46126df08ce494 (patch) | |
tree | 4a77ff10f3ca9dd8dc94dec3d28c5dca84d1edbc /apps | |
parent | 4210ff584ae1104e0f6ddcbe38ddb5ebc7a0b634 (diff) | |
download | rockbox-47a090105adac2c7d63165a28f46126df08ce494.tar.gz rockbox-47a090105adac2c7d63165a28f46126df08ce494.zip |
Disable crossfade menu option (but nothing more) on lowmem (<=2MB) targets because it apparently needs a larger PCM buffer then is available.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22247 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/menus/playback_menu.c | 4 | ||||
-rw-r--r-- | apps/settings_list.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index 1e8670ebea..e6298b95bb 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c @@ -102,10 +102,12 @@ 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); +#if MEMORYSIZE > 2 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, &crossfade_fade_out_mixmode); +#endif /* replay gain submenu */ @@ -185,7 +187,7 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0, #endif &fade_on_stop, &party_mode, -#if CONFIG_CODEC == SWCODEC +#if CONFIG_CODEC == SWCODEC && MEMORYSIZE > 2 &crossfade_settings_menu, &replaygain_settings_menu, &beep, #endif diff --git a/apps/settings_list.c b/apps/settings_list.c index c39ab580fc..71fbecc621 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -1129,6 +1129,7 @@ const struct settings_list settings[] = { NULL, 4, ID2P(LANG_OFF), ID2P(LANG_WEAK), ID2P(LANG_MODERATE), ID2P(LANG_STRONG)), +#if MEMORYSIZE > 2 /* crossfade */ CHOICE_SETTING(F_SOUNDSETTING, crossfade, LANG_CROSSFADE_ENABLE, 0, "crossfade", @@ -1153,6 +1154,7 @@ const struct settings_list settings[] = { LANG_CROSSFADE_FADE_OUT_MODE, 0, "crossfade fade out mode", "crossfade,mix", NULL, 2, ID2P(LANG_CROSSFADE), ID2P(LANG_MIX)), +#endif /* crossfeed */ OFFON_SETTING(F_SOUNDSETTING, crossfeed, LANG_CROSSFEED, false, |