diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-15 19:40:55 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 092c340a2062fa98b7387fc5fd63578ddae7d0b6 (patch) | |
tree | 98ec96946eeb2ae709cb0528cc6998e21bb9b290 /apps/menus | |
parent | 17f7cc92c258bc456a27c3e7c5a19c9409851879 (diff) |
[1/4] Remove SH support and all archos targets
This removes all code specific to SH targets
Change-Id: I7980523785d2596e65c06430f4638eec74a06061
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/main_menu.c | 30 | ||||
-rw-r--r-- | apps/menus/recording_menu.c | 29 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 24 | ||||
-rw-r--r-- | apps/menus/sound_menu.c | 15 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 22 | ||||
-rw-r--r-- | apps/menus/time_menu.c | 6 |
6 files changed, 0 insertions, 126 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index ee60b37497..7f94571226 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -264,21 +264,10 @@ static const char* info_getname(int selected_item, void *data, return str(LANG_BATTERY_CHARGE); else #elif CONFIG_CHARGING >= CHARGING_MONITOR -#ifdef ARCHOS_RECORDER - /* Report the particular algorithm state */ - if (charge_state == CHARGING) - return str(LANG_BATTERY_CHARGE); - else if (charge_state == TOPOFF) - return str(LANG_BATTERY_TOPOFF_CHARGE); - else if (charge_state == TRICKLE) - return str(LANG_BATTERY_TRICKLE_CHARGE); - else -#else /* !ARCHOS_RECORDER */ /* Go by what power management reports */ if (charging_state()) return str(LANG_BATTERY_CHARGE); else -#endif /* ARCHOS_RECORDER */ #endif /* CONFIG_CHARGING = */ if (battery_level() >= 0) snprintf(buffer, buffer_len, str(LANG_BATTERY_TIME), @@ -394,24 +383,6 @@ static int info_speak_item(int selected_item, void * data) } else #elif CONFIG_CHARGING >= CHARGING_MONITOR -#ifdef ARCHOS_RECORDER - /* Report the particular algorithm state */ - if (charge_state == CHARGING) - { - talk_id(LANG_BATTERY_CHARGE, true); - if (battery_level() >= 0) - talk_value(battery_level(), UNIT_PERCENT, true); - } - else if (charge_state == TOPOFF) - talk_id(LANG_BATTERY_TOPOFF_CHARGE, true); - else if (charge_state == TRICKLE) - { - talk_id(LANG_BATTERY_TRICKLE_CHARGE, true); - if (battery_level() >= 0) - talk_value(battery_level(), UNIT_PERCENT, true); - } - else -#else /* !ARCHOS_RECORDER */ /* Go by what power management reports */ if (charging_state()) { @@ -420,7 +391,6 @@ static int info_speak_item(int selected_item, void * data) talk_value(battery_level(), UNIT_PERCENT, true); } else -#endif /* ARCHOS_RECORDER */ #endif /* CONFIG_CHARGING = */ if (battery_level() >= 0) { diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 21c6cff5fb..0f24420a63 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c @@ -117,20 +117,6 @@ static void make_options_from_indexes(const struct opt_items *src_names, static int recfrequency_func(void) { -#if CONFIG_CODEC == MAS3587F - static const struct opt_items names[6] = { - { "44.1kHz", TALK_ID(44, UNIT_KHZ) }, - { "48kHz", TALK_ID(48, UNIT_KHZ) }, - { "32kHz", TALK_ID(32, UNIT_KHZ) }, - { "22.05kHz", TALK_ID(22, UNIT_KHZ) }, - { "24kHz", TALK_ID(24, UNIT_KHZ) }, - { "16kHz", TALK_ID(16, UNIT_KHZ) } - }; - return set_option(str(LANG_FREQUENCY), - &global_settings.rec_frequency, INT, - names, 6, NULL ); -#endif /* CONFIG_CODEC == MAS3587F */ - #if CONFIG_CODEC == SWCODEC static const struct opt_items names[REC_NUM_FREQ] = { REC_HAVE_96_([REC_FREQ_96] = { "96kHz", TALK_ID(96, UNIT_KHZ) },) @@ -221,11 +207,6 @@ static int recchannels_func(void) [CHN_MODE_STEREO] = { STR(LANG_CHANNEL_STEREO) }, [CHN_MODE_MONO] = { STR(LANG_CHANNEL_MONO) } }; -#if CONFIG_CODEC == MAS3587F - return set_option(str(LANG_CHANNELS), - &global_settings.rec_channels, INT, - names, CHN_NUM_MODES, NULL ); -#endif /* CONFIG_CODEC == MAS3587F */ #if CONFIG_CODEC == SWCODEC struct opt_items opts[CHN_NUM_MODES]; @@ -329,10 +310,6 @@ static int recmenu_callback(int action, } return action; } -#if CONFIG_CODEC == MAS3587F -MENUITEM_SETTING(rec_quality, &global_settings.rec_quality, NULL); -MENUITEM_SETTING(rec_editable, &global_settings.rec_editable, NULL); -#endif MENUITEM_SETTING(rec_split_type, &global_settings.rec_split_type, NULL); MENUITEM_SETTING(rec_split_method, &global_settings.rec_split_method, NULL); @@ -626,9 +603,6 @@ MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS), MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), NULL, Icon_Recording, -#if CONFIG_CODEC == MAS3587F - &rec_quality, -#endif #if CONFIG_CODEC == SWCODEC &recformat, &enc_global_config_menu_item, #endif @@ -637,9 +611,6 @@ MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), #if CONFIG_CODEC == SWCODEC &recmonomode, #endif -#if CONFIG_CODEC == MAS3587F - &rec_editable, -#endif &filesplitoptionsmenu, &rec_prerecord_time, &clear_rec_directory_item, diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 2a08ab0a4e..2957b0635c 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -339,27 +339,6 @@ MAKE_MENU(keyclick_menu, ID2P(LANG_KEYCLICK), 0, Icon_NOICON, #endif #endif - -#if CONFIG_CODEC == MAS3507D -void dac_line_in(bool enable); -static int linein_callback(int action, - const struct menu_item_ex *this_item, - struct gui_synclist *this_list) -{ - (void)this_item; - (void)this_list; - switch (action) - { - case ACTION_EXIT_MENUITEM: /* on exit */ -#ifndef SIMULATOR - dac_line_in(global_settings.line_in); -#endif - break; - } - return action; -} -MENUITEM_SETTING(line_in, &global_settings.line_in, linein_callback); -#endif #if CONFIG_CHARGING MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); MENUITEM_SETTING(car_adapter_mode_delay, &global_settings.car_adapter_mode_delay, NULL); @@ -440,9 +419,6 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), #ifdef HAVE_MORSE_INPUT &morse_input, #endif -#if CONFIG_CODEC == MAS3507D - &line_in, -#endif #if CONFIG_CHARGING &car_adapter_mode_menu, #endif diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c index f39d980a35..ee966ac62a 100644 --- a/apps/menus/sound_menu.c +++ b/apps/menus/sound_menu.c @@ -218,17 +218,6 @@ static int timestretch_callback(int action, &compressor_knee, &compressor_attack, &compressor_release); #endif -#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) - MENUITEM_SETTING(loudness, &global_settings.loudness, NULL); - MENUITEM_SETTING(avc, &global_settings.avc, NULL); - MENUITEM_SETTING(superbass, &global_settings.superbass, NULL); - MENUITEM_SETTING(mdb_enable, &global_settings.mdb_enable, NULL); - MENUITEM_SETTING(mdb_strength, &global_settings.mdb_strength, NULL); - MENUITEM_SETTING(mdb_harmonics, &global_settings.mdb_harmonics, NULL); - MENUITEM_SETTING(mdb_center, &global_settings.mdb_center, NULL); - MENUITEM_SETTING(mdb_shape, &global_settings.mdb_shape, NULL); -#endif - #ifdef HAVE_SPEAKER MENUITEM_SETTING(speaker_mode, &global_settings.speaker_mode, NULL); #endif @@ -272,10 +261,6 @@ MAKE_MENU(sound_settings, ID2P(LANG_SOUND_SETTINGS), NULL, Icon_Audio, #endif ,&compressor_menu #endif -#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) - ,&loudness,&avc,&superbass,&mdb_enable,&mdb_strength - ,&mdb_harmonics,&mdb_center,&mdb_shape -#endif #ifdef HAVE_SPEAKER ,&speaker_mode #endif diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index 10d1291daa..138a2f928a 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c @@ -198,22 +198,6 @@ static int statusbar_callback(int action, return statusbar_callback_ex(action, this_item, SCREEN_MAIN); } -#ifdef HAVE_BUTTONBAR -static int buttonbar_callback(int action, - const struct menu_item_ex *this_item, - struct gui_synclist *this_list) -{ - (void)this_item; - (void)this_list; - switch (action) - { - case ACTION_EXIT_MENUITEM: - viewportmanager_theme_changed(THEME_BUTTONBAR); - break; - } - return ACTION_REDRAW; -} -#endif MENUITEM_SETTING(scrollbar_item, &global_settings.scrollbar, NULL); MENUITEM_SETTING(scrollbar_width, &global_settings.scrollbar_width, NULL); MENUITEM_SETTING(statusbar, &global_settings.statusbar, @@ -222,9 +206,6 @@ MENUITEM_SETTING(statusbar, &global_settings.statusbar, MENUITEM_SETTING(remote_statusbar, &global_settings.remote_statusbar, statusbar_callback_remote); #endif -#ifdef HAVE_BUTTONBAR -MENUITEM_SETTING(buttonbar, &global_settings.buttonbar, buttonbar_callback); -#endif MENUITEM_SETTING(volume_type, &global_settings.volume_type, NULL); MENUITEM_SETTING(battery_display, &global_settings.battery_display, NULL); MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, Icon_NOICON, @@ -232,9 +213,6 @@ MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, Icon_NOICON, #ifdef HAVE_REMOTE_LCD &remote_statusbar, #endif -#if CONFIG_KEYPAD == RECORDER_PAD - &buttonbar, -#endif &volume_type #if (CONFIG_BATTERY_MEASURE != 0) , &battery_display diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c index 811996ca40..6ebf005ffd 100644 --- a/apps/menus/time_menu.c +++ b/apps/menus/time_menu.c @@ -264,12 +264,6 @@ int time_screen(void* ignored) FOR_NB_SCREENS(i) { viewport_set_defaults(&clock_vps[i], i); -#ifdef HAVE_BUTTONBAR - if (global_settings.buttonbar) - { - clock_vps[i].height -= BUTTONBAR_HEIGHT; - } -#endif nb_lines = viewport_get_nb_lines(&clock_vps[i]); gui_synclist_set_viewport_defaults(&menu[i], i); |