diff --git a/menu/menu_setting.c b/menu/menu_setting.c index bf82b9f490..fc1d32f28a 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -2549,8 +2549,8 @@ static bool setting_append_list( list, list_info, settings->input.driver, sizeof(settings->input.driver), - msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_DRIVER), + MENU_ENUM_LABEL_INPUT_DRIVER, + MENU_ENUM_LABEL_VALUE_INPUT_DRIVER, config_get_default_input(), config_get_input_driver_options(), &group_info, @@ -2567,8 +2567,8 @@ static bool setting_append_list( list, list_info, settings->input.joypad_driver, sizeof(settings->input.driver), - msg_hash_to_str(MENU_ENUM_LABEL_JOYPAD_DRIVER), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER), + MENU_ENUM_LABEL_JOYPAD_DRIVER, + MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER, config_get_default_joypad(), config_get_joypad_driver_options(), &group_info, @@ -2585,8 +2585,8 @@ static bool setting_append_list( list, list_info, settings->video.driver, sizeof(settings->video.driver), - msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_DRIVER), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER), + MENU_ENUM_LABEL_VIDEO_DRIVER, + MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER, config_get_default_video(), config_get_video_driver_options(), &group_info, @@ -2603,8 +2603,8 @@ static bool setting_append_list( list, list_info, settings->audio.driver, sizeof(settings->audio.driver), - msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_DRIVER), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_AUDIO_DRIVER), + MENU_ENUM_LABEL_AUDIO_DRIVER, + MENU_ENUM_LABEL_VALUE_AUDIO_DRIVER, config_get_default_audio(), config_get_audio_driver_options(), &group_info, @@ -2621,8 +2621,8 @@ static bool setting_append_list( list, list_info, settings->audio.resampler, sizeof(settings->audio.resampler), - msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_DRIVER), + MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER, + MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_DRIVER, config_get_default_audio_resampler(), config_get_audio_resampler_driver_options(), &group_info, @@ -2639,8 +2639,8 @@ static bool setting_append_list( list, list_info, settings->camera.driver, sizeof(settings->camera.driver), - msg_hash_to_str(MENU_ENUM_LABEL_CAMERA_DRIVER), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CAMERA_DRIVER), + MENU_ENUM_LABEL_CAMERA_DRIVER, + MENU_ENUM_LABEL_VALUE_CAMERA_DRIVER, config_get_default_camera(), config_get_camera_driver_options(), &group_info, @@ -2657,8 +2657,8 @@ static bool setting_append_list( list, list_info, settings->wifi.driver, sizeof(settings->wifi.driver), - msg_hash_to_str(MENU_ENUM_LABEL_WIFI_DRIVER), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_WIFI_DRIVER), + MENU_ENUM_LABEL_WIFI_DRIVER, + MENU_ENUM_LABEL_VALUE_WIFI_DRIVER, config_get_default_wifi(), config_get_wifi_driver_options(), &group_info, @@ -2675,8 +2675,8 @@ static bool setting_append_list( list, list_info, settings->location.driver, sizeof(settings->location.driver), - msg_hash_to_str(MENU_ENUM_LABEL_LOCATION_DRIVER), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LOCATION_DRIVER), + MENU_ENUM_LABEL_LOCATION_DRIVER, + MENU_ENUM_LABEL_VALUE_LOCATION_DRIVER, config_get_default_location(), config_get_location_driver_options(), &group_info, @@ -2693,8 +2693,8 @@ static bool setting_append_list( list, list_info, settings->menu.driver, sizeof(settings->menu.driver), - msg_hash_to_str(MENU_ENUM_LABEL_MENU_DRIVER), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MENU_DRIVER), + MENU_ENUM_LABEL_MENU_DRIVER, + MENU_ENUM_LABEL_VALUE_MENU_DRIVER, config_get_default_menu(), config_get_menu_driver_options(), &group_info, @@ -2711,8 +2711,8 @@ static bool setting_append_list( list, list_info, settings->record.driver, sizeof(settings->record.driver), - msg_hash_to_str(MENU_ENUM_LABEL_RECORD_DRIVER), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RECORD_DRIVER), + MENU_ENUM_LABEL_RECORD_DRIVER, + MENU_ENUM_LABEL_VALUE_RECORD_DRIVER, config_get_default_record(), config_get_record_driver_options(), &group_info, diff --git a/setting_list.c b/setting_list.c index d317dd79de..046f29058d 100644 --- a/setting_list.c +++ b/setting_list.c @@ -1635,14 +1635,18 @@ bool CONFIG_STRING_OPTIONS( rarch_setting_t **list, rarch_setting_info_t *list_info, char *target, size_t len, - const char *name, const char *SHORT, + enum msg_hash_enums name_enum_idx, + enum msg_hash_enums SHORT_enum_idx, const char *default_value, const char *values, rarch_setting_group_info_t *group_info, rarch_setting_group_info_t *subgroup_info, const char *parent_group, change_handler_t change_handler, change_handler_t read_handler) { - rarch_setting_t value = setting_string_setting_options(ST_STRING_OPTIONS, name, SHORT, target, len, default_value, "", values, + rarch_setting_t value = setting_string_setting_options(ST_STRING_OPTIONS, + msg_hash_to_str(name_enum_idx), + msg_hash_to_str(SHORT_enum_idx), + target, len, default_value, "", values, group_info->name, subgroup_info->name, parent_group, change_handler, read_handler); if (!(settings_list_append(list, list_info))) return false; diff --git a/setting_list.h b/setting_list.h index 67d61c4350..cc49b80e02 100644 --- a/setting_list.h +++ b/setting_list.h @@ -322,7 +322,8 @@ bool CONFIG_STRING_OPTIONS( rarch_setting_t **list, rarch_setting_info_t *list_info, char *target, size_t len, - const char *name, const char *SHORT, + enum msg_hash_enums name_enum_idx, + enum msg_hash_enums SHORT_enum_idx, const char *default_value, const char *values, rarch_setting_group_info_t *group_info, rarch_setting_group_info_t *subgroup_info,