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

Remove menu_list_push_stack

This commit is contained in:
twinaphex 2015-05-08 19:28:52 +02:00
parent bbe6b5c809
commit ab4ca635be
7 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/menu_entries.c
View File

@ -524,7 +524,7 @@ bool menu_entries_init(menu_handle_t *menu)
menu->list_settings = setting_new(SL_FLAG_ALL); menu->list_settings = setting_new(SL_FLAG_ALL);
menu_list_push_stack(menu->menu_list, "", "Main Menu", MENU_SETTINGS, 0); menu_list_push(menu->menu_list->menu_stack, "", "Main Menu", MENU_SETTINGS, 0);
menu_navigation_clear(&menu->navigation, true); menu_navigation_clear(&menu->navigation, true);
menu_entries_push_list(menu, menu->menu_list->selection_buf, menu_entries_push_list(menu, menu->menu_list->selection_buf,
"", "Main Menu", 0, SL_FLAG_MAIN_MENU); "", "Main Menu", 0, SL_FLAG_MAIN_MENU);

6
menu/menu_entries_cbs_iterate.c
View File

@ -352,7 +352,7 @@ static int action_iterate_menu_viewport(const char *label, unsigned action)
if (!strcmp(label, "custom_viewport_2")) if (!strcmp(label, "custom_viewport_2"))
{ {
menu_list_push_stack(menu_list, "", "", menu_list_push(menu_list->menu_stack, "", "",
MENU_SETTINGS_CUSTOM_VIEWPORT, MENU_SETTINGS_CUSTOM_VIEWPORT,
menu->navigation.selection_ptr); menu->navigation.selection_ptr);
} }
@ -363,7 +363,7 @@ static int action_iterate_menu_viewport(const char *label, unsigned action)
if (type == MENU_SETTINGS_CUSTOM_VIEWPORT if (type == MENU_SETTINGS_CUSTOM_VIEWPORT
&& !settings->video.scale_integer) && !settings->video.scale_integer)
menu_list_push_stack(menu_list, "", menu_list_push(menu_list->menu_stack, "",
"custom_viewport_2", 0, menu->navigation.selection_ptr); "custom_viewport_2", 0, menu->navigation.selection_ptr);
break; break;
@ -623,7 +623,7 @@ static int action_iterate_main(const char *label, unsigned action)
{ {
menu_list_t *menu_list = menu_list_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr();
menu_list_push_stack(menu_list, "", "help", 0, 0); menu_list_push(menu_list->menu_stack, "", "help", 0, 0);
menu->push_start_screen = false; menu->push_start_screen = false;
} }

16
menu/menu_entries_cbs_ok.c
View File

@ -728,12 +728,8 @@ static int action_ok_compressed_archive_push(const char *path,
if (!menu) if (!menu)
return -1; return -1;
menu_list_push_stack( menu_list_push(menu->menu_list->menu_stack,
menu->menu_list, path, "load_open_zip", 0, idx);
path,
"load_open_zip",
0,
idx);
return 0; return 0;
} }
@ -964,8 +960,8 @@ static int action_ok_custom_viewport(const char *path,
return -1; return -1;
menu_list_push_stack( menu_list_push(
menu->menu_list, menu->menu_list->menu_stack,
"", "",
"custom_viewport_1", "custom_viewport_1",
MENU_SETTINGS_CUSTOM_VIEWPORT, MENU_SETTINGS_CUSTOM_VIEWPORT,
@ -1179,8 +1175,8 @@ static int action_ok_help(const char *path,
if (!menu) if (!menu)
return -1; return -1;
menu_list_push_stack( menu_list_push(
menu->menu_list, menu->menu_list->menu_stack,
"", "",
"help", "help",
0, 0,

2
menu/menu_entries_cbs_select.c
View File

@ -23,7 +23,7 @@ static int action_select_default(unsigned type, const char *label,
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
if (!menu) if (!menu)
return 0; return 0;
menu_list_push_stack(menu->menu_list, "", "info_screen", menu_list_push(menu->menu_list->menu_stack, "", "info_screen",
0, menu->navigation.selection_ptr); 0, menu->navigation.selection_ptr);
return 0; return 0;
} }

11
menu/menu_input.c
View File

@ -392,9 +392,8 @@ int menu_input_set_keyboard_bind_mode(void *data,
menu->binds.last = setting->bind_type; menu->binds.last = setting->bind_type;
menu->binds.target = keybind; menu->binds.target = keybind;
menu->binds.user = setting->index_offset; menu->binds.user = setting->index_offset;
menu_list_push_stack( menu->menu_list, menu_list_push( menu->menu_list->menu_stack,
"", "", "custom_bind",
"custom_bind",
MENU_SETTINGS_CUSTOM_BIND_KEYBOARD, MENU_SETTINGS_CUSTOM_BIND_KEYBOARD,
nav->selection_ptr); nav->selection_ptr);
break; break;
@ -403,7 +402,7 @@ int menu_input_set_keyboard_bind_mode(void *data,
[setting->index_offset][0]; [setting->index_offset][0];
menu->binds.begin = MENU_SETTINGS_BIND_BEGIN; menu->binds.begin = MENU_SETTINGS_BIND_BEGIN;
menu->binds.last = MENU_SETTINGS_BIND_LAST; menu->binds.last = MENU_SETTINGS_BIND_LAST;
menu_list_push_stack( menu->menu_list, menu_list_push( menu->menu_list->menu_stack,
"", "",
"custom_bind_all", "custom_bind_all",
MENU_SETTINGS_CUSTOM_BIND_KEYBOARD, MENU_SETTINGS_CUSTOM_BIND_KEYBOARD,
@ -446,7 +445,7 @@ int menu_input_set_input_device_bind_mode(void *data,
menu->binds.last = setting->bind_type; menu->binds.last = setting->bind_type;
menu->binds.target = keybind; menu->binds.target = keybind;
menu->binds.user = setting->index_offset; menu->binds.user = setting->index_offset;
menu_list_push_stack( menu->menu_list, menu_list_push( menu->menu_list->menu_stack,
"", "",
"custom_bind", "custom_bind",
MENU_SETTINGS_CUSTOM_BIND, MENU_SETTINGS_CUSTOM_BIND,
@ -457,7 +456,7 @@ int menu_input_set_input_device_bind_mode(void *data,
[setting->index_offset][0]; [setting->index_offset][0];
menu->binds.begin = MENU_SETTINGS_BIND_BEGIN; menu->binds.begin = MENU_SETTINGS_BIND_BEGIN;
menu->binds.last = MENU_SETTINGS_BIND_LAST; menu->binds.last = MENU_SETTINGS_BIND_LAST;
menu_list_push_stack( menu->menu_list, menu_list_push( menu->menu_list->menu_stack,
"", "",
"custom_bind_all", "custom_bind_all",
MENU_SETTINGS_CUSTOM_BIND, MENU_SETTINGS_CUSTOM_BIND,

10
menu/menu_list.c
View File

@ -374,14 +374,6 @@ void menu_list_push(file_list_t *list,
menu_list_insert(list, path, label, type, directory_ptr); menu_list_insert(list, path, label, type, directory_ptr);
} }
void menu_list_push_stack(menu_list_t *list,
const char *path, const char *label,
unsigned type, size_t directory_ptr)
{
if (list)
menu_list_push(list->menu_stack, path, label, type, directory_ptr);
}
int menu_list_push_stack_refresh(menu_list_t *list, const char *path, const char *label, int menu_list_push_stack_refresh(menu_list_t *list, const char *path, const char *label,
unsigned type, size_t directory_ptr) unsigned type, size_t directory_ptr)
{ {
@ -393,7 +385,7 @@ int menu_list_push_stack_refresh(menu_list_t *list, const char *path, const char
menu_driver_list_cache(false, 0); menu_driver_list_cache(false, 0);
menu_list_push_stack(list, path, label, type, directory_ptr); menu_list_push(list->menu_stack, path, label, type, directory_ptr);
menu_navigation_clear(&menu->navigation, true); menu_navigation_clear(&menu->navigation, true);
menu->need_refresh = true; menu->need_refresh = true;

4
menu/menu_list.h
View File

@ -86,10 +86,6 @@ void menu_list_push(file_list_t *list,
const char *path, const char *label, const char *path, const char *label,
unsigned type, size_t directory_ptr); unsigned type, size_t directory_ptr);
void menu_list_push_stack(menu_list_t *list,
const char *path, const char *label,
unsigned type, size_t directory_ptr);
int menu_list_push_stack_refresh(menu_list_t *list, int menu_list_push_stack_refresh(menu_list_t *list,
const char *path, const char *label, const char *path, const char *label,
unsigned type, size_t directory_ptr); unsigned type, size_t directory_ptr);