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

Start using menu_entries_add_enum for most entries

This commit is contained in:
twinaphex 2016-06-15 14:23:13 +02:00
parent 8adda6e822
commit 34d9daf7e3
2 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
menu/drivers/materialui.c
View File

@ -1347,22 +1347,25 @@ static int mui_list_push(void *data, void *userdata,
{ {
case DISPLAYLIST_LOAD_CONTENT_LIST: case DISPLAYLIST_LOAD_CONTENT_LIST:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_LOAD_CONTENT), menu_hash_to_str(MENU_LABEL_VALUE_LOAD_CONTENT),
menu_hash_to_str(MENU_LABEL_LOAD_CONTENT), menu_hash_to_str(MENU_LABEL_LOAD_CONTENT),
MENU_ENUM_LABEL_LOAD_CONTENT,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
core_info_get_list(&list); core_info_get_list(&list);
if (core_info_list_num_info_files(list)) if (core_info_list_num_info_files(list))
{ {
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_DETECT_CORE_LIST), menu_hash_to_str(MENU_LABEL_VALUE_DETECT_CORE_LIST),
menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST), menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST),
MENU_ENUM_LABEL_DETECT_CORE_LIST,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST), menu_hash_to_str(MENU_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST),
menu_hash_to_str(MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST), menu_hash_to_str(MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST),
MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
} }

54
menu/menu_displaylist.c
View File

@ -3483,33 +3483,39 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
info->need_push = true; info->need_push = true;
break; break;
case DISPLAYLIST_HELP_SCREEN_LIST: case DISPLAYLIST_HELP_SCREEN_LIST:
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_HELP_CONTROLS), menu_hash_to_str(MENU_LABEL_VALUE_HELP_CONTROLS),
menu_hash_to_str(MENU_LABEL_HELP_CONTROLS), menu_hash_to_str(MENU_LABEL_HELP_CONTROLS),
MENU_ENUM_LABEL_HELP_CONTROLS,
0, 0, 0); 0, 0, 0);
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_HELP_WHAT_IS_A_CORE), menu_hash_to_str(MENU_LABEL_VALUE_HELP_WHAT_IS_A_CORE),
menu_hash_to_str(MENU_LABEL_HELP_WHAT_IS_A_CORE), menu_hash_to_str(MENU_LABEL_HELP_WHAT_IS_A_CORE),
MENU_ENUM_LABEL_HELP_WHAT_IS_A_CORE,
0, 0, 0); 0, 0, 0);
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_HELP_LOADING_CONTENT), menu_hash_to_str(MENU_LABEL_VALUE_HELP_LOADING_CONTENT),
menu_hash_to_str(MENU_LABEL_HELP_LOADING_CONTENT), menu_hash_to_str(MENU_LABEL_HELP_LOADING_CONTENT),
MENU_ENUM_LABEL_HELP_LOADING_CONTENT,
0, 0, 0); 0, 0, 0);
#ifdef HAVE_LIBRETRODB #ifdef HAVE_LIBRETRODB
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_HELP_SCANNING_CONTENT), menu_hash_to_str(MENU_LABEL_VALUE_HELP_SCANNING_CONTENT),
menu_hash_to_str(MENU_LABEL_HELP_SCANNING_CONTENT), menu_hash_to_str(MENU_LABEL_HELP_SCANNING_CONTENT),
MENU_ENUM_LABEL_HELP_SCANNING_CONTENT,
0, 0, 0); 0, 0, 0);
#endif #endif
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_HELP_CHANGE_VIRTUAL_GAMEPAD), menu_hash_to_str(MENU_LABEL_VALUE_HELP_CHANGE_VIRTUAL_GAMEPAD),
menu_hash_to_str(MENU_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD), menu_hash_to_str(MENU_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD),
MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD,
0, 0, 0); 0, 0, 0);
#endif #endif
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING), menu_hash_to_str(MENU_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING),
menu_hash_to_str(MENU_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING), menu_hash_to_str(MENU_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING),
MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING,
0, 0, 0); 0, 0, 0);
info->need_refresh = true; info->need_refresh = true;
info->need_push = true; info->need_push = true;
@ -3803,30 +3809,34 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
info->need_refresh = true; info->need_refresh = true;
break; break;
case DISPLAYLIST_LOAD_CONTENT_LIST: case DISPLAYLIST_LOAD_CONTENT_LIST:
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_LOAD_CONTENT), menu_hash_to_str(MENU_LABEL_VALUE_LOAD_CONTENT),
menu_hash_to_str(MENU_LABEL_LOAD_CONTENT), menu_hash_to_str(MENU_LABEL_LOAD_CONTENT),
MENU_ENUM_LABEL_LOAD_CONTENT,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
if (core_info_list_num_info_files(list)) if (core_info_list_num_info_files(list))
{ {
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_DETECT_CORE_LIST), menu_hash_to_str(MENU_LABEL_VALUE_DETECT_CORE_LIST),
menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST), menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST),
MENU_ENUM_LABEL_DETECT_CORE_LIST,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str( menu_hash_to_str(
MENU_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST), MENU_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST),
menu_hash_to_str( menu_hash_to_str(
MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST), MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST),
MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
} }
#ifdef HAVE_LIBRETRODB #ifdef HAVE_LIBRETRODB
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_COLLECTION_LIST), menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_COLLECTION_LIST),
menu_hash_to_str(MENU_LABEL_CONTENT_COLLECTION_LIST), menu_hash_to_str(MENU_LABEL_CONTENT_COLLECTION_LIST),
MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#endif #endif
@ -4030,17 +4040,20 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
} }
break; break;
case DISPLAYLIST_OPTIONS_DISK: case DISPLAYLIST_OPTIONS_DISK:
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_DISK_INDEX), menu_hash_to_str(MENU_LABEL_VALUE_DISK_INDEX),
menu_hash_to_str(MENU_LABEL_DISK_INDEX), menu_hash_to_str(MENU_LABEL_DISK_INDEX),
MENU_ENUM_LABEL_DISK_INDEX,
MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX, 0, 0); MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX, 0, 0);
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS), menu_hash_to_str(MENU_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS),
menu_hash_to_str(MENU_LABEL_DISK_CYCLE_TRAY_STATUS), menu_hash_to_str(MENU_LABEL_DISK_CYCLE_TRAY_STATUS),
MENU_ENUM_LABEL_DISK_CYCLE_TRAY_STATUS,
MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS, 0, 0); MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS, 0, 0);
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_DISK_IMAGE_APPEND), menu_hash_to_str(MENU_LABEL_VALUE_DISK_IMAGE_APPEND),
menu_hash_to_str(MENU_LABEL_DISK_IMAGE_APPEND), menu_hash_to_str(MENU_LABEL_DISK_IMAGE_APPEND),
MENU_ENUM_LABEL_DISK_IMAGE_APPEND,
MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_IMAGE_APPEND, 0, 0); MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_IMAGE_APPEND, 0, 0);
info->need_push = true; info->need_push = true;
@ -4112,8 +4125,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
MENU_FILE_CORE, 0, 0); MENU_FILE_CORE, 0, 0);
break; break;
default: default:
menu_entries_add(info->list, cores_paths->elems[i].data, menu_entries_add_enum(info->list, cores_paths->elems[i].data,
menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST_OK), menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST_OK),
MENU_LABEL_DETECT_CORE_LIST_OK,
MENU_FILE_CORE, 0, 0); MENU_FILE_CORE, 0, 0);
break; break;
} }
@ -4184,27 +4198,31 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
break; break;
case DISPLAYLIST_ARCHIVE_ACTION: case DISPLAYLIST_ARCHIVE_ACTION:
#ifdef HAVE_COMPRESSION #ifdef HAVE_COMPRESSION
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_OPEN_ARCHIVE), menu_hash_to_str(MENU_LABEL_VALUE_OPEN_ARCHIVE),
menu_hash_to_str(MENU_LABEL_OPEN_ARCHIVE), menu_hash_to_str(MENU_LABEL_OPEN_ARCHIVE),
MENU_ENUM_LABEL_OPEN_ARCHIVE,
0, 0, 0); 0, 0, 0);
#endif #endif
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_LOAD_ARCHIVE), menu_hash_to_str(MENU_LABEL_VALUE_LOAD_ARCHIVE),
menu_hash_to_str(MENU_LABEL_LOAD_ARCHIVE), menu_hash_to_str(MENU_LABEL_LOAD_ARCHIVE),
MENU_ENUM_LABEL_LOAD_ARCHIVE,
0, 0, 0); 0, 0, 0);
info->need_push = true; info->need_push = true;
break; break;
case DISPLAYLIST_ARCHIVE_ACTION_DETECT_CORE: case DISPLAYLIST_ARCHIVE_ACTION_DETECT_CORE:
#ifdef HAVE_COMPRESSION #ifdef HAVE_COMPRESSION
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_OPEN_ARCHIVE), menu_hash_to_str(MENU_LABEL_VALUE_OPEN_ARCHIVE),
menu_hash_to_str(MENU_LABEL_OPEN_ARCHIVE_DETECT_CORE), menu_hash_to_str(MENU_LABEL_OPEN_ARCHIVE_DETECT_CORE),
MENU_ENUM_LABEL_OPEN_ARCHIVE_DETECT_CORE,
0, 0, 0); 0, 0, 0);
#endif #endif
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_LOAD_ARCHIVE), menu_hash_to_str(MENU_LABEL_VALUE_LOAD_ARCHIVE),
menu_hash_to_str(MENU_LABEL_LOAD_ARCHIVE_DETECT_CORE), menu_hash_to_str(MENU_LABEL_LOAD_ARCHIVE_DETECT_CORE),
MENU_ENUM_LABEL_LOAD_ARCHIVE_DETECT_CORE,
0, 0, 0); 0, 0, 0);
info->need_push = true; info->need_push = true;
break; break;