From cfd34334a4e609813541c97a9b330c55da2074d2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 16 Jun 2016 00:24:19 +0200 Subject: [PATCH] Use menu_hash_to_str_enum --- menu/menu_setting.c | 82 ++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 4a935e514a..9e23d7bf02 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -966,7 +966,7 @@ static void setting_get_string_representation_st_float_video_refresh_rate_auto(v menu_animation_ctl(MENU_ANIMATION_CTL_SET_ACTIVE, NULL); } else - strlcpy(s, menu_hash_to_str(MENU_VALUE_NOT_AVAILABLE), len); + strlcpy(s, menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len); } static void setting_get_string_representation_st_dir(void *data, @@ -4205,11 +4205,11 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, verbosity_get_ptr(), - menu_hash_to_str(MENU_LABEL_LOG_VERBOSITY), - menu_hash_to_str(MENU_LABEL_VALUE_LOG_VERBOSITY), + menu_hash_to_str_enum(MENU_ENUM_LABEL_LOG_VERBOSITY), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_LOG_VERBOSITY), false, - menu_hash_to_str(MENU_VALUE_OFF), - menu_hash_to_str(MENU_VALUE_ON), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON), &group_info, &subgroup_info, parent_group, @@ -4221,8 +4221,8 @@ static bool setting_append_list( CONFIG_UINT( list, list_info, &settings->libretro_log_level, - menu_hash_to_str(MENU_LABEL_LIBRETRO_LOG_LEVEL), - menu_hash_to_str(MENU_LABEL_VALUE_LIBRETRO_LOG_LEVEL), + menu_hash_to_str_enum(MENU_ENUM_LABEL_LIBRETRO_LOG_LEVEL), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_LIBRETRO_LOG_LEVEL), libretro_log_level, &group_info, &subgroup_info, @@ -4238,11 +4238,11 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, &settings->debug_panel_enable, - menu_hash_to_str(MENU_LABEL_DEBUG_PANEL_ENABLE), - menu_hash_to_str(MENU_LABEL_VALUE_DEBUG_PANEL_ENABLE), + menu_hash_to_str_enum(MENU_ENUM_LABEL_DEBUG_PANEL_ENABLE), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_DEBUG_PANEL_ENABLE), false, - menu_hash_to_str(MENU_VALUE_OFF), - menu_hash_to_str(MENU_VALUE_ON), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON), &group_info, &subgroup_info, parent_group, @@ -4288,11 +4288,11 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, &settings->sort_savefiles_enable, - menu_hash_to_str(MENU_LABEL_SORT_SAVEFILES_ENABLE), - menu_hash_to_str(MENU_LABEL_VALUE_SORT_SAVEFILES_ENABLE), + menu_hash_to_str_enum(MENU_ENUM_LABEL_SORT_SAVEFILES_ENABLE), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE), default_sort_savefiles_enable, - menu_hash_to_str(MENU_VALUE_OFF), - menu_hash_to_str(MENU_VALUE_ON), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON), &group_info, &subgroup_info, parent_group, @@ -4304,11 +4304,11 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, &settings->sort_savestates_enable, - menu_hash_to_str(MENU_LABEL_SORT_SAVESTATES_ENABLE), - menu_hash_to_str(MENU_LABEL_VALUE_SORT_SAVESTATES_ENABLE), + menu_hash_to_str_enum(MENU_ENUM_LABEL_SORT_SAVESTATES_ENABLE), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE), default_sort_savestates_enable, - menu_hash_to_str(MENU_VALUE_OFF), - menu_hash_to_str(MENU_VALUE_ON), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON), &group_info, &subgroup_info, parent_group, @@ -4320,11 +4320,11 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, &settings->block_sram_overwrite, - menu_hash_to_str(MENU_LABEL_BLOCK_SRAM_OVERWRITE), - menu_hash_to_str(MENU_LABEL_VALUE_BLOCK_SRAM_OVERWRITE), + menu_hash_to_str_enum(MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE), block_sram_overwrite, - menu_hash_to_str(MENU_VALUE_OFF), - menu_hash_to_str(MENU_VALUE_ON), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON), &group_info, &subgroup_info, parent_group, @@ -4415,11 +4415,11 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, &settings->rewind_enable, - menu_hash_to_str(MENU_LABEL_REWIND_ENABLE), - menu_hash_to_str(MENU_LABEL_VALUE_REWIND_ENABLE), + menu_hash_to_str_enum(MENU_ENUM_LABEL_REWIND_ENABLE), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_REWIND_ENABLE), rewind_enable, - menu_hash_to_str(MENU_VALUE_OFF), - menu_hash_to_str(MENU_VALUE_ON), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON), &group_info, &subgroup_info, parent_group, @@ -4444,8 +4444,8 @@ static bool setting_append_list( CONFIG_UINT( list, list_info, &settings->rewind_granularity, - menu_hash_to_str(MENU_LABEL_REWIND_GRANULARITY), - menu_hash_to_str(MENU_LABEL_VALUE_REWIND_GRANULARITY), + menu_hash_to_str_enum(MENU_ENUM_LABEL_REWIND_GRANULARITY), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY), rewind_granularity, &group_info, &subgroup_info, @@ -4735,8 +4735,8 @@ static bool setting_append_list( CONFIG_FLOAT( list, list_info, &settings->video.scale, - menu_hash_to_str(MENU_LABEL_VIDEO_SCALE), - menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SCALE), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VIDEO_SCALE), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_VIDEO_SCALE), scale, "%.1fx", &group_info, @@ -5487,8 +5487,8 @@ static bool setting_append_list( CONFIG_FLOAT( list, list_info, &settings->input.axis_threshold, - menu_hash_to_str(MENU_LABEL_INPUT_AXIS_THRESHOLD), - menu_hash_to_str(MENU_LABEL_VALUE_INPUT_AXIS_THRESHOLD), + menu_hash_to_str_enum(MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD), axis_threshold, "%.3f", &group_info, @@ -7663,11 +7663,11 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, &settings->camera.allow, - menu_hash_to_str(MENU_LABEL_CAMERA_ALLOW), - menu_hash_to_str(MENU_LABEL_VALUE_CAMERA_ALLOW), + menu_hash_to_str_enum(MENU_ENUM_LABEL_CAMERA_ALLOW), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CAMERA_ALLOW), false, - menu_hash_to_str(MENU_VALUE_OFF), - menu_hash_to_str(MENU_VALUE_ON), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON), &group_info, &subgroup_info, parent_group, @@ -7682,11 +7682,11 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, &settings->location.allow, - menu_hash_to_str(MENU_LABEL_LOCATION_ALLOW), - menu_hash_to_str(MENU_LABEL_VALUE_LOCATION_ALLOW), + menu_hash_to_str_enum(MENU_ENUM_LABEL_LOCATION_ALLOW), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW), false, - menu_hash_to_str(MENU_VALUE_OFF), - menu_hash_to_str(MENU_VALUE_ON), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF), + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON), &group_info, &subgroup_info, parent_group,