diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index d94e7b2f12..6b1da0bfe8 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -82,7 +82,8 @@ static int rarch_defer_core_wrapper(menu_displaylist_info_t *info, info->directory_ptr = idx; rdb_entry_start_game_selection_ptr = idx; strlcpy(info->path, settings->libretro_directory, sizeof(info->path)); - strlcpy(info->label, "deferred_core_list_set", sizeof(info->label)); + strlcpy(info->label, + menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_LIST_SET), sizeof(info->label)); ret = menu_displaylist_push_list(info, DISPLAYLIST_GENERIC); break; default: @@ -102,10 +103,12 @@ static int rarch_defer_core_wrapper(menu_displaylist_info_t *info, { case MENU_LABEL_COLLECTION: rdb_entry_start_game_selection_ptr = idx; - strlcpy(info->label, "deferred_core_list_set", sizeof(info->label)); + strlcpy(info->label, + menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_LIST_SET), sizeof(info->label)); break; default: - strlcpy(info->label, "deferred_core_list", sizeof(info->label)); + strlcpy(info->label, + menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_LIST), sizeof(info->label)); break; } diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index d34553eb28..14547a1777 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -608,7 +608,8 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info, if (list_size <= 0) { - menu_list_push(info->list, "No playlist entries available.", "", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE), "", MENU_SETTINGS_CORE_OPTION_NONE, 0, 0); return 0; } @@ -1338,7 +1339,8 @@ static int menu_displaylist_parse_options(menu_displaylist_info_t *info) { global_t *global = global_get_ptr(); - menu_list_push(info->list, "Core Options", "core_options", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_CORE_OPTIONS), "core_options", MENU_SETTING_ACTION, 0, 0); if (global->main_is_init) { @@ -1520,7 +1522,8 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *n ? info->exts : NULL, true); if (push_dir) - menu_list_push(info->list, "", "", + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_USE_THIS_DIRECTORY), "", MENU_FILE_USE_DIRECTORY, 0 ,0); if (!str_list) diff --git a/menu/menu_hash.c b/menu/menu_hash.c index a5a7609566..40e9357280 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_DEFERRED_CORE_LIST: + return "deferred_core_list"; + case MENU_LABEL_DEFERRED_CORE_LIST_SET: + return "deferred_core_list_set"; case MENU_LABEL_VALUE_OPTIONS: return "Options"; case MENU_LABEL_VALUE_RESUME: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index eac5530f9b..3a07a2d976 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -27,8 +27,11 @@ extern "C" { #define MENU_LABEL_CHEAT_TOGGLE 0xe515e0cbU #define MENU_LABEL_PAUSE_TOGGLE 0x557634e4U +#define MENU_LABEL_VALUE_USE_THIS_DIRECTORY 0xc5fc9ed9U +#define MENU_LABEL_VALUE_CORE_OPTIONS 0x1477b95aU #define MENU_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE 0x2a11fe80U #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_SAVE_STATE 0x3e182415U #define MENU_LABEL_LOAD_STATE 0xe8c5dae5U