diff options
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, | |||
102 | &global_settings.crossfade_fade_out_duration, setcrossfadeonexit_callback); | 102 | &global_settings.crossfade_fade_out_duration, setcrossfadeonexit_callback); |
103 | MENUITEM_SETTING(crossfade_fade_out_mixmode, | 103 | MENUITEM_SETTING(crossfade_fade_out_mixmode, |
104 | &global_settings.crossfade_fade_out_mixmode,NULL); | 104 | &global_settings.crossfade_fade_out_mixmode,NULL); |
105 | #if MEMORYSIZE > 2 | ||
105 | MAKE_MENU(crossfade_settings_menu,ID2P(LANG_CROSSFADE),0, Icon_NOICON, | 106 | MAKE_MENU(crossfade_settings_menu,ID2P(LANG_CROSSFADE),0, Icon_NOICON, |
106 | &crossfade, &crossfade_fade_in_delay, &crossfade_fade_in_duration, | 107 | &crossfade, &crossfade_fade_in_delay, &crossfade_fade_in_duration, |
107 | &crossfade_fade_out_delay, &crossfade_fade_out_duration, | 108 | &crossfade_fade_out_delay, &crossfade_fade_out_duration, |
108 | &crossfade_fade_out_mixmode); | 109 | &crossfade_fade_out_mixmode); |
110 | #endif | ||
109 | 111 | ||
110 | /* replay gain submenu */ | 112 | /* replay gain submenu */ |
111 | 113 | ||
@@ -185,7 +187,7 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0, | |||
185 | #endif | 187 | #endif |
186 | &fade_on_stop, &party_mode, | 188 | &fade_on_stop, &party_mode, |
187 | 189 | ||
188 | #if CONFIG_CODEC == SWCODEC | 190 | #if CONFIG_CODEC == SWCODEC && MEMORYSIZE > 2 |
189 | &crossfade_settings_menu, &replaygain_settings_menu, &beep, | 191 | &crossfade_settings_menu, &replaygain_settings_menu, &beep, |
190 | #endif | 192 | #endif |
191 | 193 | ||
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[] = { | |||
1129 | NULL, 4, ID2P(LANG_OFF), ID2P(LANG_WEAK), | 1129 | NULL, 4, ID2P(LANG_OFF), ID2P(LANG_WEAK), |
1130 | ID2P(LANG_MODERATE), ID2P(LANG_STRONG)), | 1130 | ID2P(LANG_MODERATE), ID2P(LANG_STRONG)), |
1131 | 1131 | ||
1132 | #if MEMORYSIZE > 2 | ||
1132 | /* crossfade */ | 1133 | /* crossfade */ |
1133 | CHOICE_SETTING(F_SOUNDSETTING, crossfade, LANG_CROSSFADE_ENABLE, 0, | 1134 | CHOICE_SETTING(F_SOUNDSETTING, crossfade, LANG_CROSSFADE_ENABLE, 0, |
1134 | "crossfade", | 1135 | "crossfade", |
@@ -1153,6 +1154,7 @@ const struct settings_list settings[] = { | |||
1153 | LANG_CROSSFADE_FADE_OUT_MODE, 0, | 1154 | LANG_CROSSFADE_FADE_OUT_MODE, 0, |
1154 | "crossfade fade out mode", "crossfade,mix", NULL, 2, | 1155 | "crossfade fade out mode", "crossfade,mix", NULL, 2, |
1155 | ID2P(LANG_CROSSFADE), ID2P(LANG_MIX)), | 1156 | ID2P(LANG_CROSSFADE), ID2P(LANG_MIX)), |
1157 | #endif | ||
1156 | 1158 | ||
1157 | /* crossfeed */ | 1159 | /* crossfeed */ |
1158 | OFFON_SETTING(F_SOUNDSETTING, crossfeed, LANG_CROSSFEED, false, | 1160 | OFFON_SETTING(F_SOUNDSETTING, crossfeed, LANG_CROSSFEED, false, |