Replace most menu_entries_add function calls

This commit is contained in:
twinaphex 2016-06-16 22:03:12 +02:00
parent 844656255c
commit ae2be8b53b
9 changed files with 76 additions and 74 deletions

View File

@ -255,8 +255,8 @@ static int frontend_ctr_parse_drive_list(void *data)
if (!list)
return -1;
menu_entries_add(list,
"sdmc:/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"sdmc:/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
#endif
return 0;

View File

@ -650,10 +650,10 @@ static int frontend_darwin_parse_drive_list(void *data)
CFSearchPathForDirectoriesInDomains(CFDocumentDirectory, CFUserDomainMask, 1, home_dir_buf, sizeof(home_dir_buf));
menu_entries_add(list,
home_dir_buf, "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list, "/", "",
MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
home_dir_buf, "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list, "/", "",
MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
ret = 0;

View File

@ -465,15 +465,15 @@ static int frontend_gx_parse_drive_list(void *data)
#ifndef IS_SALAMANDER
file_list_t *list = (file_list_t*)data;
#ifdef HW_RVL
menu_entries_add(list,
"sd:/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"usb:/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"sd:/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"usb:/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
#endif
menu_entries_add(list,
"carda:/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"cardb:/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"carda:/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"cardb:/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
#endif
return 0;

View File

@ -1800,15 +1800,17 @@ static int frontend_android_parse_drive_list(void *data)
file_list_t *list = (file_list_t*)data;
// MENU_FILE_DIRECTORY is not working with labels, placeholders for now
menu_entries_add(list,
app_dir, "Application Dir", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
internal_storage_app_path, "External Application Dir", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
internal_storage_path, "Internal Memory", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list, "/", "",
menu_entries_add_enum(list,
app_dir, "Application Dir", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
internal_storage_app_path, "External Application Dir", MENU_ENUM_LABEL_UNKNOWN,
MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
internal_storage_path, "Internal Memory",
MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list, "/", "",
MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
return 0;
}

View File

@ -492,28 +492,28 @@ static int frontend_ps3_parse_drive_list(void *data)
#ifndef IS_SALAMANDER
file_list_t *list = (file_list_t*)data;
menu_entries_add(list,
"/app_home/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"/dev_hdd0/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"/dev_hdd1/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"/host_root/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"/dev_usb000/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"/dev_usb001/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"/dev_usb002/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"/dev_usb003/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"/dev_usb004/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"/dev_usb005/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"/dev_usb006/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"/app_home/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"/dev_hdd0/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"/dev_hdd1/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"/host_root/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"/dev_usb000/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"/dev_usb001/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"/dev_usb002/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"/dev_usb003/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"/dev_usb004/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"/dev_usb005/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"/dev_usb006/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
#endif
return 0;

View File

@ -369,15 +369,15 @@ static int frontend_psp_parse_drive_list(void *data)
file_list_t *list = (file_list_t*)data;
#ifdef VITA
menu_entries_add(list,
"cache0:/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"cache0:/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
#else
menu_entries_add(list,
"ms0:/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"ef0:/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"host0:/", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"ms0:/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"ef0:/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"host0:/", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
#endif
#endif

View File

@ -228,8 +228,8 @@ static int frontend_win32_parse_drive_list(void *data)
{
drive[0] = 'A' + i;
if (drives & (1 << i))
menu_entries_add(list,
drive, "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
drive, "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
}
#endif

View File

@ -1367,19 +1367,19 @@ static int frontend_xdk_parse_drive_list(void *data)
file_list_t *list = (file_list_t*)data;
#if defined(_XBOX1)
menu_entries_add(list,
"C:", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"D:", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"E:", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"F:", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add(list,
"G:", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"C:", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"D:", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"E:", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"F:", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"G:", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
#elif defined(_XBOX360)
menu_entries_add(list,
"game:", "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_add_enum(list,
"game:", "", MENU_ENUM_LABEL_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
#endif
#endif

View File

@ -3673,8 +3673,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
case DISPLAYLIST_NONE:
break;
case DISPLAYLIST_INFO:
menu_entries_add(info->list, info->path,
info->label, info->type, info->directory_ptr, 0);
menu_entries_add_enum(info->list, info->path,
info->label, MENU_ENUM_LABEL_UNKNOWN, info->type, info->directory_ptr, 0);
break;
case DISPLAYLIST_GENERIC:
{
@ -3685,8 +3685,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
menu_driver_ctl(RARCH_MENU_CTL_LIST_CACHE, &list_info);
menu_entries_add(info->list, info->path,
info->label, info->type, info->directory_ptr, 0);
menu_entries_add_enum(info->list, info->path,
info->label, MENU_ENUM_LABEL_UNKNOWN, info->type, info->directory_ptr, 0);
info->need_navigation_clear = true;
info->need_entries_refresh = true;
@ -3701,8 +3701,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
menu_driver_ctl(RARCH_MENU_CTL_LIST_CACHE, &list_info);
menu_entries_add(info->list, info->path,
info->label, info->type, info->directory_ptr, 0);
menu_entries_add_enum(info->list, info->path,
info->label, MENU_ENUM_LABEL_UNKNOWN, info->type, info->directory_ptr, 0);
info->need_entries_refresh = true;
}
break;
@ -3779,8 +3779,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
info->need_push = true;
break;
case DISPLAYLIST_HELP:
menu_entries_add(info->list, info->path,
info->label, info->type, info->directory_ptr, 0);
menu_entries_add_enum(info->list, info->path,
info->label, MENU_ENUM_LABEL_UNKNOWN, info->type, info->directory_ptr, 0);
menu->push_help_screen = false;
break;
case DISPLAYLIST_SETTING_ENUM: