libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-25 12:20:48 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Rename menu_entries_push to menu_entries_add

Browse Source
This commit is contained in:
twinaphex 2016-04-11 05:49:39 +02:00
parent f25581e88d
commit 7e7a1fa5f9
18 changed files with 266 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cheevos.c
View File

@ -2109,9 +2109,9 @@ static void cheevos_populate_menu(void *data)
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_displaylist_info_t *info = (menu_displaylist_info_t*)data; menu_displaylist_info_t *info = (menu_displaylist_info_t*)data;
menu_entries_push(info->list, "Unlocked Achievements:", menu_entries_add(info->list, "Unlocked Achievements:",
"", MENU_SETTINGS_CHEEVOS_NONE, 0, 0); "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
menu_entries_push(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0); menu_entries_add(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
cheevo = cheevos_locals.core.cheevos; cheevo = cheevos_locals.core.cheevos;
end = cheevos_locals.core.cheevos + cheevos_locals.core.count; end = cheevos_locals.core.cheevos + cheevos_locals.core.count;
@ -2119,7 +2119,7 @@ static void cheevos_populate_menu(void *data)
for (i = 0; cheevo < end; i++, cheevo++) for (i = 0; cheevo < end; i++, cheevo++)
{ {
if (!cheevo->active) if (!cheevo->active)
menu_entries_push(info->list, cheevo->title, menu_entries_add(info->list, cheevo->title,
cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0); cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
} }
@ -2132,15 +2132,15 @@ static void cheevos_populate_menu(void *data)
for (i = cheevos_locals.core.count; cheevo < end; i++, cheevo++) for (i = cheevos_locals.core.count; cheevo < end; i++, cheevo++)
{ {
if (!cheevo->active) if (!cheevo->active)
menu_entries_push(info->list, cheevo->title, menu_entries_add(info->list, cheevo->title,
cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0); cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
} }
} }
menu_entries_push(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0); menu_entries_add(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
menu_entries_push(info->list, "Locked Achievements:", "", menu_entries_add(info->list, "Locked Achievements:", "",
MENU_SETTINGS_CHEEVOS_NONE, 0, 0); MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
menu_entries_push(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0); menu_entries_add(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
cheevo = cheevos_locals.core.cheevos; cheevo = cheevos_locals.core.cheevos;
end = cheevos_locals.core.cheevos + cheevos_locals.core.count; end = cheevos_locals.core.cheevos + cheevos_locals.core.count;
@ -2148,7 +2148,7 @@ static void cheevos_populate_menu(void *data)
for (i = 0; cheevo < end; i++, cheevo++) for (i = 0; cheevo < end; i++, cheevo++)
{ {
if (cheevo->active) if (cheevo->active)
menu_entries_push(info->list, cheevo->title, menu_entries_add(info->list, cheevo->title,
cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0); cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
} }
@ -2161,7 +2161,7 @@ static void cheevos_populate_menu(void *data)
for (i = cheevos_locals.core.count; cheevo < end; i++, cheevo++) for (i = cheevos_locals.core.count; cheevo < end; i++, cheevo++)
{ {
if (cheevo->active) if (cheevo->active)
menu_entries_push(info->list, cheevo->title, menu_entries_add(info->list, cheevo->title,
cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0); cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
} }
} }

2
frontend/drivers/platform_ctr.c
View File

@ -247,7 +247,7 @@ static int frontend_ctr_parse_drive_list(void *data)
if (!list) if (!list)
return -1; return -1;
menu_entries_push(list, menu_entries_add(list,
"sdmc:/", "", MENU_FILE_DIRECTORY, 0, 0); "sdmc:/", "", MENU_FILE_DIRECTORY, 0, 0);
#endif #endif

4
frontend/drivers/platform_darwin.m
View File

@ -636,9 +636,9 @@ static int frontend_darwin_parse_drive_list(void *data)
CFSearchPathForDirectoriesInDomains(CFDocumentDirectory, CFUserDomainMask, 1, home_dir_buf, sizeof(home_dir_buf)); CFSearchPathForDirectoriesInDomains(CFDocumentDirectory, CFUserDomainMask, 1, home_dir_buf, sizeof(home_dir_buf));
menu_entries_push(list, menu_entries_add(list,
home_dir_buf, "", MENU_FILE_DIRECTORY, 0, 0); home_dir_buf, "", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_push(list, "/", "", menu_entries_add(list, "/", "",
MENU_FILE_DIRECTORY, 0, 0); MENU_FILE_DIRECTORY, 0, 0);
ret = 0; ret = 0;

8
frontend/drivers/platform_gx.c
View File

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

8
frontend/drivers/platform_linux.c
View File

@ -2137,14 +2137,14 @@ static int frontend_android_parse_drive_list(void *data)
file_list_t *list = (file_list_t*)data; file_list_t *list = (file_list_t*)data;
// MENU_FILE_DIRECTORY is not working with labels, placeholders for now // MENU_FILE_DIRECTORY is not working with labels, placeholders for now
menu_entries_push(list, menu_entries_add(list,
app_dir, "Application Dir", MENU_FILE_DIRECTORY, 0, 0); app_dir, "Application Dir", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_push(list, menu_entries_add(list,
ext_dir, "External Application Dir", MENU_FILE_DIRECTORY, 0, 0); ext_dir, "External Application Dir", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_push(list, menu_entries_add(list,
sdcard_dir, "Internal Memory", MENU_FILE_DIRECTORY, 0, 0); sdcard_dir, "Internal Memory", MENU_FILE_DIRECTORY, 0, 0);
menu_entries_push(list, "/", "", menu_entries_add(list, "/", "",
MENU_FILE_DIRECTORY, 0, 0); MENU_FILE_DIRECTORY, 0, 0);
return 0; return 0;

22
frontend/drivers/platform_ps3.c
View File

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

8
frontend/drivers/platform_psp.c
View File

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

2
frontend/drivers/platform_win32.c
View File

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

12
frontend/drivers/platform_xdk.cpp
View File

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

3
menu/cbs/menu_cbs_ok.c
View File

@ -424,8 +424,7 @@ int generic_action_ok_displaylist_push(const char *path,
info.list = selection_buf; info.list = selection_buf;
info_path = menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_SETTINGS); info_path = menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_SETTINGS);
info_label = menu_hash_to_str(MENU_LABEL_CONTENT_SETTINGS); info_label = menu_hash_to_str(MENU_LABEL_CONTENT_SETTINGS);
menu_entries_push(menu_stack, menu_entries_add(menu_stack, info_path, info_label, 0, 0, 0);
info_path, info_label, 0, 0, 0);
break; break;
} }

6
menu/drivers/materialui.c
View File

@ -1396,7 +1396,7 @@ 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_push(info->list, menu_entries_add(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_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
@ -1404,12 +1404,12 @@ static int mui_list_push(void *data, void *userdata,
core_info_ctl(CORE_INFO_CTL_LIST_GET, &list); core_info_ctl(CORE_INFO_CTL_LIST_GET, &list);
if (core_info_list_num_info_files(list)) if (core_info_list_num_info_files(list))
{ {
menu_entries_push(info->list, menu_entries_add(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_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
menu_entries_push(info->list, menu_entries_add(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_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);

2
menu/drivers/menu_generic.c
View File

@ -400,7 +400,7 @@ bool generic_menu_init_list(void *data)
strlcpy(info.label, strlcpy(info.label,
menu_hash_to_str(MENU_VALUE_MAIN_MENU), sizeof(info.label)); menu_hash_to_str(MENU_VALUE_MAIN_MENU), sizeof(info.label));
menu_entries_push(menu_stack, info.path, menu_entries_add(menu_stack, info.path,
info.label, info.type, info.flags, 0); info.label, info.type, info.flags, 0);
info.list = selection_buf; info.list = selection_buf;

2
menu/drivers/xmb.c
View File

@ -2971,7 +2971,7 @@ static bool xmb_menu_init_list(void *data)
strlcpy(info.label, strlcpy(info.label,
menu_hash_to_str(MENU_VALUE_MAIN_MENU), sizeof(info.label)); menu_hash_to_str(MENU_VALUE_MAIN_MENU), sizeof(info.label));
menu_entries_push(menu_stack, info.path, menu_entries_add(menu_stack, info.path,
info.label, info.type, info.flags, 0); info.label, info.type, info.flags, 0);
info.list = selection_buf; info.list = selection_buf;

2
menu/drivers/zarch.c
View File

@ -1299,7 +1299,7 @@ static bool zarch_menu_init_list(void *data)
strlcpy(info.label, strlcpy(info.label,
menu_hash_to_str(MENU_VALUE_HISTORY_TAB), sizeof(info.label)); menu_hash_to_str(MENU_VALUE_HISTORY_TAB), sizeof(info.label));
menu_entries_push(menu_stack, menu_entries_add(menu_stack,
info.path, info.label, info.type, info.flags, 0); info.path, info.label, info.type, info.flags, 0);
event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL); event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL);

2
menu/drivers/zr.c
View File

@ -424,7 +424,7 @@ static bool zrmenu_init_list(void *data)
strlcpy(info.label, strlcpy(info.label,
menu_hash_to_str(MENU_VALUE_HISTORY_TAB), sizeof(info.label)); menu_hash_to_str(MENU_VALUE_HISTORY_TAB), sizeof(info.label));
menu_entries_push(menu_stack, menu_entries_add(menu_stack,
info.path, info.label, info.type, info.flags, 0); info.path, info.label, info.type, info.flags, 0);
event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL); event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL);

428
menu/menu_displaylist.c
View File

File diff suppressed because it is too large Load Diff

2
menu/menu_entries.c
View File

@ -502,7 +502,7 @@ error:
return false; return false;
} }
void menu_entries_push(file_list_t *list, const char *path, const char *label, void menu_entries_add(file_list_t *list, const char *path, const char *label,
unsigned type, size_t directory_ptr, size_t entry_idx) unsigned type, size_t directory_ptr, size_t entry_idx)
{ {
menu_ctx_list_t list_info; menu_ctx_list_t list_info;

2
menu/menu_entries.h
View File

@ -139,7 +139,7 @@ file_list_t *menu_entries_get_selection_buf_ptr(size_t idx);
file_list_t *menu_entries_get_menu_stack_ptr(size_t idx); file_list_t *menu_entries_get_menu_stack_ptr(size_t idx);
void menu_entries_push(file_list_t *list, const char *path, const char *label, void menu_entries_add(file_list_t *list, const char *path, const char *label,
unsigned type, size_t directory_ptr, size_t entry_idx); unsigned type, size_t directory_ptr, size_t entry_idx);
void menu_entries_get_last_stack(const char **path, const char **label, void menu_entries_get_last_stack(const char **path, const char **label,