From 7df42acf8c8ebf70dac9d52a253b2c8fa2fcfb1b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 21 Jun 2015 23:54:57 +0200 Subject: [PATCH] (Menu) Update more labels --- menu/cbs/menu_cbs_get_value.c | 31 ++++++++++++++++++++----------- menu/menu_hash.c | 6 ++++++ menu/menu_hash.h | 3 +++ 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 36b7515612..7310b0e3cc 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -81,7 +81,7 @@ static void menu_action_setting_disp_set_label_configurations( fill_pathname_base(s, global->config_path, len); else - strlcpy(s, "", len); + strlcpy(s, menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT), len); } static void menu_action_setting_disp_set_label_shader_filter_pass( @@ -94,17 +94,11 @@ static void menu_action_setting_disp_set_label_shader_filter_pass( char *s2, size_t len2) { unsigned pass = 0; - static const char *modes[] = { - "Don't care", - "Linear", - "Nearest" - }; menu_handle_t *menu = menu_driver_get_ptr(); if (!menu) return; (void)pass; - (void)modes; (void)menu; *s = '\0'; @@ -117,8 +111,21 @@ static void menu_action_setting_disp_set_label_shader_filter_pass( pass = (type - MENU_SETTINGS_SHADER_PASS_FILTER_0); - strlcpy(s, modes[menu->shader->pass[pass].filter], - len); + switch (menu->shader->pass[pass].filter) + { + case 0: + strlcpy(s, menu_hash_to_str(MENU_VALUE_DONT_CARE), + len); + break; + case 1: + strlcpy(s, menu_hash_to_str(MENU_VALUE_LINEAR), + len); + break; + case 2: + strlcpy(s, menu_hash_to_str(MENU_VALUE_NEAREST), + len); + break; + } #endif } @@ -210,7 +217,9 @@ static void menu_action_setting_disp_set_label_shader_default_filter( *s = '\0'; *w = 19; snprintf(s, len, "%s", - settings->video.smooth ? "Linear" : "Nearest"); + settings->video.smooth ? + menu_hash_to_str(MENU_VALUE_LINEAR) : + menu_hash_to_str(MENU_VALUE_NEAREST)); } static void menu_action_setting_disp_set_label_shader_parameter( @@ -320,7 +329,7 @@ static void menu_action_setting_disp_set_label_shader_scale_pass( scale_value = menu->shader->pass[pass].fbo.scale_x; if (!scale_value) - strlcpy(s, "Don't care", len); + strlcpy(s, menu_hash_to_str(MENU_VALUE_DONT_CARE), len); else snprintf(s, len, "%ux", scale_value); #endif diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 5cf1560dcf..ca116220cb 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -1668,6 +1668,12 @@ static const char *menu_hash_to_str_english(uint32_t hash) return ""; case MENU_VALUE_UNKNOWN: return "Unknown"; + case MENU_VALUE_DONT_CARE: + return "Don't care"; + case MENU_VALUE_LINEAR: + return "Linear"; + case MENU_VALUE_NEAREST: + return "Nearest"; case MENU_VALUE_DIRECTORY_DEFAULT: return ""; case MENU_VALUE_DIRECTORY_NONE: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 4e13192161..1eb5e6ec9c 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -20,6 +20,9 @@ extern "C" { #endif +#define MENU_VALUE_DONT_CARE 0x19da07bcU +#define MENU_VALUE_LINEAR 0xc0d12dc0U +#define MENU_VALUE_NEAREST 0x6ab2b0b7U #define MENU_VALUE_UNKNOWN 0x9b3bb635U #define MENU_VALUE_USER 0x7c8da264U #define MENU_VALUE_CHEAT 0x0cf62beaU