diff options
Diffstat (limited to 'apps/menus/recording_menu.c')
-rw-r--r-- | apps/menus/recording_menu.c | 20 |
1 files changed, 0 insertions, 20 deletions
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, |