diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 00:01:32 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 8cb555460ff79e636a7907fb2589e16db98c8600 (patch) | |
tree | 930a3878c7641c9ce045b24f0ade1309e36d5806 /apps/menus | |
parent | 0c4f89370d05056faa789aa9cabcccc4e509fb9f (diff) | |
download | rockbox-8cb555460ff79e636a7907fb2589e16db98c8600.tar.gz rockbox-8cb555460ff79e636a7907fb2589e16db98c8600.zip |
[3/4] Completely remove HWCODEC support
'swcodec' is now always set (and recording_swcodec for recording-capable
units) in feature.txt so the manual and language strings don't need to
all be fixed up.
Change-Id: Ib2c9d5d157af8d33653e2d4b4a12881b9aa6ddb0
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/eq_menu.c | 1 | ||||
-rw-r--r-- | apps/menus/menu_common.c | 5 | ||||
-rw-r--r-- | apps/menus/menu_common.h | 2 | ||||
-rw-r--r-- | apps/menus/playback_menu.c | 27 | ||||
-rw-r--r-- | apps/menus/radio_menu.c | 18 | ||||
-rw-r--r-- | apps/menus/recording_menu.c | 20 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 10 | ||||
-rw-r--r-- | apps/menus/sound_menu.c | 12 |
8 files changed, 7 insertions, 88 deletions
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c index b41e4b0981..683025629b 100644 --- a/apps/menus/eq_menu.c +++ b/apps/menus/eq_menu.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include "list.h" | 30 | #include "list.h" |
31 | #include "menu.h" | 31 | #include "menu.h" |
32 | #include "action.h" | 32 | #include "action.h" |
33 | #include "mp3_playback.h" | ||
34 | #include "settings.h" | 33 | #include "settings.h" |
35 | #include "screens.h" | 34 | #include "screens.h" |
36 | #include "icons.h" | 35 | #include "icons.h" |
diff --git a/apps/menus/menu_common.c b/apps/menus/menu_common.c index 2ef48cc23b..1fa8ba3af2 100644 --- a/apps/menus/menu_common.c +++ b/apps/menus/menu_common.c | |||
@@ -25,11 +25,8 @@ | |||
25 | #include "action.h" | 25 | #include "action.h" |
26 | #include "menu.h" | 26 | #include "menu.h" |
27 | #include "menu_common.h" | 27 | #include "menu_common.h" |
28 | #if CONFIG_CODEC == SWCODEC | ||
29 | #include "pcmbuf.h" | 28 | #include "pcmbuf.h" |
30 | #endif | ||
31 | 29 | ||
32 | #if CONFIG_CODEC == SWCODEC | ||
33 | /* Use this callback if your menu adjusts DSP settings. */ | 30 | /* Use this callback if your menu adjusts DSP settings. */ |
34 | int lowlatency_callback(int action, | 31 | int lowlatency_callback(int action, |
35 | const struct menu_item_ex *this_item, | 32 | const struct menu_item_ex *this_item, |
@@ -48,5 +45,3 @@ int lowlatency_callback(int action, | |||
48 | } | 45 | } |
49 | return action; | 46 | return action; |
50 | } | 47 | } |
51 | #endif | ||
52 | |||
diff --git a/apps/menus/menu_common.h b/apps/menus/menu_common.h index e85ed8dc61..5a28c3f03c 100644 --- a/apps/menus/menu_common.h +++ b/apps/menus/menu_common.h | |||
@@ -24,11 +24,9 @@ | |||
24 | #include "menu.h" | 24 | #include "menu.h" |
25 | #include "config.h" | 25 | #include "config.h" |
26 | 26 | ||
27 | #if CONFIG_CODEC == SWCODEC | ||
28 | int lowlatency_callback(int action, | 27 | int lowlatency_callback(int action, |
29 | const struct menu_item_ex *this_item, | 28 | const struct menu_item_ex *this_item, |
30 | struct gui_synclist *this_list); | 29 | struct gui_synclist *this_list); |
31 | #endif | ||
32 | 30 | ||
33 | #endif /* _MENU_COMMON_H */ | 31 | #endif /* _MENU_COMMON_H */ |
34 | 32 | ||
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index bf770c0f11..41c738725c 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c | |||
@@ -35,16 +35,13 @@ | |||
35 | #include "audio.h" | 35 | #include "audio.h" |
36 | #include "cuesheet.h" | 36 | #include "cuesheet.h" |
37 | #include "misc.h" | 37 | #include "misc.h" |
38 | #if CONFIG_CODEC == SWCODEC | ||
39 | #include "playback.h" | 38 | #include "playback.h" |
40 | #include "pcm_sampr.h" | 39 | #include "pcm_sampr.h" |
41 | #ifdef HAVE_PLAY_FREQ | 40 | #ifdef HAVE_PLAY_FREQ |
42 | #include "talk.h" | 41 | #include "talk.h" |
43 | #endif | 42 | #endif |
44 | #endif | ||
45 | |||
46 | 43 | ||
47 | #if (CONFIG_CODEC == SWCODEC) && defined(HAVE_CROSSFADE) | 44 | #if defined(HAVE_CROSSFADE) |
48 | static int setcrossfadeonexit_callback(int action, | 45 | static int setcrossfadeonexit_callback(int action, |
49 | const struct menu_item_ex *this_item, | 46 | const struct menu_item_ex *this_item, |
50 | struct gui_synclist *this_list) | 47 | struct gui_synclist *this_list) |
@@ -60,7 +57,7 @@ static int setcrossfadeonexit_callback(int action, | |||
60 | return action; | 57 | return action; |
61 | } | 58 | } |
62 | 59 | ||
63 | #endif /* CONFIG_CODEC == SWCODEC */ | 60 | #endif /* HAVE_CROSSFADE */ |
64 | 61 | ||
65 | /***********************************/ | 62 | /***********************************/ |
66 | /* PLAYBACK MENU */ | 63 | /* PLAYBACK MENU */ |
@@ -77,7 +74,6 @@ MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL); | |||
77 | MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_NOICON, | 74 | MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_NOICON, |
78 | &ff_rewind_min_step, &ff_rewind_accel); | 75 | &ff_rewind_min_step, &ff_rewind_accel); |
79 | #ifdef HAVE_DISK_STORAGE | 76 | #ifdef HAVE_DISK_STORAGE |
80 | #if CONFIG_CODEC == SWCODEC | ||
81 | static int buffermargin_callback(int action, | 77 | static int buffermargin_callback(int action, |
82 | const struct menu_item_ex *this_item, | 78 | const struct menu_item_ex *this_item, |
83 | struct gui_synclist *this_list) | 79 | struct gui_synclist *this_list) |
@@ -92,16 +88,12 @@ static int buffermargin_callback(int action, | |||
92 | } | 88 | } |
93 | return action; | 89 | return action; |
94 | } | 90 | } |
95 | #else | ||
96 | # define buffermargin_callback NULL | ||
97 | #endif | ||
98 | MENUITEM_SETTING(buffer_margin, &global_settings.buffer_margin, | 91 | MENUITEM_SETTING(buffer_margin, &global_settings.buffer_margin, |
99 | buffermargin_callback); | 92 | buffermargin_callback); |
100 | #endif /*HAVE_DISK_STORAGE */ | 93 | #endif /*HAVE_DISK_STORAGE */ |
101 | MENUITEM_SETTING(fade_on_stop, &global_settings.fade_on_stop, NULL); | 94 | MENUITEM_SETTING(fade_on_stop, &global_settings.fade_on_stop, NULL); |
102 | MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL); | 95 | MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL); |
103 | 96 | ||
104 | #if CONFIG_CODEC == SWCODEC | ||
105 | #ifdef HAVE_CROSSFADE | 97 | #ifdef HAVE_CROSSFADE |
106 | /* crossfade submenu */ | 98 | /* crossfade submenu */ |
107 | MENUITEM_SETTING(crossfade, &global_settings.crossfade, setcrossfadeonexit_callback); | 99 | MENUITEM_SETTING(crossfade, &global_settings.crossfade, setcrossfadeonexit_callback); |
@@ -150,7 +142,6 @@ MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, Icon_NOICON, | |||
150 | &replaygain_type, &replaygain_noclip, &replaygain_preamp); | 142 | &replaygain_type, &replaygain_noclip, &replaygain_preamp); |
151 | 143 | ||
152 | MENUITEM_SETTING(beep, &global_settings.beep ,NULL); | 144 | MENUITEM_SETTING(beep, &global_settings.beep ,NULL); |
153 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
154 | 145 | ||
155 | #ifdef HAVE_SPDIF_POWER | 146 | #ifdef HAVE_SPDIF_POWER |
156 | MENUITEM_SETTING(spdif_enable, &global_settings.spdif_enable, NULL); | 147 | MENUITEM_SETTING(spdif_enable, &global_settings.spdif_enable, NULL); |
@@ -188,13 +179,7 @@ static int cuesheet_callback(int action, | |||
188 | switch (action) | 179 | switch (action) |
189 | { | 180 | { |
190 | case ACTION_EXIT_MENUITEM: /* on exit */ | 181 | case ACTION_EXIT_MENUITEM: /* on exit */ |
191 | #if CONFIG_CODEC == SWCODEC | ||
192 | audio_set_cuesheet(global_settings.cuesheet); | 182 | audio_set_cuesheet(global_settings.cuesheet); |
193 | #else | ||
194 | if (global_settings.cuesheet) | ||
195 | splash(HZ*2, ID2P(LANG_PLEASE_REBOOT)); | ||
196 | break; | ||
197 | #endif | ||
198 | } | 183 | } |
199 | return action; | 184 | return action; |
200 | } | 185 | } |
@@ -209,9 +194,7 @@ MAKE_MENU(unplug_menu, ID2P(LANG_HEADPHONE_UNPLUG), 0, Icon_NOICON, | |||
209 | 194 | ||
210 | MENUITEM_SETTING(skip_length, &global_settings.skip_length, NULL); | 195 | MENUITEM_SETTING(skip_length, &global_settings.skip_length, NULL); |
211 | MENUITEM_SETTING(prevent_skip, &global_settings.prevent_skip, NULL); | 196 | MENUITEM_SETTING(prevent_skip, &global_settings.prevent_skip, NULL); |
212 | #if CONFIG_CODEC == SWCODEC | ||
213 | MENUITEM_SETTING(resume_rewind, &global_settings.resume_rewind, NULL); | 197 | MENUITEM_SETTING(resume_rewind, &global_settings.resume_rewind, NULL); |
214 | #endif | ||
215 | MENUITEM_SETTING(pause_rewind, &global_settings.pause_rewind, NULL); | 198 | MENUITEM_SETTING(pause_rewind, &global_settings.pause_rewind, NULL); |
216 | #ifdef HAVE_PLAY_FREQ | 199 | #ifdef HAVE_PLAY_FREQ |
217 | MENUITEM_SETTING(play_frequency, &global_settings.play_frequency, | 200 | MENUITEM_SETTING(play_frequency, &global_settings.play_frequency, |
@@ -227,13 +210,11 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0, | |||
227 | #endif | 210 | #endif |
228 | &fade_on_stop, &party_mode, | 211 | &fade_on_stop, &party_mode, |
229 | 212 | ||
230 | #if (CONFIG_CODEC == SWCODEC) && defined(HAVE_CROSSFADE) | 213 | #if defined(HAVE_CROSSFADE) |
231 | &crossfade_settings_menu, | 214 | &crossfade_settings_menu, |
232 | #endif | 215 | #endif |
233 | 216 | ||
234 | #if CONFIG_CODEC == SWCODEC | ||
235 | &replaygain_settings_menu, &beep, | 217 | &replaygain_settings_menu, &beep, |
236 | #endif | ||
237 | 218 | ||
238 | #ifdef HAVE_SPDIF_POWER | 219 | #ifdef HAVE_SPDIF_POWER |
239 | &spdif_enable, | 220 | &spdif_enable, |
@@ -244,9 +225,7 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0, | |||
244 | #endif | 225 | #endif |
245 | ,&skip_length, &prevent_skip | 226 | ,&skip_length, &prevent_skip |
246 | 227 | ||
247 | #if CONFIG_CODEC == SWCODEC | ||
248 | ,&resume_rewind | 228 | ,&resume_rewind |
249 | #endif | ||
250 | ,&pause_rewind | 229 | ,&pause_rewind |
251 | #ifdef HAVE_PLAY_FREQ | 230 | #ifdef HAVE_PLAY_FREQ |
252 | ,&play_frequency | 231 | ,&play_frequency |
diff --git a/apps/menus/radio_menu.c b/apps/menus/radio_menu.c index 8871421c11..a6d259a21d 100644 --- a/apps/menus/radio_menu.c +++ b/apps/menus/radio_menu.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #ifdef HAVE_RECORDING | 34 | #ifdef HAVE_RECORDING |
35 | #include "recording.h" /* recording_screen() */ | 35 | #include "recording.h" /* recording_screen() */ |
36 | 36 | ||
37 | #if defined(HAVE_FMRADIO_REC) && CONFIG_CODEC == SWCODEC | 37 | #if defined(HAVE_FMRADIO_REC) |
38 | #define FM_RECORDING_SCREEN | 38 | #define FM_RECORDING_SCREEN |
39 | static int fm_recording_screen(void) | 39 | static int fm_recording_screen(void) |
40 | { | 40 | { |
@@ -53,30 +53,20 @@ static int fm_recording_screen(void) | |||
53 | 53 | ||
54 | MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING), | 54 | MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING), |
55 | fm_recording_screen, NULL, NULL, Icon_Recording); | 55 | fm_recording_screen, NULL, NULL, Icon_Recording); |
56 | #endif /* defined(HAVE_FMRADIO_REC) && CONFIG_CODEC == SWCODEC */ | 56 | #endif /* defined(HAVE_FMRADIO_REC) */ |
57 | 57 | ||
58 | #if defined(HAVE_FMRADIO_REC) || CONFIG_CODEC != SWCODEC | 58 | #if defined(HAVE_FMRADIO_REC) |
59 | #define FM_RECORDING_SETTINGS | 59 | #define FM_RECORDING_SETTINGS |
60 | static int fm_recording_settings(void) | 60 | static int fm_recording_settings(void) |
61 | { | 61 | { |
62 | int ret = recording_menu(true); | 62 | int ret = recording_menu(true); |
63 | 63 | ||
64 | #if CONFIG_CODEC != SWCODEC | ||
65 | if (!ret) | ||
66 | { | ||
67 | struct audio_recording_options rec_options; | ||
68 | rec_init_recording_options(&rec_options); | ||
69 | rec_options.rec_source = AUDIO_SRC_LINEIN; | ||
70 | rec_set_recording_options(&rec_options); | ||
71 | } | ||
72 | #endif | ||
73 | |||
74 | return ret; | 64 | return ret; |
75 | } | 65 | } |
76 | 66 | ||
77 | MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), | 67 | MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), |
78 | fm_recording_settings, NULL, NULL, Icon_Recording); | 68 | fm_recording_settings, NULL, NULL, Icon_Recording); |
79 | #endif /* defined(HAVE_FMRADIO_REC) || CONFIG_CODEC != SWCODEC */ | 69 | #endif /* defined(HAVE_FMRADIO_REC) */ |
80 | #endif /* HAVE_RECORDING */ | 70 | #endif /* HAVE_RECORDING */ |
81 | 71 | ||
82 | #ifndef FM_PRESET | 72 | #ifndef FM_PRESET |
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 0f24420a63..c841de4e89 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "lcd.h" | 29 | #include "lcd.h" |
30 | #include "menu.h" | 30 | #include "menu.h" |
31 | #include "button.h" | 31 | #include "button.h" |
32 | #include "mp3_playback.h" | ||
33 | #include "settings.h" | 32 | #include "settings.h" |
34 | #include "screens.h" | 33 | #include "screens.h" |
35 | #include "icons.h" | 34 | #include "icons.h" |
@@ -51,14 +50,12 @@ | |||
51 | #include "peakmeter.h" | 50 | #include "peakmeter.h" |
52 | #endif | 51 | #endif |
53 | #include "splash.h" | 52 | #include "splash.h" |
54 | #if CONFIG_CODEC == SWCODEC | ||
55 | #include "metadata.h" | 53 | #include "metadata.h" |
56 | #include "menus/eq_menu.h" | 54 | #include "menus/eq_menu.h" |
57 | #ifdef HAVE_RECORDING | 55 | #ifdef HAVE_RECORDING |
58 | #include "enc_config.h" | 56 | #include "enc_config.h" |
59 | #endif | 57 | #endif |
60 | #include "general.h" | 58 | #include "general.h" |
61 | #endif | ||
62 | #include "action.h" | 59 | #include "action.h" |
63 | #include "recording.h" | 60 | #include "recording.h" |
64 | #include "sound_menu.h" | 61 | #include "sound_menu.h" |
@@ -101,7 +98,6 @@ static int recsource_func(void) | |||
101 | MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), | 98 | MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), |
102 | recsource_func, NULL, recmenu_callback, Icon_Menu_setting); | 99 | recsource_func, NULL, recmenu_callback, Icon_Menu_setting); |
103 | 100 | ||
104 | #if CONFIG_CODEC == SWCODEC | ||
105 | /* Makes an options list from a source list of options and indexes */ | 101 | /* Makes an options list from a source list of options and indexes */ |
106 | static void make_options_from_indexes(const struct opt_items *src_names, | 102 | static void make_options_from_indexes(const struct opt_items *src_names, |
107 | const long *src_indexes, | 103 | const long *src_indexes, |
@@ -112,12 +108,8 @@ static void make_options_from_indexes(const struct opt_items *src_names, | |||
112 | dst_names[n_indexes] = src_names[src_indexes[n_indexes]]; | 108 | dst_names[n_indexes] = src_names[src_indexes[n_indexes]]; |
113 | } /* make_options_from_indexes */ | 109 | } /* make_options_from_indexes */ |
114 | 110 | ||
115 | |||
116 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
117 | |||
118 | static int recfrequency_func(void) | 111 | static int recfrequency_func(void) |
119 | { | 112 | { |
120 | #if CONFIG_CODEC == SWCODEC | ||
121 | static const struct opt_items names[REC_NUM_FREQ] = { | 113 | static const struct opt_items names[REC_NUM_FREQ] = { |
122 | REC_HAVE_96_([REC_FREQ_96] = { "96kHz", TALK_ID(96, UNIT_KHZ) },) | 114 | REC_HAVE_96_([REC_FREQ_96] = { "96kHz", TALK_ID(96, UNIT_KHZ) },) |
123 | REC_HAVE_88_([REC_FREQ_88] = { "88.2kHz", TALK_ID(88, UNIT_KHZ) },) | 115 | REC_HAVE_88_([REC_FREQ_88] = { "88.2kHz", TALK_ID(88, UNIT_KHZ) },) |
@@ -195,7 +187,6 @@ static int recfrequency_func(void) | |||
195 | } | 187 | } |
196 | 188 | ||
197 | return ret; | 189 | return ret; |
198 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
199 | } /* recfrequency */ | 190 | } /* recfrequency */ |
200 | MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_FREQUENCY), | 191 | MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_FREQUENCY), |
201 | recfrequency_func, NULL, NULL, Icon_Menu_setting); | 192 | recfrequency_func, NULL, NULL, Icon_Menu_setting); |
@@ -208,7 +199,6 @@ static int recchannels_func(void) | |||
208 | [CHN_MODE_MONO] = { STR(LANG_CHANNEL_MONO) } | 199 | [CHN_MODE_MONO] = { STR(LANG_CHANNEL_MONO) } |
209 | }; | 200 | }; |
210 | 201 | ||
211 | #if CONFIG_CODEC == SWCODEC | ||
212 | struct opt_items opts[CHN_NUM_MODES]; | 202 | struct opt_items opts[CHN_NUM_MODES]; |
213 | long table[CHN_NUM_MODES]; | 203 | long table[CHN_NUM_MODES]; |
214 | struct encoder_caps caps; | 204 | struct encoder_caps caps; |
@@ -238,13 +228,10 @@ static int recchannels_func(void) | |||
238 | global_settings.rec_channels = table[rec_channels]; | 228 | global_settings.rec_channels = table[rec_channels]; |
239 | 229 | ||
240 | return ret; | 230 | return ret; |
241 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
242 | } | 231 | } |
243 | MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_CHANNELS), | 232 | MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_CHANNELS), |
244 | recchannels_func, NULL, NULL, Icon_Menu_setting); | 233 | recchannels_func, NULL, NULL, Icon_Menu_setting); |
245 | 234 | ||
246 | #if CONFIG_CODEC == SWCODEC | ||
247 | |||
248 | static int recmonomode_func(void) | 235 | static int recmonomode_func(void) |
249 | { | 236 | { |
250 | static const struct opt_items names[3] = { | 237 | static const struct opt_items names[3] = { |
@@ -293,9 +280,6 @@ MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), | |||
293 | enc_global_config_menu, | 280 | enc_global_config_menu, |
294 | NULL, NULL, Icon_Submenu); | 281 | NULL, NULL, Icon_Submenu); |
295 | 282 | ||
296 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
297 | |||
298 | |||
299 | static int recmenu_callback(int action, | 283 | static int recmenu_callback(int action, |
300 | const struct menu_item_ex *this_item, | 284 | const struct menu_item_ex *this_item, |
301 | struct gui_synclist *this_list) | 285 | struct gui_synclist *this_list) |
@@ -603,14 +587,10 @@ MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS), | |||
603 | 587 | ||
604 | MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), | 588 | MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), |
605 | NULL, Icon_Recording, | 589 | NULL, Icon_Recording, |
606 | #if CONFIG_CODEC == SWCODEC | ||
607 | &recformat, &enc_global_config_menu_item, | 590 | &recformat, &enc_global_config_menu_item, |
608 | #endif | ||
609 | &recfrequency, &recsource, /* recsource not shown if no_source */ | 591 | &recfrequency, &recsource, /* recsource not shown if no_source */ |
610 | &recchannels, | 592 | &recchannels, |
611 | #if CONFIG_CODEC == SWCODEC | ||
612 | &recmonomode, | 593 | &recmonomode, |
613 | #endif | ||
614 | &filesplitoptionsmenu, | 594 | &filesplitoptionsmenu, |
615 | &rec_prerecord_time, | 595 | &rec_prerecord_time, |
616 | &clear_rec_directory_item, | 596 | &clear_rec_directory_item, |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 2957b0635c..e2b496a6f7 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -38,9 +38,7 @@ | |||
38 | #include "yesno.h" | 38 | #include "yesno.h" |
39 | #include "talk.h" | 39 | #include "talk.h" |
40 | #include "powermgmt.h" | 40 | #include "powermgmt.h" |
41 | #if CONFIG_CODEC == SWCODEC | ||
42 | #include "playback.h" | 41 | #include "playback.h" |
43 | #endif | ||
44 | #if CONFIG_RTC | 42 | #if CONFIG_RTC |
45 | #include "screens.h" | 43 | #include "screens.h" |
46 | #endif | 44 | #endif |
@@ -326,7 +324,6 @@ MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON, | |||
326 | 324 | ||
327 | 325 | ||
328 | /* Keyclick menu */ | 326 | /* Keyclick menu */ |
329 | #if CONFIG_CODEC == SWCODEC | ||
330 | MENUITEM_SETTING(keyclick, &global_settings.keyclick, NULL); | 327 | MENUITEM_SETTING(keyclick, &global_settings.keyclick, NULL); |
331 | MENUITEM_SETTING(keyclick_repeats, &global_settings.keyclick_repeats, NULL); | 328 | MENUITEM_SETTING(keyclick_repeats, &global_settings.keyclick_repeats, NULL); |
332 | #ifdef HAVE_HARDWARE_CLICK | 329 | #ifdef HAVE_HARDWARE_CLICK |
@@ -337,7 +334,6 @@ MAKE_MENU(keyclick_menu, ID2P(LANG_KEYCLICK), 0, Icon_NOICON, | |||
337 | MAKE_MENU(keyclick_menu, ID2P(LANG_KEYCLICK), 0, Icon_NOICON, | 334 | MAKE_MENU(keyclick_menu, ID2P(LANG_KEYCLICK), 0, Icon_NOICON, |
338 | &keyclick, &keyclick_repeats); | 335 | &keyclick, &keyclick_repeats); |
339 | #endif | 336 | #endif |
340 | #endif | ||
341 | 337 | ||
342 | #if CONFIG_CHARGING | 338 | #if CONFIG_CHARGING |
343 | MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); | 339 | MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); |
@@ -437,9 +433,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
437 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 433 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
438 | &buttonlight_brightness, | 434 | &buttonlight_brightness, |
439 | #endif | 435 | #endif |
440 | #if CONFIG_CODEC == SWCODEC | ||
441 | &keyclick_menu, | 436 | &keyclick_menu, |
442 | #endif | ||
443 | #ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING | 437 | #ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING |
444 | &touchpad_sensitivity, | 438 | &touchpad_sensitivity, |
445 | #endif | 439 | #endif |
@@ -619,7 +613,6 @@ MAKE_MENU(bookmark_settings_menu, ID2P(LANG_BOOKMARK_SETTINGS), 0, | |||
619 | /***********************************/ | 613 | /***********************************/ |
620 | /* AUTORESUME MENU */ | 614 | /* AUTORESUME MENU */ |
621 | #ifdef HAVE_TAGCACHE | 615 | #ifdef HAVE_TAGCACHE |
622 | #if CONFIG_CODEC == SWCODEC | ||
623 | 616 | ||
624 | static int autoresume_callback(int action, | 617 | static int autoresume_callback(int action, |
625 | const struct menu_item_ex *this_item, | 618 | const struct menu_item_ex *this_item, |
@@ -674,7 +667,6 @@ MAKE_MENU(autoresume_menu, ID2P(LANG_AUTORESUME), | |||
674 | 0, Icon_NOICON, | 667 | 0, Icon_NOICON, |
675 | &autoresume_enable, &autoresume_automatic); | 668 | &autoresume_enable, &autoresume_automatic); |
676 | 669 | ||
677 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
678 | #endif /* HAVE_TAGCACHE */ | 670 | #endif /* HAVE_TAGCACHE */ |
679 | /* AUTORESUME MENU */ | 671 | /* AUTORESUME MENU */ |
680 | /***********************************/ | 672 | /***********************************/ |
@@ -758,10 +750,8 @@ MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, | |||
758 | &startup_shutdown_menu, | 750 | &startup_shutdown_menu, |
759 | &bookmark_settings_menu, | 751 | &bookmark_settings_menu, |
760 | #ifdef HAVE_TAGCACHE | 752 | #ifdef HAVE_TAGCACHE |
761 | #if CONFIG_CODEC == SWCODEC | ||
762 | &autoresume_menu, | 753 | &autoresume_menu, |
763 | #endif | 754 | #endif |
764 | #endif | ||
765 | &browse_langs, &voice_settings_menu, | 755 | &browse_langs, &voice_settings_menu, |
766 | #ifdef HAVE_HOTKEY | 756 | #ifdef HAVE_HOTKEY |
767 | &hotkey_menu, | 757 | &hotkey_menu, |
diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c index ee966ac62a..174329fcc8 100644 --- a/apps/menus/sound_menu.c +++ b/apps/menus/sound_menu.c | |||
@@ -108,18 +108,10 @@ MENUITEM_SETTING(treble_cutoff, &global_settings.treble_cutoff, NULL); | |||
108 | 108 | ||
109 | MENUITEM_SETTING(balance, &global_settings.balance, NULL); | 109 | MENUITEM_SETTING(balance, &global_settings.balance, NULL); |
110 | MENUITEM_SETTING(channel_config, &global_settings.channel_config, | 110 | MENUITEM_SETTING(channel_config, &global_settings.channel_config, |
111 | #if CONFIG_CODEC == SWCODEC | ||
112 | lowlatency_callback | 111 | lowlatency_callback |
113 | #else | ||
114 | NULL | ||
115 | #endif | ||
116 | ); | 112 | ); |
117 | MENUITEM_SETTING(stereo_width, &global_settings.stereo_width, | 113 | MENUITEM_SETTING(stereo_width, &global_settings.stereo_width, |
118 | #if CONFIG_CODEC == SWCODEC | ||
119 | lowlatency_callback | 114 | lowlatency_callback |
120 | #else | ||
121 | NULL | ||
122 | #endif | ||
123 | ); | 115 | ); |
124 | 116 | ||
125 | #ifdef AUDIOHW_HAVE_DEPTH_3D | 117 | #ifdef AUDIOHW_HAVE_DEPTH_3D |
@@ -134,7 +126,6 @@ MENUITEM_SETTING(roll_off, &global_settings.roll_off, NULL); | |||
134 | MENUITEM_SETTING(func_mode, &global_settings.func_mode, NULL); | 126 | MENUITEM_SETTING(func_mode, &global_settings.func_mode, NULL); |
135 | #endif | 127 | #endif |
136 | 128 | ||
137 | #if CONFIG_CODEC == SWCODEC | ||
138 | /* Crossfeed Submenu */ | 129 | /* Crossfeed Submenu */ |
139 | MENUITEM_SETTING(crossfeed, &global_settings.crossfeed, lowlatency_callback); | 130 | MENUITEM_SETTING(crossfeed, &global_settings.crossfeed, lowlatency_callback); |
140 | MENUITEM_SETTING(crossfeed_direct_gain, | 131 | MENUITEM_SETTING(crossfeed_direct_gain, |
@@ -216,7 +207,6 @@ static int timestretch_callback(int action, | |||
216 | MAKE_MENU(compressor_menu,ID2P(LANG_COMPRESSOR), NULL, Icon_NOICON, | 207 | MAKE_MENU(compressor_menu,ID2P(LANG_COMPRESSOR), NULL, Icon_NOICON, |
217 | &compressor_threshold, &compressor_gain, &compressor_ratio, | 208 | &compressor_threshold, &compressor_gain, &compressor_ratio, |
218 | &compressor_knee, &compressor_attack, &compressor_release); | 209 | &compressor_knee, &compressor_attack, &compressor_release); |
219 | #endif | ||
220 | 210 | ||
221 | #ifdef HAVE_SPEAKER | 211 | #ifdef HAVE_SPEAKER |
222 | MENUITEM_SETTING(speaker_mode, &global_settings.speaker_mode, NULL); | 212 | MENUITEM_SETTING(speaker_mode, &global_settings.speaker_mode, NULL); |
@@ -253,14 +243,12 @@ MAKE_MENU(sound_settings, ID2P(LANG_SOUND_SETTINGS), NULL, Icon_Audio, | |||
253 | #ifdef AUDIOHW_HAVE_FUNCTIONAL_MODE | 243 | #ifdef AUDIOHW_HAVE_FUNCTIONAL_MODE |
254 | ,&func_mode | 244 | ,&func_mode |
255 | #endif | 245 | #endif |
256 | #if CONFIG_CODEC == SWCODEC | ||
257 | ,&crossfeed_menu, &equalizer_menu, &dithering_enabled | 246 | ,&crossfeed_menu, &equalizer_menu, &dithering_enabled |
258 | ,&surround_menu, &pbe_menu, &afr_enabled | 247 | ,&surround_menu, &pbe_menu, &afr_enabled |
259 | #ifdef HAVE_PITCHCONTROL | 248 | #ifdef HAVE_PITCHCONTROL |
260 | ,×tretch_enabled | 249 | ,×tretch_enabled |
261 | #endif | 250 | #endif |
262 | ,&compressor_menu | 251 | ,&compressor_menu |
263 | #endif | ||
264 | #ifdef HAVE_SPEAKER | 252 | #ifdef HAVE_SPEAKER |
265 | ,&speaker_mode | 253 | ,&speaker_mode |
266 | #endif | 254 | #endif |