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

Use menu_entries_add_enum

This commit is contained in:
twinaphex 2016-06-16 15:43:05 +02:00
parent 64cb4b53df
commit 4a552b66ff
3 changed files with 53 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/intl/menu_hash_us.c
View File

@ -26,6 +26,16 @@ static const char *menu_hash_to_str_us_label_enum(enum menu_hash_enums msg)
{ {
switch (msg) switch (msg)
{ {
case MENU_ENUM_LABEL_NO_CORES_AVAILABLE:
return "no_cores_available";
case MENU_ENUM_LABEL_NO_CORE_OPTIONS_AVAILABLE:
return "no_core_options_available";
case MENU_ENUM_LABEL_NO_CORE_INFORMATION_AVAILABLE:
return "no_core_information_available";
case MENU_ENUM_LABEL_NO_PERFORMANCE_COUNTERS:
return "no_performance_counters";
case MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY:
return "no_entries_to_display";
case MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ACHIEVEMENTS: case MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ACHIEVEMENTS:
return "cheevos_unlocked_achievements"; return "cheevos_unlocked_achievements";
case MENU_ENUM_LABEL_CHEEVOS_LOCKED_ACHIEVEMENTS: case MENU_ENUM_LABEL_CHEEVOS_LOCKED_ACHIEVEMENTS:
@ -766,6 +776,8 @@ const char *menu_hash_to_str_us_enum(enum menu_hash_enums msg)
switch (msg) switch (msg)
{ {
case MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY:
return "No entries to display.";
case MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS: case MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS:
return "Unlocked Achievements:"; return "Unlocked Achievements:";
case MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS: case MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS:

43
menu/menu_displaylist.c
View File

@ -71,7 +71,10 @@ static void print_buf_lines(file_list_t *list, char *buf, int buf_size,
if (!buf || !buf_size) if (!buf || !buf_size)
{ {
menu_entries_add(list, "No entries to display.", "", menu_entries_add_enum(list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY),
menu_hash_to_str_enum(MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY),
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
MENU_FILE_NONE, 0, 0); MENU_FILE_NONE, 0, 0);
return; return;
} }
@ -161,7 +164,10 @@ static void print_buf_lines_extended(file_list_t *list, char *buf, int buf_size,
if (!buf || !buf_size) if (!buf || !buf_size)
{ {
menu_entries_add(list, "No entries to display.", "", menu_entries_add_enum(list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY),
menu_hash_to_str_enum(MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY),
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
MENU_FILE_NONE, 0, 0); MENU_FILE_NONE, 0, 0);
return; return;
} }
@ -269,9 +275,11 @@ static void menu_displaylist_push_perfcounter(
unsigned i; unsigned i;
if (!counters || num == 0) if (!counters || num == 0)
{ {
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS),
"", 0, 0, 0); menu_hash_to_str_enum(MENU_ENUM_LABEL_NO_PERFORMANCE_COUNTERS),
MENU_ENUM_LABEL_NO_PERFORMANCE_COUNTERS,
0, 0, 0);
return; return;
} }
@ -292,10 +300,11 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
if (!core_info || !core_info->config_data) if (!core_info || !core_info->config_data)
{ {
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str_enum( menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE),
MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE), menu_hash_to_str_enum(MENU_ENUM_LABEL_NO_CORE_INFORMATION_AVAILABLE),
"", 0, 0, 0); MENU_ENUM_LABEL_NO_CORE_INFORMATION_AVAILABLE,
0, 0, 0);
return 0; return 0;
} }
@ -4131,9 +4140,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
if (cores_names_size == 0) if (cores_names_size == 0)
{ {
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE),
"", menu_hash_to_str_enum(MENU_ENUM_LABEL_NO_CORES_AVAILABLE),
MENU_ENUM_LABEL_NO_CORES_AVAILABLE,
0, 0, 0); 0, 0, 0);
} }
else else
@ -4195,9 +4205,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
} }
if (opts == 0) if (opts == 0)
{ {
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str_enum( menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE),
MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE), "", menu_hash_to_str_enum(MENU_ENUM_LABEL_NO_CORE_OPTIONS_AVAILABLE),
MENU_ENUM_LABEL_NO_CORE_OPTIONS_AVAILABLE,
MENU_SETTINGS_CORE_OPTION_NONE, 0, 0); MENU_SETTINGS_CORE_OPTION_NONE, 0, 0);
} }
else else
@ -4213,8 +4224,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
} }
} }
else else
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE), "", menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE),
menu_hash_to_str_enum(MENU_ENUM_LABEL_NO_CORE_OPTIONS_AVAILABLE),
MENU_ENUM_LABEL_NO_CORE_OPTIONS_AVAILABLE,
MENU_SETTINGS_CORE_OPTION_NONE, 0, 0); MENU_SETTINGS_CORE_OPTION_NONE, 0, 0);
info->need_push = true; info->need_push = true;
break; break;

13
menu/menu_hash.h
View File

@ -40,6 +40,9 @@ enum menu_hash_enums
MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS, MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS,
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY,
MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS, MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS,
MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP, MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP,
MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN, MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN,
@ -262,6 +265,8 @@ enum menu_hash_enums
MENU_ENUM_LABEL_NO_SETTINGS_FOUND, MENU_ENUM_LABEL_NO_SETTINGS_FOUND,
MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND, MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND,
MENU_ENUM_LABEL_NO_PERFORMANCE_COUNTERS,
MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS, MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS,
MENU_ENUM_LABEL_VIDEO_FONT_ENABLE, MENU_ENUM_LABEL_VIDEO_FONT_ENABLE,
@ -330,8 +335,13 @@ enum menu_hash_enums
MENU_ENUM_LABEL_USE_THIS_DIRECTORY, MENU_ENUM_LABEL_USE_THIS_DIRECTORY,
MENU_ENUM_LABEL_VALUE_CORE_OPTIONS, MENU_ENUM_LABEL_VALUE_CORE_OPTIONS,
MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS, MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS,
MENU_ENUM_LABEL_NO_CORE_INFORMATION_AVAILABLE,
MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE, MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE,
MENU_ENUM_LABEL_NO_CORES_AVAILABLE,
MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE, MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE,
MENU_ENUM_LABEL_SAVE_STATE, MENU_ENUM_LABEL_SAVE_STATE,
MENU_ENUM_LABEL_VALUE_LOAD_STATE, MENU_ENUM_LABEL_VALUE_LOAD_STATE,
MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE, MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE,
@ -848,7 +858,10 @@ enum menu_hash_enums
MENU_ENUM_LABEL_INPUT_DUTY_CYCLE, MENU_ENUM_LABEL_INPUT_DUTY_CYCLE,
MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE, MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE,
MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS, MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS,
MENU_ENUM_LABEL_NO_CORE_OPTIONS_AVAILABLE,
MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE, MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE,
MENU_ENUM_LABEL_VALUE_DISK_INDEX, MENU_ENUM_LABEL_VALUE_DISK_INDEX,
MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND, MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND,
MENU_ENUM_LABEL_DISK_INDEX, MENU_ENUM_LABEL_DISK_INDEX,