mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite menu_list_flush_stack_* functions - first parameter

Browse Source 
becomes menu_list_t *
This commit is contained in:
twinaphex 2014-10-18 01:39:05 +02:00
parent 3b384926b8
commit 3931134924
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -454,7 +454,7 @@ static int menu_viewport_iterate(unsigned action)
static void menu_common_load_content(void)
{
rarch_main_command(RARCH_CMD_LOAD_CONTENT);
menu_list_flush_stack(driver.menu->menu_list->menu_stack, MENU_SETTINGS);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
driver.menu->msg_force = true;
}

20
frontend/menu/menu_entries_cbs.c
View File

@ -117,7 +117,7 @@ unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480;
static void common_load_content(void)
{
rarch_main_command(RARCH_CMD_LOAD_CONTENT);
menu_list_flush_stack(driver.menu->menu_list->menu_stack, MENU_SETTINGS);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
driver.menu->msg_force = true;
}
@ -144,7 +144,7 @@ static int action_ok_playlist_entry(const char *path,
rarch_playlist_load_content(g_defaults.history,
driver.menu->selection_ptr);
menu_list_flush_stack(driver.menu->menu_list->menu_stack, MENU_SETTINGS);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
return -1;
}
@ -206,7 +206,7 @@ static int action_ok_shader_pass_load(const char *path,
/* This will reset any changed parameters. */
gfx_shader_resolve_parameters(NULL, driver.menu->shader);
menu_list_flush_stack_by_needle(driver.menu->menu_list->menu_stack, "Shader Options");
menu_list_flush_stack_by_needle(driver.menu->menu_list, "Shader Options");
return 0;
#else
return -1;
@ -231,7 +231,7 @@ static int action_ok_shader_preset_load(const char *path,
menu_shader_manager_set_preset(driver.menu->shader,
gfx_shader_parse_type(shader_path, RARCH_SHADER_NONE),
shader_path);
menu_list_flush_stack_by_needle(driver.menu->menu_list->menu_stack, "Shader Options");
menu_list_flush_stack_by_needle(driver.menu->menu_list, "Shader Options");
return 0;
#else
return -1;
@ -288,7 +288,7 @@ static int action_ok_core_load_deferred(const char *path,
sizeof(g_extern.fullpath));
rarch_main_command(RARCH_CMD_LOAD_CONTENT);
menu_list_flush_stack(driver.menu->menu_list->menu_stack, MENU_SETTINGS);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
driver.menu->msg_force = true;
return -1;
@ -307,14 +307,14 @@ static int action_ok_core_load(const char *path,
fill_pathname_join(g_settings.libretro, menu_path, path,
sizeof(g_settings.libretro));
rarch_main_command(RARCH_CMD_LOAD_CORE);
menu_list_flush_stack(driver.menu->menu_list->menu_stack, MENU_SETTINGS);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
#if defined(HAVE_DYNAMIC)
/* No content needed for this core, load core immediately. */
if (driver.menu->load_no_content)
{
*g_extern.fullpath = '\0';
rarch_main_command(RARCH_CMD_LOAD_CONTENT);
menu_list_flush_stack(driver.menu->menu_list->menu_stack, MENU_SETTINGS);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
driver.menu->msg_force = true;
return -1;
}
@ -396,7 +396,7 @@ static int action_ok_config_load(const char *path,
&menu_path, NULL, NULL);
fill_pathname_join(config, menu_path, path, sizeof(config));
menu_list_flush_stack(driver.menu->menu_list->menu_stack, MENU_SETTINGS);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
driver.menu->msg_force = true;
if (rarch_replace_config(config))
{
@ -424,7 +424,7 @@ static int action_ok_disk_image_append(const char *path,
rarch_main_command(RARCH_CMD_RESUME);
menu_list_flush_stack(driver.menu->menu_list->menu_stack, MENU_SETTINGS);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
return -1;
}
@ -492,7 +492,7 @@ static int action_ok_file_load(const char *path,
common_load_content();
rarch_main_command(RARCH_CMD_LOAD_CONTENT_PERSIST);
menu_list_flush_stack(driver.menu->menu_list->menu_stack, MENU_SETTINGS);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
driver.menu->msg_force = true;
return -1;

16
frontend/menu/menu_list.c
View File

@ -117,7 +117,7 @@ void *menu_list_get_last_stack_actiondata(const file_list_t *list)
return NULL;
}
void menu_list_flush_stack(file_list_t *list,
void menu_list_flush_stack(menu_list_t *list,
unsigned final_type)
{
const char *path = NULL;
@ -128,15 +128,15 @@ void menu_list_flush_stack(file_list_t *list,
return;
driver.menu->need_refresh = true;
file_list_get_last(list, &path, &label, &type);
file_list_get_last(list->menu_stack, &path, &label, &type);
while (type != final_type)
{
menu_list_pop(list, &driver.menu->selection_ptr);
file_list_get_last(list, &path, &label, &type);
menu_list_pop(list->menu_stack, &driver.menu->selection_ptr);
file_list_get_last(list->menu_stack, &path, &label, &type);
}
}
void menu_list_flush_stack_by_needle(file_list_t *list,
void menu_list_flush_stack_by_needle(menu_list_t *list,
const char *needle)
{
const char *path = NULL;
@ -147,11 +147,11 @@ void menu_list_flush_stack_by_needle(file_list_t *list,
return;
driver.menu->need_refresh = true;
file_list_get_last(list, &path, &label, &type);
file_list_get_last(list->menu_stack, &path, &label, &type);
while (strcmp(needle, label) != 0)
{
menu_list_pop(list, &driver.menu->selection_ptr);
file_list_get_last(list, &path, &label, &type);
menu_list_pop(list->menu_stack, &driver.menu->selection_ptr);
file_list_get_last(list->menu_stack, &path, &label, &type);
}
}

4
frontend/menu/menu_list.h
View File

@ -35,10 +35,10 @@ void *menu_list_new(void);
void menu_list_destroy(file_list_t *list);
void menu_list_flush_stack(file_list_t *list,
void menu_list_flush_stack(menu_list_t *list,
unsigned final_type);
void menu_list_flush_stack_by_needle(file_list_t *list,
void menu_list_flush_stack_by_needle(menu_list_t *list,
const char *needle);
void menu_list_pop(file_list_t *list, size_t *directory_ptr);