diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 4c55e2f022..a7fc3078f8 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -468,7 +468,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(menu_file_list_cbs_t * cbs->action_deferred_push = deferred_push_core_updater_list; #endif break; - case MENU_LABEL_HISTORY_LIST: + case MENU_LABEL_LOAD_CONTENT_HISTORY: cbs->action_deferred_push = deferred_push_history_list; break; case MENU_LABEL_DATABASE_MANAGER_LIST: diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index ea07e85e1a..11305cbe75 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -774,7 +774,7 @@ static void menu_action_setting_disp_set_label(file_list_t* list, switch (hash_label) { case MENU_LABEL_PERFORMANCE_COUNTERS: - case MENU_LABEL_HISTORY_LIST: + case MENU_LABEL_LOAD_CONTENT_HISTORY: *w = strlen(label); break; } diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 96bf810437..aa6b9141ec 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1607,7 +1607,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_DETECT_CORE_LIST_OK: cbs->action_ok = action_ok_file_load_detect_core; break; - case MENU_LABEL_HISTORY_LIST: + case MENU_LABEL_LOAD_CONTENT_HISTORY: case MENU_LABEL_CURSOR_MANAGER_LIST: case MENU_LABEL_DATABASE_MANAGER_LIST: cbs->action_ok = action_ok_push_generic_list; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 3f1d15e59d..71126aac63 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -663,7 +663,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_SETTINGS: case MENU_LABEL_FRONTEND_COUNTERS: case MENU_LABEL_CORE_COUNTERS: - case MENU_LABEL_HISTORY_LIST: + case MENU_LABEL_LOAD_CONTENT_HISTORY: case MENU_LABEL_INFO_SCREEN: case MENU_LABEL_SYSTEM_INFORMATION: case MENU_LABEL_CORE_INFORMATION: diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 661ee38718..e8d23acf67 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -193,6 +193,22 @@ static const char *menu_hash_to_str_english(uint32_t hash) { switch (hash) { + case MENU_LABEL_DETECT_CORE_LIST: + return "detect_core_list"; + case MENU_LABEL_VALUE_DETECT_CORE_LIST: + return "Load Content (Detect Core)"; + case MENU_LABEL_LOAD_CONTENT_HISTORY: + return "history_list"; + case MENU_LABEL_VALUE_LOAD_CONTENT_HISTORY: + return "Load Content (History)"; + case MENU_LABEL_AUDIO_ENABLE: + return "audio_enable"; + case MENU_LABEL_VALUE_AUDIO_ENABLE: + return "Audio Enable"; + case MENU_LABEL_FPS_SHOW: + return "fps_show"; + case MENU_LABEL_VALUE_FPS_SHOW: + return "Display Framerate"; case MENU_LABEL_AUDIO_MUTE: return "audio_mute_enable"; case MENU_LABEL_VALUE_AUDIO_MUTE: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 427c2a696a..36002312e3 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -46,10 +46,14 @@ extern "C" { #define MENU_LABEL_NETPLAY_FLIP_PLAYERS 0x801425abU #define MENU_LABEL_CHEAT_INDEX_MINUS 0x57f58b6cU #define MENU_LABEL_CHEAT_INDEX_PLUS 0x678542a4U +#define MENU_LABEL_AUDIO_ENABLE 0x28614f5dU +#define MENU_LABEL_VALUE_AUDIO_ENABLE 0xcdbb9b9eU #define MENU_LABEL_SCREENSHOT_DIRECTORY 0x552612d7U #define MENU_LABEL_SHADER_NEXT 0x54d359baU #define MENU_LABEL_SHADER_PREV 0x54d4a758U #define MENU_LABEL_FRAME_ADVANCE 0xd80302a1U +#define MENU_LABEL_FPS_SHOW 0x5ea1e10eU +#define MENU_LABEL_VALUE_FPS_SHOW 0x92588792U #define MENU_LABEL_MOVIE_RECORD_TOGGLE 0xa2d2ff04U #define MENU_LABEL_L_X_PLUS 0xd7370d4bU #define MENU_LABEL_L_X_MINUS 0xbde0aaf3U @@ -246,6 +250,7 @@ extern "C" { #define MENU_LABEL_CONTENT_ACTIONS 0xa0d76970U #define MENU_LABEL_DETECT_CORE_LIST 0xaa07c341U +#define MENU_LABEL_VALUE_DETECT_CORE_LIST 0x69f11813U #define MENU_LABEL_DETECT_CORE_LIST_OK 0xabba2a7aU #define MENU_LABEL_LOAD_CONTENT 0x5745de1fU #define MENU_LABEL_VALUE_LOAD_CONTENT 0x755f3680U @@ -294,7 +299,8 @@ extern "C" { #define MENU_LABEL_VALUE_FRONTEND_COUNTERS 0x5752bcf8U #define MENU_LABEL_VALUE_CORE_COUNTERS 0x4610e861U #define MENU_LABEL_CORE_COUNTERS 0x64cc83e0U -#define MENU_LABEL_HISTORY_LIST 0x60d82032U +#define MENU_LABEL_LOAD_CONTENT_HISTORY 0x60d82032U +#define MENU_LABEL_VALUE_LOAD_CONTENT_HISTORY 0x03531ac3U #define MENU_LABEL_INFO_SCREEN 0xd97853d0U #define MENU_LABEL_SYSTEM_INFORMATION 0x206ebf0fU #define MENU_LABEL_VALUE_SYSTEM_INFORMATION 0xa62fd7f0U diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 3ee521eddb..c827a117ca 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -2187,7 +2187,7 @@ static int setting_get_description_compare_label(uint32_t label_hash, "Directory is a full path, it will start \n" "in the folder where the file is."); break; - case MENU_LABEL_HISTORY_LIST: + case MENU_LABEL_LOAD_CONTENT_HISTORY: snprintf(s, len, " -- Loading content from history. \n" " \n" @@ -3561,8 +3561,8 @@ static bool setting_append_list_main_menu_options( if (settings->history_list_enable) { CONFIG_ACTION( - "history_list", - "Load Content (History)", + menu_hash_to_str(MENU_LABEL_LOAD_CONTENT_HISTORY), + menu_hash_to_str(MENU_LABEL_VALUE_LOAD_CONTENT_HISTORY), group_info.name, subgroup_info.name, parent_group); @@ -3570,8 +3570,8 @@ static bool setting_append_list_main_menu_options( if (global->core_info && core_info_list_num_info_files(global->core_info)) { CONFIG_ACTION( - "detect_core_list", - "Load Content (Detect Core)", + menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST), + menu_hash_to_str(MENU_LABEL_VALUE_DETECT_CORE_LIST), group_info.name, subgroup_info.name, parent_group); @@ -4457,8 +4457,8 @@ static bool setting_append_list_video_options( START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); CONFIG_BOOL(settings->fps_show, - "fps_show", - "Display Framerate", + menu_hash_to_str(MENU_LABEL_FPS_SHOW), + menu_hash_to_str(MENU_LABEL_VALUE_FPS_SHOW), fps_show, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -5044,8 +5044,8 @@ static bool setting_append_list_audio_options( CONFIG_BOOL( settings->audio.enable, - "audio_enable", - "Audio Enable", + menu_hash_to_str(MENU_LABEL_AUDIO_ENABLE), + menu_hash_to_str(MENU_LABEL_VALUE_AUDIO_ENABLE), audio_enable, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON),