From 7741a6fbbaabf52284098e63f34c8d19d45f8a16 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 18 Jun 2015 09:45:27 +0200 Subject: [PATCH] (Menu) Use menu_hash_to_str in more places --- menu/menu_displaylist.c | 47 +++++++++++++++++++++++++++++------------ menu/menu_hash.c | 30 ++++++++++++++++++++++++++ menu/menu_hash.h | 6 ++++++ 3 files changed, 69 insertions(+), 14 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 14547a1777..c3b54d25db 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1340,23 +1340,34 @@ static int menu_displaylist_parse_options(menu_displaylist_info_t *info) global_t *global = global_get_ptr(); menu_list_push(info->list, - menu_hash_to_str(MENU_LABEL_VALUE_CORE_OPTIONS), "core_options", + menu_hash_to_str(MENU_LABEL_VALUE_CORE_OPTIONS), + menu_hash_to_str(MENU_LABEL_CORE_OPTIONS), MENU_SETTING_ACTION, 0, 0); if (global->main_is_init) { if (global->has_set_input_descriptors) - menu_list_push(info->list, "Core Input Remapping Options", "core_input_remapping_options", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS), + menu_hash_to_str(MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS), MENU_SETTING_ACTION, 0, 0); - menu_list_push(info->list, "Core Cheat Options", "core_cheat_options", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_CORE_CHEAT_OPTIONS), + menu_hash_to_str(MENU_LABEL_CORE_CHEAT_OPTIONS), MENU_SETTING_ACTION, 0, 0); if (!global->libretro_dummy && global->system.disk_control.get_num_images) - menu_list_push(info->list, "Core Disk Options", "disk_options", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_DISK_OPTIONS), + menu_hash_to_str(MENU_LABEL_DISK_OPTIONS), MENU_SETTING_ACTION, 0, 0); } - menu_list_push(info->list, "Video Options", "video_options", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_OPTIONS), + menu_hash_to_str(MENU_LABEL_VIDEO_OPTIONS), MENU_SETTING_ACTION, 0, 0); #ifdef HAVE_SHADER_MANAGER - menu_list_push(info->list, "Shader Options", "shader_options", + menu_list_push(info->list, + "Shader Options", + "shader_options", MENU_SETTING_ACTION, 0, 0); #endif @@ -1427,9 +1438,11 @@ static int menu_displaylist_parse_options_cheats(menu_displaylist_info_t *info) static int menu_displaylist_parse_options_management(menu_displaylist_info_t *info) { #ifdef HAVE_LIBRETRODB - menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_DATABASE_MANAGER), "database_manager_list", + menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_DATABASE_MANAGER), + menu_hash_to_str(MENU_LABEL_DATABASE_MANAGER_LIST), MENU_SETTING_ACTION, 0, 0); - menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_CURSOR_MANAGER), "cursor_manager_list", + menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_CURSOR_MANAGER), + menu_hash_to_str(MENU_LABEL_CURSOR_MANAGER_LIST), MENU_SETTING_ACTION, 0, 0); #endif return 0; @@ -1831,10 +1844,12 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) case DISPLAYLIST_PERFCOUNTER_SELECTION: menu_list_clear(info->list); menu_list_push(info->list, - menu_hash_to_str(MENU_LABEL_VALUE_FRONTEND_COUNTERS), "frontend_counters", + menu_hash_to_str(MENU_LABEL_VALUE_FRONTEND_COUNTERS), + menu_hash_to_str(MENU_LABEL_FRONTEND_COUNTERS), MENU_SETTING_ACTION, 0, 0); menu_list_push(info->list, - menu_hash_to_str(MENU_LABEL_VALUE_CORE_COUNTERS), "core_counters", + menu_hash_to_str(MENU_LABEL_VALUE_CORE_COUNTERS), + menu_hash_to_str(MENU_LABEL_CORE_COUNTERS), MENU_SETTING_ACTION, 0, 0); need_refresh = true; @@ -1939,13 +1954,16 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) case DISPLAYLIST_OPTIONS_DISK: menu_list_clear(info->list); menu_list_push(info->list, - menu_hash_to_str(MENU_LABEL_VALUE_DISK_INDEX), "disk_idx", + menu_hash_to_str(MENU_LABEL_VALUE_DISK_INDEX), + menu_hash_to_str(MENU_LABEL_DISK_INDEX), MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX, 0, 0); menu_list_push(info->list, - menu_hash_to_str(MENU_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS), "disk_cycle_tray_status", + menu_hash_to_str(MENU_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS), + menu_hash_to_str(MENU_LABEL_DISK_CYCLE_TRAY_STATUS), MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS, 0, 0); menu_list_push(info->list, - menu_hash_to_str(MENU_LABEL_VALUE_DISK_IMAGE_APPEND), "disk_image_append", + menu_hash_to_str(MENU_LABEL_VALUE_DISK_IMAGE_APPEND), + menu_hash_to_str(MENU_LABEL_DISK_IMAGE_APPEND), MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_IMAGE_APPEND, 0, 0); need_push = true; @@ -1982,7 +2000,8 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) menu_list_push(info->list, core_info[i].path, "", MENU_FILE_CORE, 0, 0); else - menu_list_push(info->list, core_info[i].path, "detect_core_list_ok", + menu_list_push(info->list, core_info[i].path, + menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST_OK), MENU_FILE_CORE, 0, 0); menu_list_set_alt_at_offset(info->list, i, core_info[i].display_name); diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 40e9357280..9f3e9235e8 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -23,6 +23,28 @@ const char *menu_hash_to_str(uint32_t hash) { switch (hash) { + case MENU_LABEL_VALUE_DISK_OPTIONS: + return "Core Disk Options"; + case MENU_LABEL_VALUE_CORE_OPTIONS: + return "Core Options"; + case MENU_LABEL_VALUE_CORE_CHEAT_OPTIONS: + return "Core Cheat Options"; + case MENU_LABEL_CORE_CHEAT_OPTIONS: + return "core_cheat_options"; + case MENU_LABEL_CORE_OPTIONS: + return "core_options"; + case MENU_LABEL_DATABASE_MANAGER_LIST: + return "database_manager_list"; + case MENU_LABEL_CURSOR_MANAGER_LIST: + return "cursor_manager_list"; + case MENU_LABEL_FRONTEND_COUNTERS: + return "frontend_counters"; + case MENU_LABEL_CORE_COUNTERS: + return "core_counters"; + case MENU_LABEL_DISK_CYCLE_TRAY_STATUS: + return "disk_cycle_tray_status"; + case MENU_LABEL_DISK_IMAGE_APPEND: + return "disk_image_append"; case MENU_LABEL_DEFERRED_CORE_LIST: return "deferred_core_list"; case MENU_LABEL_DEFERRED_CORE_LIST_SET: @@ -109,6 +131,14 @@ const char *menu_hash_to_str(uint32_t hash) return "Dynamic Wallpaper"; case MENU_LABEL_VALUE_BOXART: return "Display Boxart"; + case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS: + return "Core Input Remapping Options"; + case MENU_LABEL_VIDEO_OPTIONS: + return "video_options"; + case MENU_LABEL_VALUE_VIDEO_OPTIONS: + return "Video Options"; + default: + break; } return "null"; diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 3a07a2d976..4a76ebed4a 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -266,14 +266,20 @@ extern "C" { #define MENU_LABEL_VIDEO_SHADER_PARAMETERS 0x9895c3e5U #define MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS 0xd18158d7U #define MENU_LABEL_DISK_OPTIONS 0xc61ab5fbU +#define MENU_LABEL_VALUE_DISK_OPTIONS 0xbee508e5U #define MENU_LABEL_CORE_OPTIONS 0xf65e60f9U +#define MENU_LABEL_DISK_CYCLE_TRAY_STATUS 0x3035cdc1U #define MENU_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS 0xf44928c4U #define MENU_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE 0xd064cbe6U #define MENU_LABEL_VALUE_DISK_INDEX 0xadbce4a8U #define MENU_LABEL_VALUE_DISK_IMAGE_APPEND 0x1cb28c6bU +#define MENU_LABEL_DISK_INDEX 0x6c14bf54U #define MENU_LABEL_SHADER_OPTIONS 0x1f7d2fc7U #define MENU_LABEL_VIDEO_OPTIONS 0x6390c4e7U +#define MENU_LABEL_VALUE_VIDEO_OPTIONS 0xb4349948U +#define MENU_LABEL_VALUE_CORE_CHEAT_OPTIONS 0x8ba478bfU #define MENU_LABEL_CORE_CHEAT_OPTIONS 0x9293171dU +#define MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS 0x7c65016dU #define MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS 0x7836a8caU #define MENU_LABEL_VALUE_CURSOR_MANAGER 0xc3696afeU #define MENU_LABEL_VALUE_DATABASE_MANAGER 0x6af9d2b5U