From 5ab5f0e07e478682f32901355f20723a556ab676 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 19 Jun 2015 03:06:21 +0200 Subject: [PATCH] (Menu) Menu hashes --- menu/menu_displaylist.c | 48 +++++++++++++++++++++++++++-------------- menu/menu_hash.c | 18 ++++++++++++---- menu/menu_hash.h | 6 ++++++ 3 files changed, 52 insertions(+), 20 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 0e2a97eccf..9dd5b2c358 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1384,20 +1384,33 @@ static int menu_displaylist_parse_horizontal_content_actions(menu_displaylist_in if (global->main_is_init && !global->libretro_dummy && !strcmp(menu->deferred_path, global->fullpath)) { - menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_RESUME_CONTENT), - "file_load_or_resume", MENU_SETTING_ACTION_RUN, 0, 0); - menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_SAVE_STATE), - "savestate", MENU_SETTING_ACTION_SAVESTATE, 0, 0); - 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), - 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, menu_hash_to_str(MENU_LABEL_VALUE_TAKE_SCREENSHOT), + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_RESUME_CONTENT), + "file_load_or_resume", + MENU_SETTING_ACTION_RUN, 0, 0); + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_SAVE_STATE), + menu_hash_to_str(MENU_LABEL_SAVE_STATE), + MENU_SETTING_ACTION_SAVESTATE, 0, 0); + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_LOAD_STATE), + menu_hash_to_str(MENU_LABEL_LOAD_STATE), + MENU_SETTING_ACTION_LOADSTATE, 0, 0); + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFORMATION), + 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), + menu_hash_to_str(MENU_LABEL_OPTIONS), + MENU_SETTING_ACTION_CORE_OPTIONS, 0, 0); + 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_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_RESTART_CONTENT), + menu_hash_to_str(MENU_LABEL_RESTART_CONTENT), MENU_SETTING_ACTION_RESET, 0, 0); } else @@ -1550,8 +1563,8 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *n if (!str_list) { const char *str = path_is_compressed - ? "Unable to read compressed file." - : "Directory not found."; + ? menu_hash_to_str(MENU_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE) + : menu_hash_to_str(MENU_LABEL_VALUE_DIRECTORY_NOT_FOUND); menu_list_push(info->list, str, "", 0, 0, 0); return 0; @@ -1566,7 +1579,8 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *n if (!(info->flags & SL_FLAG_ALLOW_EMPTY_LIST)) { menu_list_push(info->list, - "No items.", "", 0, 0, 0); + menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS), + "", 0, 0, 0); } string_list_free(str_list); @@ -1796,7 +1810,9 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) menu_list_push(info->list, "Custom Ratio", "", MENU_SETTINGS_CUSTOM_VIEWPORT, 0, 0); #ifndef HAVE_FILTERS_BUILTIN - menu_list_push(info->list, "Video Filter", "video_filter", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VIDEO_FILTER), + menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_FILTER), 0, 0, 0); #endif diff --git a/menu/menu_hash.c b/menu/menu_hash.c index d85088de40..4d6f04280d 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -26,6 +26,8 @@ static const char *menu_hash_to_str_dutch(uint32_t hash) { switch (hash) { + case MENU_LABEL_VALUE_CORE_INFORMATION: + return "Core Informatie"; case MENU_LABEL_CORE_LIST: return "Laad Core"; case MENU_LABEL_VALUE_SETTINGS: @@ -41,7 +43,7 @@ static const char *menu_hash_to_str_dutch(uint32_t hash) return "null"; } -static const char *menu_hash_to_str_fallback(uint32_t hash) +static const char *menu_hash_to_str_english(uint32_t hash) { switch (hash) { @@ -83,8 +85,6 @@ static const char *menu_hash_to_str_fallback(uint32_t hash) return "Take Screenshot"; case MENU_LABEL_VALUE_RESUME: return "Resume"; - case MENU_LABEL_VALUE_SAVE_STATE: - return "Save State"; case MENU_LABEL_VALUE_DISK_INDEX: return "Disk Index"; case MENU_LABEL_VALUE_FRONTEND_COUNTERS: @@ -141,6 +141,10 @@ static const char *menu_hash_to_str_fallback(uint32_t hash) return "core_information"; case MENU_LABEL_VALUE_CORE_INFORMATION: return "Core Information"; + case MENU_LABEL_VALUE_DIRECTORY_NOT_FOUND: + return "Directory not found."; + case MENU_LABEL_VALUE_NO_ITEMS: + return "No items."; case MENU_LABEL_CORE_LIST: return "Load Core"; case MENU_LABEL_UNLOAD_CORE: @@ -150,8 +154,12 @@ static const char *menu_hash_to_str_fallback(uint32_t hash) case MENU_LABEL_PERFORMANCE_COUNTERS: return "Performance Counters"; case MENU_LABEL_SAVE_STATE: + return "savestate"; + case MENU_LABEL_VALUE_SAVE_STATE: return "Save State"; case MENU_LABEL_LOAD_STATE: + return "loadstate"; + case MENU_LABEL_VALUE_LOAD_STATE: return "Load State"; case MENU_LABEL_VALUE_RESUME_CONTENT: return "Resume Content"; @@ -159,6 +167,8 @@ static const char *menu_hash_to_str_fallback(uint32_t hash) return "resume_content"; case MENU_LABEL_DRIVER_SETTINGS: return "Driver Settings"; + case MENU_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE: + return "Unable to read compressed file."; case MENU_LABEL_OVERLAY_SCALE: return "input_overlay_scale"; case MENU_LABEL_VALUE_OVERLAY_SCALE: @@ -221,7 +231,7 @@ const char *menu_hash_to_str(uint32_t hash) if (ret && strcmp(ret, "null") != 0) return ret; - return menu_hash_to_str_fallback(hash); + return menu_hash_to_str_english(hash); } uint32_t menu_hash_calculate(const char *s) diff --git a/menu/menu_hash.h b/menu/menu_hash.h index ccfc2b2319..87931af03c 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -27,6 +27,9 @@ extern "C" { #define MENU_LABEL_CHEAT_TOGGLE 0xe515e0cbU #define MENU_LABEL_PAUSE_TOGGLE 0x557634e4U +#define MENU_LABEL_VALUE_DIRECTORY_NOT_FOUND 0xcdf3c0d5U +#define MENU_LABEL_VALUE_NO_ITEMS 0x7d33e412U + #define MENU_LABEL_VALUE_SHADER_OPTIONS 0xf3fb0028U #define MENU_LABEL_VALUE_USE_THIS_DIRECTORY 0xc5fc9ed9U #define MENU_LABEL_VALUE_CORE_OPTIONS 0x1477b95aU @@ -35,6 +38,7 @@ extern "C" { #define MENU_LABEL_VALUE_NO_CORES_AVAILABLE 0xe16bfd0dU #define MENU_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE 0xea82695dU #define MENU_LABEL_SAVE_STATE 0x54a257f4U +#define MENU_LABEL_VALUE_LOAD_STATE 0xd23ba706U #define MENU_LABEL_VALUE_SAVE_STATE 0x3e182415U #define MENU_LABEL_LOAD_STATE 0xe8c5dae5U #define MENU_LABEL_REWIND 0x1931d5aeU @@ -314,6 +318,7 @@ extern "C" { #define MENU_LABEL_RECORDING_CONFIG_DIRECTORY 0x3c3f274bU #define MENU_LABEL_VIDEO_FONT_PATH 0xd0de729eU #define MENU_LABEL_VIDEO_FILTER 0x1c0eb741U +#define MENU_LABEL_VALUE_VIDEO_FILTER 0xc1690382U #define MENU_LABEL_MENU_WALLPAPER 0x3b84de01U #define MENU_LABEL_CONTENT_HISTORY_PATH 0x6f22fb9dU #define MENU_LABEL_AUDIO_DSP_PLUGIN 0x4a69572bU @@ -404,6 +409,7 @@ extern "C" { #define MENU_LABEL_REMAP_FILE_SAVE_CORE 0x7c9d4c8fU #define MENU_LABEL_REMAP_FILE_SAVE_GAME 0x7c9f41e0U #define MENU_LABEL_CONTENT_COLLECTION_LIST 0x0f8a9086U +#define MENU_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE 0xbae7be3eU #define MENU_LABEL_OSK_ENABLE 0x8e208498U #define MENU_LABEL_AUDIO_MUTE 0xe0ca1151U #define MENU_LABEL_EXIT_EMULATOR 0x86d5d467U