CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-30 06:43:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Add enum_idx for most remaining settings"

Browse Source 
This reverts commit e82a129fef.
This commit is contained in:
twinaphex 2016-07-25 19:09:17 +02:00
parent 0387349e40
commit 12ad4e67dd
10 changed files with 33 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/drivers/platform_ctr.c
View File

@ -256,8 +256,7 @@ static int frontend_ctr_parse_drive_list(void *data)
return -1;
menu_entries_append_enum(list,
"sdmc:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY,
FILE_TYPE_DIRECTORY, 0, 0);
"sdmc:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
#endif
return 0;

8
frontend/drivers/platform_gx.c
View File

@ -464,14 +464,14 @@ static int frontend_gx_parse_drive_list(void *data)
file_list_t *list = (file_list_t*)data;
#ifdef HW_RVL
menu_entries_append_enum(list,
"sd:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"sd:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"usb:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"usb:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
#endif
menu_entries_append_enum(list,
"carda:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"carda:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"cardb:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"cardb:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
#endif
return 0;

2
frontend/drivers/platform_linux.c
View File

@ -1858,7 +1858,7 @@ static int frontend_android_parse_drive_list(void *data)
MSG_INTERNAL_MEMORY, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list, "/", "",
MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
return 0;
}

22
frontend/drivers/platform_ps3.c
View File

@ -496,27 +496,27 @@ static int frontend_ps3_parse_drive_list(void *data)
file_list_t *list = (file_list_t*)data;
menu_entries_append_enum(list,
"/app_home/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"/app_home/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"/dev_hdd0/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"/dev_hdd0/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"/dev_hdd1/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"/dev_hdd1/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"/host_root/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"/host_root/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"/dev_usb000/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"/dev_usb000/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"/dev_usb001/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"/dev_usb001/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"/dev_usb002/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"/dev_usb002/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"/dev_usb003/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"/dev_usb003/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"/dev_usb004/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"/dev_usb004/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"/dev_usb005/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"/dev_usb005/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"/dev_usb006/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"/dev_usb006/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
#endif
return 0;

8
frontend/drivers/platform_psp.c
View File

@ -371,14 +371,14 @@ static int frontend_psp_parse_drive_list(void *data)
#ifdef VITA
menu_entries_append_enum(list,
"cache0:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"cache0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
#else
menu_entries_append_enum(list,
"ms0:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"ms0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"ef0:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"ef0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"host0:/", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"host0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
#endif
#endif

2
frontend/drivers/platform_win32.c
View File

@ -229,7 +229,7 @@ static int frontend_win32_parse_drive_list(void *data)
drive[0] = 'A' + i;
if (drives & (1 << i))
menu_entries_append_enum(list,
drive, "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
drive, "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
}
#endif

12
frontend/drivers/platform_xdk.cpp
View File

@ -1368,18 +1368,18 @@ static int frontend_xdk_parse_drive_list(void *data)
#if defined(_XBOX1)
menu_entries_append_enum(list,
"C:", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"C:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"D:", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"D:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"E:", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"E:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"F:", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"F:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"G:", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"G:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
#elif defined(_XBOX360)
menu_entries_append_enum(list,
"game:", "", MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
"game:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
#endif
#endif

6
intl/msg_hash_us.c
View File

@ -2615,12 +2615,6 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
return "input_poll_type_behavior";
case MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY:
return "menu_wallpaper_opacity";
case MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY:
return "file_browser_directory";
case MENU_ENUM_LABEL_FILE_BROWSER_PLAIN_FILE:
return "file_browser_plain_file";
case MENU_ENUM_LABEL_FILE_BROWSER_CORE:
return "file_browser_core";
default:
break;
}

15
menu/menu_displaylist.c
View File

@ -3150,7 +3150,7 @@ static int menu_displaylist_parse_playlists(
{
if (frontend_driver_parse_drive_list(info->list) != 0)
menu_entries_append_enum(info->list, "/", "",
MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
return 0;
}
@ -3257,7 +3257,7 @@ static int menu_displaylist_parse_cores(
{
if (frontend_driver_parse_drive_list(info->list) != 0)
menu_entries_append_enum(info->list, "/", "",
MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
return 0;
}
@ -3317,7 +3317,6 @@ static int menu_displaylist_parse_cores(
bool is_dir;
char label[PATH_MAX_LENGTH] = {0};
const char *path = NULL;
enum msg_hash_enums enum_idx = MSG_UNKNOWN;
enum msg_file_type file_type = FILE_TYPE_NONE;
switch (str_list->elems[i].attr.i)
@ -3334,7 +3333,6 @@ static int menu_displaylist_parse_cores(
case RARCH_PLAIN_FILE:
default:
file_type = (enum msg_file_type)info->type_default;
enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_CORE;
break;
}
@ -3370,7 +3368,7 @@ static int menu_displaylist_parse_cores(
items_found++;
menu_entries_append_enum(info->list, path, label,
enum_idx,
MSG_UNKNOWN,
file_type, 0, 0);
}
@ -3441,7 +3439,7 @@ static int menu_displaylist_parse_generic(
{
if (frontend_driver_parse_drive_list(info->list) != 0)
menu_entries_append_enum(info->list, "/", "",
MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY, FILE_TYPE_DIRECTORY, 0, 0);
MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
return 0;
}
@ -3511,14 +3509,12 @@ static int menu_displaylist_parse_generic(
bool is_dir;
char label[PATH_MAX_LENGTH] = {0};
const char *path = NULL;
enum msg_hash_enums enum_idx = MSG_UNKNOWN;
enum msg_file_type file_type = FILE_TYPE_NONE;
switch (str_list->elems[i].attr.i)
{
case RARCH_DIRECTORY:
file_type = FILE_TYPE_DIRECTORY;
enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY;
break;
case RARCH_COMPRESSED_ARCHIVE:
file_type = FILE_TYPE_CARCHIVE;
@ -3529,7 +3525,6 @@ static int menu_displaylist_parse_generic(
case RARCH_PLAIN_FILE:
default:
file_type = (enum msg_file_type)info->type_default;
enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_PLAIN_FILE;
switch (type)
{
case DISPLAYLIST_CORES_DETECTED:
@ -3602,7 +3597,7 @@ static int menu_displaylist_parse_generic(
items_found++;
menu_entries_append_enum(info->list, path, label,
enum_idx,
MSG_UNKNOWN,
file_type, 0, 0);
}

4
msg_hash.h
View File

@ -286,10 +286,6 @@ enum msg_hash_enums
MSG_EXTRACTING_FILE,
MSG_NO_CONTENT_STARTING_DUMMY_CORE,
MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY,
MENU_ENUM_LABEL_FILE_BROWSER_PLAIN_FILE,
MENU_ENUM_LABEL_FILE_BROWSER_CORE,
MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE,
MENU_ENUM_LABEL_MENU_TOGGLE,
MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE,