mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Rename menu_entries_pop to menu_entries_pop_list

Browse Source
This commit is contained in:
twinaphex 2014-10-11 05:50:34 +02:00
parent 520bc6e852
commit 0089833f5d
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/menu/backend/menu_common_backend.c
View File

@ -56,7 +56,7 @@ static int menu_message_toggle(unsigned action)
driver.menu_ctx->render_messagebox(driver.menu->message_contents);
if (action == MENU_ACTION_OK)
menu_entries_pop(driver.menu->menu_stack);
menu_entries_pop_list(driver.menu->menu_stack);
return 0;
}
@ -111,7 +111,7 @@ static int menu_info_screen_iterate(unsigned action)
}
if (action == MENU_ACTION_OK)
menu_entries_pop(driver.menu->menu_stack);
menu_entries_pop_list(driver.menu->menu_stack);
return 0;
}
@ -178,7 +178,7 @@ static int menu_start_screen_iterate(unsigned action)
driver.menu_ctx->render_messagebox(msg);
if (action == MENU_ACTION_OK)
menu_entries_pop(driver.menu->menu_stack);
menu_entries_pop_list(driver.menu->menu_stack);
return 0;
}
@ -443,7 +443,7 @@ static int menu_settings_iterate(unsigned action)
break;
case MENU_ACTION_CANCEL:
menu_entries_pop(driver.menu->menu_stack);
menu_entries_pop_list(driver.menu->menu_stack);
break;
case MENU_ACTION_SELECT:
file_list_push(driver.menu->menu_stack, "", "info_screen",
@ -577,7 +577,7 @@ static int menu_viewport_iterate(unsigned action)
break;
case MENU_ACTION_CANCEL:
menu_entries_pop(driver.menu->menu_stack);
menu_entries_pop_list(driver.menu->menu_stack);
if (!strcmp(label, "custom_viewport_2"))
{
file_list_push(driver.menu->menu_stack, "", "",
@ -587,7 +587,7 @@ static int menu_viewport_iterate(unsigned action)
break;
case MENU_ACTION_OK:
menu_entries_pop(driver.menu->menu_stack);
menu_entries_pop_list(driver.menu->menu_stack);
if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT
&& !g_settings.video.scale_integer)
{
@ -711,7 +711,7 @@ static int menu_load_or_open_zip_iterate(unsigned action)
const char* label = NULL;
unsigned int menu_type = 0, type = 0;
menu_entries_pop(driver.menu->menu_stack);
menu_entries_pop_list(driver.menu->menu_stack);
file_list_get_last(driver.menu->menu_stack, &menu_path, &menu_label,
&menu_type);
@ -734,7 +734,7 @@ static int menu_load_or_open_zip_iterate(unsigned action)
const char* label = NULL;
unsigned int menu_type = 0, type = 0;
menu_entries_pop(driver.menu->menu_stack);
menu_entries_pop_list(driver.menu->menu_stack);
file_list_get_last(driver.menu->menu_stack, &menu_path, &menu_label,
&menu_type);
@ -1027,13 +1027,13 @@ static int menu_common_iterate(unsigned action)
else if (menu_type == MENU_SETTINGS_CUSTOM_BIND)
{
if (menu_input_bind_iterate(driver.menu))
menu_entries_pop(driver.menu->menu_stack);
menu_entries_pop_list(driver.menu->menu_stack);
return 0;
}
else if (menu_type == MENU_SETTINGS_CUSTOM_BIND_KEYBOARD)
{
if (menu_input_bind_iterate_keyboard(driver.menu))
menu_entries_pop(driver.menu->menu_stack);
menu_entries_pop_list(driver.menu->menu_stack);
return 0;
}
@ -1088,7 +1088,7 @@ static int menu_common_iterate(unsigned action)
break;
case MENU_ACTION_CANCEL:
menu_entries_pop(driver.menu->menu_stack);
menu_entries_pop_list(driver.menu->menu_stack);
break;
case MENU_ACTION_OK:

2
frontend/menu/menu_entries.c
View File

@ -136,7 +136,7 @@ void menu_entries_push_perfcounter(menu_handle_t *menu,
id + i, 0);
}
void menu_entries_pop(file_list_t *list)
void menu_entries_pop_list(file_list_t *list)
{
if (file_list_get_size(list) > 1)
{

3
frontend/menu/menu_entries.h
View File

@ -30,11 +30,12 @@ int menu_entries_push_list(menu_handle_t *menu,
file_list_t *list, const char *path,
const char *label, unsigned menu_type);
void menu_entries_pop_list(file_list_t *list);
int menu_parse_check(const char *label, unsigned menu_type);
int menu_parse_and_resolve(file_list_t *list, file_list_t *menu_list);
void menu_entries_pop(file_list_t *list);
void menu_entries_pop_stack(file_list_t *list, const char *needle);
void menu_flush_stack_type(file_list_t *list, unsigned final_type);