mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change more menu_entries_add calls into menu_entries_add_enum

Browse Source
This commit is contained in:
twinaphex 2016-06-16 20:43:02 +02:00
parent 697a753ecc
commit 395c601159
1 changed files with 127 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

221
menu/menu_displaylist.c
View File

@ -431,7 +431,8 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME),
core_info->firmware[i].desc ? core_info->firmware[i].desc ?
core_info->firmware[i].desc : ""); core_info->firmware[i].desc : "");
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(tmp, sizeof(tmp), " %s: %s, %s", snprintf(tmp, sizeof(tmp), " %s: %s, %s",
@ -443,7 +444,8 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OPTIONAL) : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OPTIONAL) :
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_REQUIRED) menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_REQUIRED)
); );
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
} }
} }
@ -478,14 +480,16 @@ static int menu_displaylist_parse_debug_info(menu_displaylist_info_t *info)
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
menu_entries_add(info->list, "Directory Tests:", "", menu_entries_add_enum(info->list, "Directory Tests:", "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
/* Assume libretro directory exists and check if stat works */ /* Assume libretro directory exists and check if stat works */
ret = path_is_directory(settings->directory.libretro); ret = path_is_directory(settings->directory.libretro);
snprintf(tmp, sizeof(tmp), "- stat directory... %s", snprintf(tmp, sizeof(tmp), "- stat directory... %s",
ret ? "passed" : "failed"); ret ? "passed" : "failed");
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
/* Try to create a "test" subdirectory on top of libretro directory */ /* Try to create a "test" subdirectory on top of libretro directory */
@ -496,24 +500,25 @@ static int menu_displaylist_parse_debug_info(menu_displaylist_info_t *info)
ret = path_mkdir(tmp); ret = path_mkdir(tmp);
snprintf(tmp, sizeof(tmp), "- create a directory... %s", snprintf(tmp, sizeof(tmp), "- create a directory... %s",
ret ? "passed" : "failed"); ret ? "passed" : "failed");
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
menu_entries_add(info->list, "", "", menu_entries_add_enum(info->list, "", "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
/* Check if save directory exists */ /* Check if save directory exists */
menu_entries_add(info->list, "Savefile Directory", "", menu_entries_add_enum(info->list, "Savefile Directory", "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
ret = path_is_directory(global->dir.savefile); ret = path_is_directory(global->dir.savefile);
snprintf(tmp, sizeof(tmp), "- directory name: %s", snprintf(tmp, sizeof(tmp), "- directory name: %s",
global->dir.savefile); global->dir.savefile);
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(tmp, sizeof(tmp), "- directory exists: %s", snprintf(tmp, sizeof(tmp), "- directory exists: %s",
ret ? "true" : "false"); ret ? "true" : "false");
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
/* Check if save directory is writable */ /* Check if save directory is writable */
fill_pathname_join(tmp, global->dir.savefile, ".retroarch", fill_pathname_join(tmp, global->dir.savefile, ".retroarch",
@ -521,11 +526,11 @@ static int menu_displaylist_parse_debug_info(menu_displaylist_info_t *info)
ret = path_mkdir(tmp); ret = path_mkdir(tmp);
snprintf(tmp, sizeof(tmp), "- directory writable: %s", snprintf(tmp, sizeof(tmp), "- directory writable: %s",
ret ? "true" : "false"); ret ? "true" : "false");
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
menu_entries_add(info->list, "", "", menu_entries_add_enum(info->list, "", "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
/* Check if state directory exists */ /* Check if state directory exists */
menu_entries_add(info->list, "Savestate Directory", "", menu_entries_add(info->list, "Savestate Directory", "",
@ -635,8 +640,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
snprintf(tmp, sizeof(tmp), "%s: %s", snprintf(tmp, sizeof(tmp), "%s: %s",
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE), __DATE__); menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE), __DATE__);
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
(void)tmp_string; (void)tmp_string;
@ -645,12 +650,12 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
sizeof(tmp)); sizeof(tmp));
strlcat(tmp, ": ", sizeof(tmp)); strlcat(tmp, ": ", sizeof(tmp));
strlcat(tmp, retroarch_git_version, sizeof(tmp)); strlcat(tmp, retroarch_git_version, sizeof(tmp));
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
#endif #endif
retroarch_get_capabilities(RARCH_CAPABILITIES_COMPILER, tmp, sizeof(tmp)); retroarch_get_capabilities(RARCH_CAPABILITIES_COMPILER, tmp, sizeof(tmp));
menu_entries_add(info->list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0); menu_entries_add_enum(info->list, tmp, "", MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
#ifdef ANDROID #ifdef ANDROID
bool perms = test_permissions(sdcard_dir); bool perms = test_permissions(sdcard_dir);
@ -713,8 +718,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
snprintf(cpu_str, sizeof(cpu_str), "%s %s", cpu_text_str, cpu_arch_str); snprintf(cpu_str, sizeof(cpu_str), "%s %s", cpu_text_str, cpu_arch_str);
menu_entries_add(info->list, cpu_str, "", menu_entries_add_enum(info->list, cpu_str, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
} }
{ {
@ -722,8 +727,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
unsigned amount_cores = cpu_features_get_core_amount(); unsigned amount_cores = cpu_features_get_core_amount();
snprintf(cpu_str, sizeof(cpu_str), "CPU Cores: %d\n", amount_cores); snprintf(cpu_str, sizeof(cpu_str), "CPU Cores: %d\n", amount_cores);
menu_entries_add(info->list, cpu_str, "", menu_entries_add_enum(info->list, cpu_str, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
} }
@ -734,13 +739,13 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
snprintf(tmp, sizeof(tmp), "Port #%d device name: %s (#%d)", snprintf(tmp, sizeof(tmp), "Port #%d device name: %s (#%d)",
controller, settings->input.device_names[controller], controller, settings->input.device_names[controller],
settings->input.device_name_index[controller]); settings->input.device_name_index[controller]);
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(tmp, sizeof(tmp), "Port #%d device VID/PID: %d/%d", snprintf(tmp, sizeof(tmp), "Port #%d device VID/PID: %d/%d",
controller, settings->input.vid[controller], controller, settings->input.vid[controller],
settings->input.pid[controller]); settings->input.pid[controller]);
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
} }
} }
@ -755,8 +760,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
sizeof(tmp)); sizeof(tmp));
strlcat(tmp, ": ", sizeof(tmp)); strlcat(tmp, ": ", sizeof(tmp));
strlcat(tmp, frontend->ident, sizeof(tmp)); strlcat(tmp, frontend->ident, sizeof(tmp));
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
if (frontend->get_name) if (frontend->get_name)
{ {
@ -767,8 +772,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
strlcat(tmp, ": ", sizeof(tmp)); strlcat(tmp, ": ", sizeof(tmp));
strlcat(tmp, frontend->get_name ? strlcat(tmp, frontend->get_name ?
tmp2 : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), sizeof(tmp)); tmp2 : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), sizeof(tmp));
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
} }
if (frontend->get_os) if (frontend->get_os)
@ -779,15 +784,15 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
frontend->get_os frontend->get_os
? tmp2 : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), ? tmp2 : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
major, minor); major, minor);
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
} }
snprintf(tmp, sizeof(tmp), "%s : %d", snprintf(tmp, sizeof(tmp), "%s : %d",
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RETRORATING_LEVEL), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RETRORATING_LEVEL),
frontend->get_rating ? frontend->get_rating() : -1); frontend->get_rating ? frontend->get_rating() : -1);
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
{ {
char tmp[PATH_MAX_LENGTH] = {0}; char tmp[PATH_MAX_LENGTH] = {0};
@ -847,12 +852,12 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
bytes_to_gb(memory_total) bytes_to_gb(memory_total)
); );
#endif #endif
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
menu_entries_add(info->list, tmp2, "", menu_entries_add_enum(info->list, tmp2, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
menu_entries_add(info->list, tmp3, "", menu_entries_add_enum(info->list, tmp3, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
} }
} }
@ -915,8 +920,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
sizeof(tmp)); sizeof(tmp));
strlcat(tmp, ": ", sizeof(tmp)); strlcat(tmp, ": ", sizeof(tmp));
strlcat(tmp, tmp2, sizeof(tmp)); strlcat(tmp, tmp2, sizeof(tmp));
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
} }
} }
@ -932,8 +937,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
strlcat(tmp, tmp_string ? tmp_string strlcat(tmp, tmp_string ? tmp_string
: menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
sizeof(tmp)); sizeof(tmp));
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
{ {
gfx_ctx_metrics_t metrics; gfx_ctx_metrics_t metrics;
@ -948,7 +953,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
menu_hash_to_str_enum( menu_hash_to_str_enum(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_WIDTH), MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_WIDTH),
val); val);
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
} }
@ -960,7 +966,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
menu_hash_to_str_enum( menu_hash_to_str_enum(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_HEIGHT), MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_HEIGHT),
val); val);
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
} }
@ -972,7 +979,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
menu_hash_to_str_enum( menu_hash_to_str_enum(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_DPI), MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_DPI),
val); val);
menu_entries_add(info->list, tmp, "", menu_entries_add_enum(info->list, tmp, "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
} }
} }
@ -988,7 +996,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES) : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES) :
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO),
sizeof(feat_str)); sizeof(feat_str));
menu_entries_add(info->list, feat_str, "", menu_entries_add_enum(info->list, feat_str, "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
strlcpy(feat_str, strlcpy(feat_str,
@ -1000,7 +1009,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES) : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES) :
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO),
sizeof(feat_str)); sizeof(feat_str));
menu_entries_add(info->list, feat_str, "", menu_entries_add_enum(info->list, feat_str, "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
strlcpy(feat_str, strlcpy(feat_str,
@ -1012,7 +1022,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
? menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES) ? menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES)
: menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO), : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO),
sizeof(feat_str)); sizeof(feat_str));
menu_entries_add(info->list, feat_str, "", menu_entries_add_enum(info->list, feat_str, "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(feat_str, sizeof(feat_str), snprintf(feat_str, sizeof(feat_str),
@ -1022,7 +1033,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
_network_command_supp _network_command_supp
? menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES) ? menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES)
: menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO)); : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO));
menu_entries_add(info->list, feat_str, "", menu_entries_add_enum(info->list, feat_str, "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(feat_str, sizeof(feat_str), snprintf(feat_str, sizeof(feat_str),
@ -1425,8 +1437,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
_python_supp ? _python_supp ?
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES) menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES)
: menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO)); : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO));
menu_entries_add(info->list, feat_str, "", menu_entries_add_enum(info->list, feat_str, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(feat_str, sizeof(feat_str), snprintf(feat_str, sizeof(feat_str),
"%s: %s", "%s: %s",
@ -1434,8 +1446,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
_v4l2_supp ? _v4l2_supp ?
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES) menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES)
: menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO)); : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO));
menu_entries_add(info->list, feat_str, "", menu_entries_add_enum(info->list, feat_str, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(feat_str, sizeof(feat_str), snprintf(feat_str, sizeof(feat_str),
"%s: %s", "%s: %s",
@ -1444,8 +1456,8 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
_libusb_supp ? _libusb_supp ?
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES) menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_YES)
: menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO)); : menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO));
menu_entries_add(info->list, feat_str, "", menu_entries_add_enum(info->list, feat_str, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
return 0; return 0;
} }
@ -1513,14 +1525,14 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
} }
if (!path) if (!path)
menu_entries_add(info->list, fill_buf, path_playlist, menu_entries_add_enum(info->list, fill_buf, path_playlist,
MENU_FILE_PLAYLIST_ENTRY, 0, i); MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_PLAYLIST_ENTRY, 0, i);
else if (is_history) else if (is_history)
menu_entries_add(info->list, fill_buf, menu_entries_add_enum(info->list, fill_buf,
path, MENU_FILE_RPL_ENTRY, 0, i); path, MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_RPL_ENTRY, 0, i);
else else
menu_entries_add(info->list, label, menu_entries_add_enum(info->list, label,
path, MENU_FILE_RPL_ENTRY, 0, i); path, MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_RPL_ENTRY, 0, i);
} }
return 0; return 0;
@ -1634,7 +1646,9 @@ static int create_string_list_rdb_entry_string(
strlcpy(tmp, desc, sizeof(tmp)); strlcpy(tmp, desc, sizeof(tmp));
strlcat(tmp, ": ", sizeof(tmp)); strlcat(tmp, ": ", sizeof(tmp));
strlcat(tmp, actual_string, sizeof(tmp)); strlcat(tmp, actual_string, sizeof(tmp));
menu_entries_add(list, tmp, output_label, 0, 0, 0); menu_entries_add_enum(list, tmp, output_label,
MENU_ENUM_LABEL_UNKNOWN,
0, 0, 0);
if (output_label) if (output_label)
free(output_label); free(output_label);
@ -1679,7 +1693,8 @@ static int create_string_list_rdb_entry_int(
string_list_join_concat(output_label, str_len, str_list, "|"); string_list_join_concat(output_label, str_len, str_list, "|");
snprintf(tmp, sizeof(tmp), "%s : %d", desc, actual_int); snprintf(tmp, sizeof(tmp), "%s : %d", desc, actual_int);
menu_entries_add(list, tmp, output_label, menu_entries_add_enum(list, tmp, output_label,
MENU_ENUM_LABEL_UNKNOWN,
0, 0, 0); 0, 0, 0);
if (output_label) if (output_label)
@ -2082,8 +2097,8 @@ static int menu_database_parse_query(file_list_t *list, const char *path,
for (i = 0; i < db_list->count; i++) for (i = 0; i < db_list->count; i++)
{ {
if (!string_is_empty(db_list->list[i].name)) if (!string_is_empty(db_list->list[i].name))
menu_entries_add(list, db_list->list[i].name, menu_entries_add_enum(list, db_list->list[i].name,
path, MENU_FILE_RDB_ENTRY, 0, 0); path, MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_RDB_ENTRY, 0, 0);
} }
database_info_list_free(db_list); database_info_list_free(db_list);
@ -2102,15 +2117,17 @@ static int deferred_push_video_shader_parameters_common(
if (list_size == 0) if (list_size == 0)
{ {
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS),
"", 0, 0, 0); "",
MENU_ENUM_LABEL_UNKNOWN,
0, 0, 0);
return 0; return 0;
} }
for (i = 0; i < list_size; i++) for (i = 0; i < list_size; i++)
menu_entries_add(info->list, shader->parameters[i].desc, menu_entries_add_enum(info->list, shader->parameters[i].desc,
info->label, base_parameter + i, 0, 0); info->label, MENU_ENUM_LABEL_UNKNOWN, base_parameter + i, 0, 0);
return 0; return 0;
} }
@ -2251,9 +2268,10 @@ loop:
} }
if (count == 0 && add_empty_entry) if (count == 0 && add_empty_entry)
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND),
menu_hash_to_str_enum(MENU_ENUM_LABEL_NO_SETTINGS_FOUND), menu_hash_to_str_enum(MENU_ENUM_LABEL_NO_SETTINGS_FOUND),
MENU_ENUM_LABEL_UNKNOWN,
0, 0, 0); 0, 0, 0);
return 0; return 0;
@ -2653,73 +2671,86 @@ static int menu_displaylist_parse_options(
MENU_ENUM_LABEL_UPDATE_LAKKA, MENU_ENUM_LABEL_UPDATE_LAKKA,
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_enum(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST),
menu_hash_to_str_enum(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST), menu_hash_to_str_enum(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST),
MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#else #else
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST),
menu_hash_to_str_enum(MENU_ENUM_LABEL_CORE_UPDATER_LIST), menu_hash_to_str_enum(MENU_ENUM_LABEL_CORE_UPDATER_LIST),
MENU_ENUM_LABEL_CORE_UPDATER_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_enum(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST),
menu_hash_to_str_enum(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST), menu_hash_to_str_enum(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST),
MENU_ENUM_LABEL_THUMBNAILS_UPDATER_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_enum(MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES),
menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES), menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES),
MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES,
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_enum(MENU_ENUM_LABEL_VALUE_UPDATE_ASSETS), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_UPDATE_ASSETS),
menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_ASSETS), menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_ASSETS),
MENU_ENUM_LABEL_UPDATE_ASSETS,
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_enum(MENU_ENUM_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES),
menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_AUTOCONFIG_PROFILES), menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_AUTOCONFIG_PROFILES),
MENU_ENUM_LABEL_UPDATE_AUTOCONFIG_PROFILES,
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_enum(MENU_ENUM_LABEL_VALUE_UPDATE_CHEATS), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_UPDATE_CHEATS),
menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_CHEATS), menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_CHEATS),
MENU_ENUM_LABEL_UPDATE_CHEATS,
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_enum(MENU_ENUM_LABEL_VALUE_UPDATE_DATABASES), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_UPDATE_DATABASES),
menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_DATABASES), menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_DATABASES),
MENU_ENUM_LABEL_UPDATE_DATABASES,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#endif #endif
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_UPDATE_OVERLAYS), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_UPDATE_OVERLAYS),
menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_OVERLAYS), menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_OVERLAYS),
MENU_ENUM_LABEL_UPDATE_OVERLAYS,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#ifdef HAVE_CG #ifdef HAVE_CG
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_UPDATE_CG_SHADERS), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_UPDATE_CG_SHADERS),
menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_CG_SHADERS), menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_CG_SHADERS),
MENU_ENUM_LABEL_UPDATE_CG_SHADERS,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#endif #endif
#ifdef HAVE_GLSL #ifdef HAVE_GLSL
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_UPDATE_GLSL_SHADERS), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_UPDATE_GLSL_SHADERS),
menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_GLSL_SHADERS), menu_hash_to_str_enum(MENU_ENUM_LABEL_UPDATE_GLSL_SHADERS),
MENU_ENUM_LABEL_UPDATE_GLSL_SHADERS,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#endif #endif
#endif #endif
#else #else
menu_entries_add(info->list, menu_entries_add_enum(info->list,
menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_ITEMS), menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_ITEMS),
"", MENU_SETTING_NO_ITEM, 0, 0); "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTING_NO_ITEM, 0, 0);
#endif #endif
return 0; return 0;
@ -2762,8 +2793,9 @@ static int menu_displaylist_parse_options_cheats(
"%s #%u: ", menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CHEAT), i); "%s #%u: ", menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CHEAT), i);
if (cheat_manager_get_desc(i)) if (cheat_manager_get_desc(i))
strlcat(cheat_label, cheat_manager_get_desc(i), sizeof(cheat_label)); strlcat(cheat_label, cheat_manager_get_desc(i), sizeof(cheat_label));
menu_entries_add(info->list, menu_entries_add_enum(info->list,
cheat_label, "", MENU_SETTINGS_CHEAT_BEGIN + i, 0, 0); cheat_label, "", MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_CHEAT_BEGIN + i, 0, 0);
} }
return 0; return 0;
@ -2836,7 +2868,8 @@ static int menu_displaylist_parse_options_remappings(
snprintf(desc_label, sizeof(desc_label), snprintf(desc_label, sizeof(desc_label),
"%s %u %s : ", menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_USER), "%s %u %s : ", menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_USER),
user, description); user, description);
menu_entries_add(info->list, desc_label, "", menu_entries_add_enum(info->list, desc_label, "",
MENU_ENUM_LABEL_UNKNOWN,
MENU_SETTINGS_INPUT_DESC_BEGIN + MENU_SETTINGS_INPUT_DESC_BEGIN +
(p * (RARCH_FIRST_CUSTOM_BIND + 4)) + retro_id, 0, 0); (p * (RARCH_FIRST_CUSTOM_BIND + 4)) + retro_id, 0, 0);
} }
@ -4171,8 +4204,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
switch (type) switch (type)
{ {
case DISPLAYLIST_CORES_COLLECTION_SUPPORTED: case DISPLAYLIST_CORES_COLLECTION_SUPPORTED:
menu_entries_add(info->list, cores_paths->elems[i].data, "", menu_entries_add_enum(info->list, cores_paths->elems[i].data, "",
MENU_FILE_CORE, 0, 0); MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_CORE, 0, 0);
break; break;
default: default:
menu_entries_add_enum(info->list, cores_paths->elems[i].data, menu_entries_add_enum(info->list, cores_paths->elems[i].data,