ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(menu/drivers) Use menu_hash_to_str_enum

This commit is contained in:
twinaphex 2016-06-15 23:34:47 +02:00
parent 9aece7b695
commit db679a85f3
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
menu/drivers/menu_generic.c
View File

@ -134,40 +134,40 @@ static int action_iterate_help(menu_handle_t *menu,
s2, s2,
menu_hash_to_str( menu_hash_to_str_enum(
MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP), MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP),
desc[0], desc[0],
menu_hash_to_str( menu_hash_to_str_enum(
MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN), MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN),
desc[1], desc[1],
menu_hash_to_str( menu_hash_to_str_enum(
MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM), MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM),
desc[2], desc[2],
menu_hash_to_str( menu_hash_to_str_enum(
MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK), MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK),
desc[3], desc[3],
menu_hash_to_str( menu_hash_to_str_enum(
MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO), MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO),
desc[4], desc[4],
menu_hash_to_str( menu_hash_to_str_enum(
MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_START), MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_START),
desc[5], desc[5],
menu_hash_to_str( menu_hash_to_str_enum(
MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU), MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU),
desc[6], desc[6],
menu_hash_to_str( menu_hash_to_str_enum(
MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT), MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT),
desc[7], desc[7],
menu_hash_to_str( menu_hash_to_str_enum(
MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD), MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD),
desc[8] desc[8]
); );
@ -366,7 +366,7 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
info.list = menu_stack; info.list = menu_stack;
strlcpy(info.label, strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_HELP), menu_hash_to_str_enum(MENU_ENUM_LABEL_HELP),
sizeof(info.label)); sizeof(info.label));
menu_displaylist_ctl(DISPLAYLIST_HELP, &info); menu_displaylist_ctl(DISPLAYLIST_HELP, &info);
@ -399,7 +399,7 @@ bool generic_menu_init_list(void *data)
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
strlcpy(info.label, strlcpy(info.label,
menu_hash_to_str(MENU_VALUE_MAIN_MENU), sizeof(info.label)); menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_MAIN_MENU), sizeof(info.label));
menu_entries_add(menu_stack, info.path, menu_entries_add(menu_stack, info.path,
info.label, info.type, info.flags, 0); info.label, info.type, info.flags, 0);

2
menu/drivers/nuklear.c
View File

@ -388,7 +388,7 @@ static bool nk_menu_init_list(void *data)
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
strlcpy(info.label, strlcpy(info.label,
menu_hash_to_str(MENU_VALUE_HISTORY_TAB), sizeof(info.label)); menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_HISTORY_TAB), sizeof(info.label));
menu_entries_add(menu_stack, menu_entries_add(menu_stack,
info.path, info.label, info.type, info.flags, 0); info.path, info.label, info.type, info.flags, 0);

14
menu/drivers/xmb.c
View File

@ -1275,7 +1275,7 @@ static void xmb_init_horizontal_list(xmb_handle_t *xmb)
info.type_default = MENU_FILE_PLAIN; info.type_default = MENU_FILE_PLAIN;
info.flags = SL_FLAG_ALLOW_EMPTY_LIST; info.flags = SL_FLAG_ALLOW_EMPTY_LIST;
strlcpy(info.label, strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_CONTENT_COLLECTION_LIST), menu_hash_to_str_enum(MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST),
sizeof(info.label)); sizeof(info.label));
strlcpy(info.path, strlcpy(info.path,
settings->directory.playlist, settings->directory.playlist,
@ -2981,31 +2981,31 @@ static void xmb_list_cache(void *data, enum menu_list_type type, unsigned action
{ {
case XMB_SYSTEM_TAB_MAIN: case XMB_SYSTEM_TAB_MAIN:
menu_stack->list[stack_size - 1].label = menu_stack->list[stack_size - 1].label =
strdup(menu_hash_to_str(MENU_VALUE_MAIN_MENU)); strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_MAIN_MENU));
menu_stack->list[stack_size - 1].type = menu_stack->list[stack_size - 1].type =
MENU_SETTINGS; MENU_SETTINGS;
break; break;
case XMB_SYSTEM_TAB_SETTINGS: case XMB_SYSTEM_TAB_SETTINGS:
menu_stack->list[stack_size - 1].label = menu_stack->list[stack_size - 1].label =
strdup(menu_hash_to_str(MENU_VALUE_SETTINGS_TAB)); strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SETTINGS_TAB));
menu_stack->list[stack_size - 1].type = menu_stack->list[stack_size - 1].type =
MENU_SETTINGS_TAB; MENU_SETTINGS_TAB;
break; break;
case XMB_SYSTEM_TAB_HISTORY: case XMB_SYSTEM_TAB_HISTORY:
menu_stack->list[stack_size - 1].label = menu_stack->list[stack_size - 1].label =
strdup(menu_hash_to_str(MENU_VALUE_HISTORY_TAB)); strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_HISTORY_TAB));
menu_stack->list[stack_size - 1].type = menu_stack->list[stack_size - 1].type =
MENU_HISTORY_TAB; MENU_HISTORY_TAB;
break; break;
case XMB_SYSTEM_TAB_ADD: case XMB_SYSTEM_TAB_ADD:
menu_stack->list[stack_size - 1].label = menu_stack->list[stack_size - 1].label =
strdup(menu_hash_to_str(MENU_VALUE_ADD_TAB)); strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ADD_TAB));
menu_stack->list[stack_size - 1].type = menu_stack->list[stack_size - 1].type =
MENU_ADD_TAB; MENU_ADD_TAB;
break; break;
default: default:
menu_stack->list[stack_size - 1].label = menu_stack->list[stack_size - 1].label =
strdup(menu_hash_to_str(MENU_VALUE_HORIZONTAL_MENU)); strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU));
menu_stack->list[stack_size - 1].type = menu_stack->list[stack_size - 1].type =
MENU_SETTING_HORIZONTAL_MENU; MENU_SETTING_HORIZONTAL_MENU;
break; break;
@ -3193,7 +3193,7 @@ static bool xmb_menu_init_list(void *data)
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
strlcpy(info.label, strlcpy(info.label,
menu_hash_to_str(MENU_VALUE_MAIN_MENU), sizeof(info.label)); menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_MAIN_MENU), sizeof(info.label));
menu_entries_add_enum(menu_stack, info.path, menu_entries_add_enum(menu_stack, info.path,
info.label, info.label,