From 641e7bcb89c2f335c7310ad939175ad5701399fe Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 19 Jun 2015 01:03:24 +0200 Subject: [PATCH] Use more hashes --- menu/menu_displaylist.c | 16 ++++++++-------- menu/menu_hash.c | 14 +++++++++++--- menu/menu_hash.h | 3 +++ menu/menu_setting.c | 4 ++-- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 45a834e69f..0e2a97eccf 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -914,7 +914,9 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) (core_name_hash != MENU_VALUE_DETECT) && (core_path_hash != MENU_VALUE_DETECT) ) - menu_list_push(info->list, "Start Content", "rdb_entry_start_content", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_RDB_ENTRY_START_CONTENT), + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_START_CONTENT), MENU_FILE_PLAYLIST_ENTRY, 0, 0); } } @@ -1093,7 +1095,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) if (db_info->count < 1) menu_list_push(info->list, - "No information available.", "", + menu_hash_to_str(MENU_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE), + "", 0, 0, 0); content_playlist_free(playlist); @@ -1122,10 +1125,8 @@ static int menu_database_parse_query(file_list_t *list, const char *path, for (i = 0; i < db_list->count; i++) { if (db_list->list[i].name && db_list->list[i].name[0] != '\0') - { menu_list_push(list, db_list->list[i].name, path, MENU_FILE_RDB_ENTRY, 0, 0); - } } database_info_list_free(db_list); @@ -1151,10 +1152,8 @@ static int deferred_push_video_shader_parameters_common( } for (i = 0; i < list_size; i++) - { menu_list_push(info->list, shader->parameters[i].desc, info->label, base_parameter + i, 0, 0); - } return 0; } @@ -1392,10 +1391,11 @@ static int menu_displaylist_parse_horizontal_content_actions(menu_displaylist_in menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_LOAD_STATE), "loadstate", MENU_SETTING_ACTION_LOADSTATE, 0, 0); menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFORMATION), - "core_information", MENU_SETTING_ACTION_CORE_INFORMATION, 0, 0); + menu_hash_to_str(MENU_LABEL_CORE_INFORMATION), MENU_SETTING_ACTION_CORE_INFORMATION, 0, 0); menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_OPTIONS), "options", MENU_SETTING_ACTION_CORE_OPTIONS, 0, 0); - menu_list_push(info->list, "Take Screenshot", "take_screenshot", + menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_TAKE_SCREENSHOT), + menu_hash_to_str(MENU_LABEL_TAKE_SCREENSHOT), MENU_SETTING_ACTION_SCREENSHOT, 0, 0); menu_list_push(info->list, "Reset", "restart_content", MENU_SETTING_ACTION_RESET, 0, 0); diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 5a56cacfba..e1c90fb40d 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -23,6 +23,10 @@ const char *menu_hash_to_str(uint32_t hash) { switch (hash) { + case MENU_LABEL_VALUE_RDB_ENTRY_START_CONTENT: + return "Start Content"; + case MENU_LABEL_RDB_ENTRY_START_CONTENT: + return "rdb_entry_start_content"; case MENU_LABEL_CUSTOM_BIND: return "custom_bind"; case MENU_LABEL_CUSTOM_BIND_ALL: @@ -55,6 +59,8 @@ const char *menu_hash_to_str(uint32_t hash) return "deferred_core_list_set"; case MENU_LABEL_VALUE_OPTIONS: return "Options"; + case MENU_LABEL_VALUE_TAKE_SCREENSHOT: + return "Take Screenshot"; case MENU_LABEL_VALUE_RESUME: return "Resume"; case MENU_LABEL_VALUE_SAVE_STATE: @@ -69,14 +75,14 @@ const char *menu_hash_to_str(uint32_t hash) return "Disk Image Append"; case MENU_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS: return "Disk Cycle Tray Status"; + case MENU_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE: + return "No playlist entries available."; case MENU_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE: return "No core information available."; case MENU_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE: return "No core options available."; case MENU_LABEL_VALUE_NO_CORES_AVAILABLE: return "No cores available."; - case MENU_LABEL_VALUE_CORE_INFORMATION: - return "Core Information"; case MENU_LABEL_VALUE_DATABASE_MANAGER: return "Database Manager"; case MENU_LABEL_VALUE_CURSOR_MANAGER: @@ -96,7 +102,7 @@ const char *menu_hash_to_str(uint32_t hash) case MENU_LABEL_RESTART_CONTENT: return "Restart Content"; case MENU_LABEL_TAKE_SCREENSHOT: - return "Take Screenshot"; + return "take_screenshot"; case MENU_LABEL_CORE_UPDATER_LIST: return "Core Updater"; case MENU_LABEL_SYSTEM_INFORMATION: @@ -104,6 +110,8 @@ const char *menu_hash_to_str(uint32_t hash) case MENU_LABEL_OPTIONS: return "Options"; case MENU_LABEL_CORE_INFORMATION: + return "core_information"; + case MENU_LABEL_VALUE_CORE_INFORMATION: return "Core Information"; case MENU_LABEL_CORE_LIST: return "Load Core"; diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 5c6b230c2d..a8de08fc8d 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -165,6 +165,8 @@ extern "C" { #define MENU_LABEL_TURBO 0x107434f1U +#define MENU_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE 0xea82695dU +#define MENU_LABEL_VALUE_RDB_ENTRY_START_CONTENT 0x2cf73cceU #define MENU_LABEL_RDB_ENTRY_START_CONTENT 0x95025a55U #define MENU_LABEL_RDB_ENTRY_PUBLISHER 0x4d7bcdfbU #define MENU_LABEL_RDB_ENTRY_DEVELOPER 0x06f61093U @@ -384,6 +386,7 @@ extern "C" { #define MENU_LABEL_VALUE_RESUME 0xce8ac2f6U #define MENU_LABEL_RESTART_CONTENT 0x1ea2e224U #define MENU_LABEL_TAKE_SCREENSHOT 0x6786e867U +#define MENU_LABEL_VALUE_TAKE_SCREENSHOT 0xab767128U #define MENU_LABEL_FILE_LOAD_OR_RESUME 0x952941f4U #define MENU_LABEL_DISK_IMAGE_APPEND 0x5af7d709U #define MENU_LABEL_CONFIGURATIONS 0x3e930a50U diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 3356685b79..bd18ba9452 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3539,8 +3539,8 @@ static bool setting_append_list_main_menu_options( menu_settings_list_current_add_cmd(list, list_info, EVENT_CMD_UNLOAD_CORE); CONFIG_ACTION( - "core_information", menu_hash_to_str(MENU_LABEL_CORE_INFORMATION), + menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFORMATION), group_info.name, subgroup_info.name, parent_group); } @@ -3672,8 +3672,8 @@ static bool setting_append_list_main_menu_options( menu_settings_list_current_add_cmd (list, list_info, EVENT_CMD_LOAD_STATE); CONFIG_ACTION( - "take_screenshot", menu_hash_to_str(MENU_LABEL_TAKE_SCREENSHOT), + menu_hash_to_str(MENU_LABEL_VALUE_TAKE_SCREENSHOT), group_info.name, subgroup_info.name, parent_group);