diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 4afc43fe2a..34bac0c98a 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1645,6 +1645,14 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_MICROPHONE_RESAMPLER_DRIVER, "Microphone Resampler" ) +MSG_HASH( + MENU_ENUM_SUBLABEL_MICROPHONE_RESAMPLER_DRIVER, + "Microphone resampler driver to use." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_MICROPHONE_BLOCK_FRAMES, + "Microphone Block Frames" + ) #endif MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_DRIVER, diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index d16251b167..4b7fe96846 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -221,7 +221,6 @@ GENERIC_DEFERRED_PUSH(deferred_push_audio_output_settings_list, DISPL #ifdef HAVE_MICROPHONE GENERIC_DEFERRED_PUSH(deferred_push_microphone_settings_list, DISPLAYLIST_MICROPHONE_SETTINGS_LIST) #endif -GENERIC_DEFERRED_PUSH(deferred_push_audio_resampler_settings_list, DISPLAYLIST_AUDIO_RESAMPLER_SETTINGS_LIST) GENERIC_DEFERRED_PUSH(deferred_push_audio_synchronization_settings_list, DISPLAYLIST_AUDIO_SYNCHRONIZATION_SETTINGS_LIST) GENERIC_DEFERRED_PUSH(deferred_push_audio_mixer_settings_list, DISPLAYLIST_AUDIO_MIXER_SETTINGS_LIST) GENERIC_DEFERRED_PUSH(deferred_push_input_settings_list, DISPLAYLIST_INPUT_SETTINGS_LIST) @@ -784,7 +783,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label( {MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST, deferred_push_audio_settings_list}, {MENU_ENUM_LABEL_DEFERRED_AUDIO_SYNCHRONIZATION_SETTINGS_LIST, deferred_push_audio_synchronization_settings_list}, {MENU_ENUM_LABEL_DEFERRED_AUDIO_OUTPUT_SETTINGS_LIST, deferred_push_audio_output_settings_list}, - {MENU_ENUM_LABEL_DEFERRED_AUDIO_RESAMPLER_SETTINGS_LIST, deferred_push_audio_resampler_settings_list}, {MENU_ENUM_LABEL_DEFERRED_AUDIO_MIXER_SETTINGS_LIST, deferred_push_audio_mixer_settings_list}, {MENU_ENUM_LABEL_DEFERRED_LATENCY_SETTINGS_LIST, deferred_push_latency_settings_list}, #ifdef HAVE_LAKKA_SWITCH @@ -1293,9 +1291,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label( BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_microphone_settings_list); break; #endif - case MENU_ENUM_LABEL_DEFERRED_AUDIO_RESAMPLER_SETTINGS_LIST: - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_audio_resampler_settings_list); - break; case MENU_ENUM_LABEL_DEFERRED_AUDIO_SYNCHRONIZATION_SETTINGS_LIST: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_audio_synchronization_settings_list); break; diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 47daa038a3..af651988c6 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -458,8 +458,6 @@ static enum msg_hash_enums action_ok_dl_to_enum(unsigned lbl) case ACTION_OK_DL_MICROPHONE_SETTINGS_LIST: return MENU_ENUM_LABEL_DEFERRED_MICROPHONE_SETTINGS_LIST; #endif - case ACTION_OK_DL_AUDIO_RESAMPLER_SETTINGS_LIST: - return MENU_ENUM_LABEL_DEFERRED_AUDIO_RESAMPLER_SETTINGS_LIST; case ACTION_OK_DL_AUDIO_SYNCHRONIZATION_SETTINGS_LIST: return MENU_ENUM_LABEL_DEFERRED_AUDIO_SYNCHRONIZATION_SETTINGS_LIST; case ACTION_OK_DL_AUDIO_MIXER_SETTINGS_LIST: @@ -1700,7 +1698,6 @@ int generic_action_ok_displaylist_push(const char *path, #ifdef HAVE_MICROPHONE case ACTION_OK_DL_MICROPHONE_SETTINGS_LIST: #endif - case ACTION_OK_DL_AUDIO_RESAMPLER_SETTINGS_LIST: case ACTION_OK_DL_AUDIO_MIXER_SETTINGS_LIST: case ACTION_OK_DL_INPUT_HOTKEY_BINDS_LIST: case ACTION_OK_DL_RECORDING_SETTINGS_LIST: @@ -5963,7 +5960,6 @@ DEFAULT_ACTION_OK_FUNC(action_ok_push_audio_output_settings_list, ACTION_OK_DL_A #ifdef HAVE_MICROPHONE DEFAULT_ACTION_OK_FUNC(action_ok_push_microphone_settings_list, ACTION_OK_DL_MICROPHONE_SETTINGS_LIST) #endif -DEFAULT_ACTION_OK_FUNC(action_ok_push_audio_resampler_settings_list, ACTION_OK_DL_AUDIO_RESAMPLER_SETTINGS_LIST) DEFAULT_ACTION_OK_FUNC(action_ok_push_audio_synchronization_settings_list, ACTION_OK_DL_AUDIO_SYNCHRONIZATION_SETTINGS_LIST) #ifdef HAVE_AUDIOMIXER DEFAULT_ACTION_OK_FUNC(action_ok_push_audio_mixer_settings_list, ACTION_OK_DL_AUDIO_MIXER_SETTINGS_LIST) @@ -8393,7 +8389,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, #ifdef HAVE_MICROPHONE {MENU_ENUM_LABEL_MICROPHONE_SETTINGS, action_ok_push_microphone_settings_list}, #endif - {MENU_ENUM_LABEL_AUDIO_RESAMPLER_SETTINGS, action_ok_push_audio_resampler_settings_list}, {MENU_ENUM_LABEL_LATENCY_SETTINGS, action_ok_push_latency_settings_list}, {MENU_ENUM_LABEL_CORE_SETTINGS, action_ok_push_core_settings_list}, {MENU_ENUM_LABEL_CORE_INFORMATION, action_ok_push_core_information_list}, diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 3dfd9fc786..48cd6c4dac 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -343,7 +343,6 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_window_opacity, MENU_ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_window_show_decorations, MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SHOW_DECORATIONS) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_window_show_menubar, MENU_ENUM_SUBLABEL_UI_MENUBAR_ENABLE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_settings_list, MENU_ENUM_SUBLABEL_AUDIO_SETTINGS) -DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_resampler_settings_list, MENU_ENUM_SUBLABEL_AUDIO_RESAMPLER_SETTINGS) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_output_settings_list, MENU_ENUM_SUBLABEL_AUDIO_OUTPUT_SETTINGS) #ifdef HAVE_MICROPHONE DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_microphone_settings_list, MENU_ENUM_SUBLABEL_MICROPHONE_SETTINGS) @@ -4734,9 +4733,6 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_AUDIO_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_settings_list); break; - case MENU_ENUM_LABEL_AUDIO_RESAMPLER_SETTINGS: - BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_resampler_settings_list); - break; case MENU_ENUM_LABEL_AUDIO_SYNCHRONIZATION_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_synchronization_settings_list); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index a61b864fd8..b91a4fb8bd 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -676,7 +676,6 @@ DEFAULT_TITLE_MACRO(action_get_midi_settings_list, MENU_ENUM_LABEL_ DEFAULT_TITLE_MACRO(action_get_updater_settings_list, MENU_ENUM_LABEL_VALUE_UPDATER_SETTINGS) DEFAULT_TITLE_MACRO(action_get_audio_settings_list, MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS) -DEFAULT_TITLE_MACRO(action_get_audio_resampler_settings_list, MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_SETTINGS) DEFAULT_TITLE_MACRO(action_get_audio_output_settings_list, MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_SETTINGS) #ifdef HAVE_MICROPHONE DEFAULT_TITLE_MACRO(action_get_microphone_settings_list, MENU_ENUM_LABEL_VALUE_MICROPHONE_SETTINGS) @@ -1045,7 +1044,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, {MENU_ENUM_LABEL_DEFERRED_CONTENTLESS_CORES_LIST, action_get_title_deferred_contentless_cores_list}, {MENU_ENUM_LABEL_DEFERRED_DRIVER_SETTINGS_LIST, action_get_driver_settings_list}, {MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST, action_get_audio_settings_list}, - {MENU_ENUM_LABEL_DEFERRED_AUDIO_RESAMPLER_SETTINGS_LIST, action_get_audio_resampler_settings_list}, {MENU_ENUM_LABEL_DEFERRED_AUDIO_OUTPUT_SETTINGS_LIST, action_get_audio_output_settings_list}, #ifdef HAVE_MICROPHONE {MENU_ENUM_LABEL_DEFERRED_MICROPHONE_SETTINGS_LIST, action_get_microphone_settings_list}, diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 4f9ad07033..bfd320cc09 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -10867,7 +10867,6 @@ static void materialui_list_insert( #ifdef HAVE_MICROPHONE || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_MICROPHONE_SETTINGS)) #endif - || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_SETTINGS)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_SYNCHRONIZATION_SETTINGS)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_MIXER_SETTINGS)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_MENU_SOUNDS)) diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index 2708ff4403..aaa79cca58 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -114,7 +114,6 @@ enum #ifdef HAVE_MICROPHONE ACTION_OK_DL_MICROPHONE_SETTINGS_LIST, #endif - ACTION_OK_DL_AUDIO_RESAMPLER_SETTINGS_LIST, ACTION_OK_DL_AUDIO_SYNCHRONIZATION_SETTINGS_LIST, ACTION_OK_DL_AUDIO_MIXER_SETTINGS_LIST, ACTION_OK_DL_LATENCY_SETTINGS_LIST, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index b7e1ab997b..122cd1b28e 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -7130,50 +7130,55 @@ unsigned menu_displaylist_build_list( 0, 0, 0, NULL)) count++; break; - case DISPLAYLIST_AUDIO_RESAMPLER_SETTINGS_LIST: - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER, - PARSE_ONLY_STRING_OPTIONS, false) == 0) - count++; - - if (string_is_not_equal(settings->arrays.audio_resampler, "null")) - { - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_AUDIO_RESAMPLER_QUALITY, - PARSE_ONLY_UINT, false) == 0) - count++; - } - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_AUDIO_OUTPUT_RATE, - PARSE_ONLY_UINT, false) == 0) - count++; - break; case DISPLAYLIST_AUDIO_OUTPUT_SETTINGS_LIST: { - menu_displaylist_build_info_selective_t build_list[] = { - {MENU_ENUM_LABEL_AUDIO_ENABLE, PARSE_ONLY_BOOL, true }, - {MENU_ENUM_LABEL_AUDIO_DRIVER, PARSE_ONLY_STRING_OPTIONS, true }, - {MENU_ENUM_LABEL_AUDIO_DEVICE, PARSE_ONLY_STRING, true }, - {MENU_ENUM_LABEL_AUDIO_OUTPUT_RATE, PARSE_ONLY_UINT, true }, - {MENU_ENUM_LABEL_AUDIO_LATENCY, PARSE_ONLY_UINT, true }, -#ifdef _WIN32 - {MENU_ENUM_LABEL_AUDIO_WASAPI_EXCLUSIVE_MODE, PARSE_ONLY_BOOL, true }, - {MENU_ENUM_LABEL_AUDIO_WASAPI_FLOAT_FORMAT, PARSE_ONLY_BOOL, true }, - {MENU_ENUM_LABEL_AUDIO_WASAPI_SH_BUFFER_LENGTH, PARSE_ONLY_INT, true }, -#endif - {MENU_ENUM_LABEL_AUDIO_BLOCK_FRAMES, PARSE_ONLY_UINT, true }, - }; - - for (i = 0; i < ARRAY_SIZE(build_list); i++) + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_AUDIO_ENABLE, + PARSE_ONLY_BOOL, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_AUDIO_DRIVER, + PARSE_ONLY_STRING_OPTIONS, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_AUDIO_DEVICE, + PARSE_ONLY_STRING, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_AUDIO_OUTPUT_RATE, + PARSE_ONLY_UINT, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_AUDIO_LATENCY, + PARSE_ONLY_UINT, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER, + PARSE_ONLY_STRING_OPTIONS, false) == 0) + count++; + if (string_is_not_equal(settings->arrays.audio_resampler, "null")) { - if (!build_list[i].checked && !include_everything) - continue; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - build_list[i].enum_idx, build_list[i].parse_type, - false) == 0) + MENU_ENUM_LABEL_AUDIO_RESAMPLER_QUALITY, + PARSE_ONLY_UINT, false) == 0) count++; } + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_AUDIO_BLOCK_FRAMES, + PARSE_ONLY_UINT, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_AUDIO_WASAPI_EXCLUSIVE_MODE, + PARSE_ONLY_BOOL, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_AUDIO_WASAPI_FLOAT_FORMAT, + PARSE_ONLY_BOOL, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_AUDIO_WASAPI_SH_BUFFER_LENGTH, + PARSE_ONLY_INT, false) == 0) + count++; } break; #ifdef HAVE_MICROPHONE @@ -7190,6 +7195,14 @@ unsigned menu_displaylist_build_list( MENU_ENUM_LABEL_MICROPHONE_DEVICE, PARSE_ONLY_STRING, false) == 0) count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_MICROPHONE_INPUT_RATE, + PARSE_ONLY_UINT, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_MICROPHONE_LATENCY, + PARSE_ONLY_UINT, false) == 0) + count++; if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_MICROPHONE_RESAMPLER_DRIVER, PARSE_ONLY_STRING_OPTIONS, false) == 0) @@ -7201,14 +7214,6 @@ unsigned menu_displaylist_build_list( PARSE_ONLY_UINT, false) == 0) count++; } - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_MICROPHONE_INPUT_RATE, - PARSE_ONLY_UINT, false) == 0) - count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_MICROPHONE_LATENCY, - PARSE_ONLY_UINT, false) == 0) - count++; if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_MICROPHONE_BLOCK_FRAMES, PARSE_ONLY_UINT, false) == 0) @@ -7223,7 +7228,7 @@ unsigned menu_displaylist_build_list( count++; if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_MICROPHONE_WASAPI_SH_BUFFER_LENGTH, - PARSE_ONLY_UINT, false) == 0) + PARSE_ONLY_INT, false) == 0) count++; break; #endif @@ -7260,7 +7265,6 @@ unsigned menu_displaylist_build_list( #ifdef HAVE_MICROPHONE {MENU_ENUM_LABEL_MICROPHONE_SETTINGS, PARSE_ACTION, true }, #endif - {MENU_ENUM_LABEL_AUDIO_RESAMPLER_SETTINGS, PARSE_ACTION, true }, {MENU_ENUM_LABEL_AUDIO_SYNCHRONIZATION_SETTINGS, PARSE_ACTION, true }, {MENU_ENUM_LABEL_MIDI_SETTINGS, PARSE_ACTION, true }, {MENU_ENUM_LABEL_AUDIO_MIXER_SETTINGS, PARSE_ACTION, false }, @@ -13683,7 +13687,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, case DISPLAYLIST_OPTIONS_REMAPPINGS: case DISPLAYLIST_VIDEO_SETTINGS_LIST: case DISPLAYLIST_AUDIO_SETTINGS_LIST: - case DISPLAYLIST_AUDIO_RESAMPLER_SETTINGS_LIST: case DISPLAYLIST_AUDIO_OUTPUT_SETTINGS_LIST: #ifdef HAVE_MICROPHONE case DISPLAYLIST_MICROPHONE_SETTINGS_LIST: diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index 5ef5df53eb..d46d6c2380 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -187,7 +187,6 @@ enum menu_displaylist_ctl_state DISPLAYLIST_CHEAT_DETAILS_SETTINGS_LIST, DISPLAYLIST_CHEAT_SEARCH_SETTINGS_LIST, DISPLAYLIST_AUDIO_SETTINGS_LIST, - DISPLAYLIST_AUDIO_RESAMPLER_SETTINGS_LIST, DISPLAYLIST_AUDIO_OUTPUT_SETTINGS_LIST, #ifdef HAVE_MICROPHONE DISPLAYLIST_MICROPHONE_SETTINGS_LIST, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 3eecd2a117..fe4f4ee620 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -10200,14 +10200,6 @@ static bool setting_append_list( &subgroup_info, parent_group); - CONFIG_ACTION( - list, list_info, - MENU_ENUM_LABEL_AUDIO_RESAMPLER_SETTINGS, - MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_SETTINGS, - &group_info, - &subgroup_info, - parent_group); - CONFIG_ACTION( list, list_info, MENU_ENUM_LABEL_AUDIO_OUTPUT_SETTINGS, @@ -13598,7 +13590,6 @@ static bool setting_append_list( general_write_handler, general_read_handler); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_ADVANCED); -#endif #ifdef HAVE_MICROPHONE CONFIG_UINT( list, list_info, @@ -13612,6 +13603,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_ADVANCED); +#endif #endif END_SUB_GROUP(list, list_info, parent_group); @@ -13820,6 +13812,7 @@ static bool setting_append_list( menu_settings_list_current_add_range(list, list_info, 0, 512, 1.0, true, true); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); +#ifdef RARCH_MOBILE CONFIG_UINT( list, list_info, &settings->uints.microphone_block_frames, @@ -13832,6 +13825,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_ADVANCED); +#endif END_SUB_GROUP(list, list_info, parent_group); diff --git a/msg_hash.h b/msg_hash.h index 1495bbf810..bc4a02619c 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1955,7 +1955,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_DEFERRED_MIDI_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_LOGGING_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST, - MENU_ENUM_LABEL_DEFERRED_AUDIO_RESAMPLER_SETTINGS_LIST, + MENU_ENUM_LABEL_DEFERRED_AUDIO_RESAMPLER_SETTINGS_LIST, /* deprecated */ MENU_ENUM_LABEL_DEFERRED_AUDIO_OUTPUT_SETTINGS_LIST, #ifdef HAVE_MICROPHONE MENU_ENUM_LABEL_DEFERRED_MICROPHONE_SETTINGS_LIST, @@ -3037,7 +3037,7 @@ enum msg_hash_enums MENU_LABEL(VIDEO_HDR_SETTINGS), MENU_LABEL(CRT_SWITCHRES_SETTINGS), MENU_LABEL(AUDIO_SETTINGS), - MENU_LABEL(AUDIO_RESAMPLER_SETTINGS), + MENU_LABEL(AUDIO_RESAMPLER_SETTINGS), /* deprecated */ MENU_LABEL(AUDIO_OUTPUT_SETTINGS), #ifdef HAVE_MICROPHONE MENU_LABEL(MICROPHONE_SETTINGS),