mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

menu_list_push_stack_ * functions now take in a menu_list_t *

Browse Source 
parameter for 1st param instead of file_list_t *
This commit is contained in:
twinaphex 2014-10-18 01:24:37 +02:00
parent e3894e7b9c
commit d921061af8
7 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,7 +223,7 @@ static int menu_settings_iterate(unsigned action,
menu_list_pop_stack(driver.menu->menu_list->menu_stack); menu_list_pop_stack(driver.menu->menu_list->menu_stack);
break; break;
case MENU_ACTION_SELECT: case MENU_ACTION_SELECT:
menu_list_push_stack(driver.menu->menu_list->menu_stack, "", "info_screen", menu_list_push_stack(driver.menu->menu_list, "", "info_screen",
0, driver.menu->selection_ptr); 0, driver.menu->selection_ptr);
break; break;
case MENU_ACTION_OK: case MENU_ACTION_OK:
@ -268,7 +268,7 @@ static int menu_settings_iterate(unsigned action,
/* Have to defer it so we let settings refresh. */ /* Have to defer it so we let settings refresh. */
if (driver.menu->push_start_screen) if (driver.menu->push_start_screen)
{ {
menu_list_push_stack(driver.menu->menu_list->menu_stack, "", "help", 0, 0); menu_list_push_stack(driver.menu->menu_list, "", "help", 0, 0);
driver.menu->push_start_screen = false; driver.menu->push_start_screen = false;
} }
@ -352,7 +352,7 @@ static int menu_viewport_iterate(unsigned action)
menu_list_pop_stack(driver.menu->menu_list->menu_stack); menu_list_pop_stack(driver.menu->menu_list->menu_stack);
if (!strcmp(label, "custom_viewport_2")) if (!strcmp(label, "custom_viewport_2"))
{ {
menu_list_push_stack(driver.menu->menu_list->menu_stack, "", "", menu_list_push_stack(driver.menu->menu_list, "", "",
MENU_SETTINGS_CUSTOM_VIEWPORT, MENU_SETTINGS_CUSTOM_VIEWPORT,
driver.menu->selection_ptr); driver.menu->selection_ptr);
} }
@ -363,7 +363,7 @@ static int menu_viewport_iterate(unsigned action)
if (type == MENU_SETTINGS_CUSTOM_VIEWPORT if (type == MENU_SETTINGS_CUSTOM_VIEWPORT
&& !g_settings.video.scale_integer) && !g_settings.video.scale_integer)
{ {
menu_list_push_stack(driver.menu->menu_list->menu_stack, "", menu_list_push_stack(driver.menu->menu_list, "",
"custom_viewport_2", 0, driver.menu->selection_ptr); "custom_viewport_2", 0, driver.menu->selection_ptr);
} }
break; break;
@ -504,7 +504,7 @@ static int menu_load_or_open_zip_iterate(unsigned action)
fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path)); fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path));
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, driver.menu->menu_list,
cat_path, cat_path,
menu_label, menu_label,
type, type,
@ -524,7 +524,7 @@ static int menu_load_or_open_zip_iterate(unsigned action)
} }
else if (ret == 0) else if (ret == 0)
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, driver.menu->menu_list,
g_settings.libretro_directory, g_settings.libretro_directory,
"deferred_core_list", "deferred_core_list",
0, 0,
@ -637,7 +637,7 @@ static int menu_common_iterate(unsigned action)
break; break;
case MENU_ACTION_SELECT: case MENU_ACTION_SELECT:
menu_list_push_stack(driver.menu->menu_list->menu_stack, "", "info_screen", menu_list_push_stack(driver.menu->menu_list, "", "info_screen",
0, driver.menu->selection_ptr); 0, driver.menu->selection_ptr);
break; break;

2
frontend/menu/menu_action.c
View File

@ -108,7 +108,7 @@ static int menu_entries_set_current_path_selection(
{ {
case MENU_ACTION_OK: case MENU_ACTION_OK:
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, driver.menu->menu_list,
start_path, start_path,
label, label,
type, type,

2
frontend/menu/menu_entries.c
View File

@ -405,7 +405,7 @@ bool menu_entries_init(menu_handle_t *menu)
menu->list_mainmenu = setting_data_new(SL_FLAG_MAIN_MENU); menu->list_mainmenu = setting_data_new(SL_FLAG_MAIN_MENU);
menu->list_settings = setting_data_new(SL_FLAG_ALL_SETTINGS); menu->list_settings = setting_data_new(SL_FLAG_ALL_SETTINGS);
menu_list_push_stack(menu->menu_list->menu_stack, "", "Main Menu", MENU_SETTINGS, 0); menu_list_push_stack(menu->menu_list, "", "Main Menu", MENU_SETTINGS, 0);
menu_navigation_clear(menu, true); menu_navigation_clear(menu, true);
entries_push_main_menu_list(menu, menu->menu_list->selection_buf, entries_push_main_menu_list(menu, menu->menu_list->selection_buf,
"", "Main Menu", 0); "", "Main Menu", 0);

31
frontend/menu/menu_entries_cbs.c
View File

@ -128,7 +128,7 @@ static int action_ok_push_content_list(const char *path,
return -1; return -1;
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, driver.menu->menu_list,
g_settings.menu_content_directory, g_settings.menu_content_directory,
label, label,
MENU_FILE_DIRECTORY, MENU_FILE_DIRECTORY,
@ -155,7 +155,7 @@ static int action_ok_push_history_list(const char *path,
return -1; return -1;
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, driver.menu->menu_list,
"", "",
label, label,
type, type,
@ -170,7 +170,7 @@ static int action_ok_push_path_list(const char *path,
return -1; return -1;
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, driver.menu->menu_list,
"", "",
label, label,
type, type,
@ -350,7 +350,7 @@ static int action_ok_compressed_archive_push(const char *path,
fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path)); fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path));
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, driver.menu->menu_list,
cat_path, cat_path,
menu_label, menu_label,
type, type,
@ -374,7 +374,7 @@ static int action_ok_directory_push(const char *path,
fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path)); fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path));
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, driver.menu->menu_list,
cat_path, cat_path,
menu_label, menu_label,
type, type,
@ -452,7 +452,7 @@ static int action_ok_file_load_with_detect_core(const char *path,
} }
else if (ret == 0) else if (ret == 0)
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, driver.menu->menu_list,
g_settings.libretro_directory, g_settings.libretro_directory,
"deferred_core_list", "deferred_core_list",
0, driver.menu->selection_ptr); 0, driver.menu->selection_ptr);
@ -652,7 +652,8 @@ static int action_ok_core_list(const char *path,
if (!driver.menu) if (!driver.menu)
return -1; return -1;
menu_list_push_stack_refresh(driver.menu->menu_list->menu_stack, menu_list_push_stack_refresh(
driver.menu->menu_list,
dir, label, type, dir, label, type,
driver.menu->selection_ptr); driver.menu->selection_ptr);
@ -667,7 +668,8 @@ static int action_ok_disk_image_append_list(const char *path,
if (!driver.menu) if (!driver.menu)
return -1; return -1;
menu_list_push_stack_refresh(driver.menu->menu_list->menu_stack, menu_list_push_stack_refresh(
driver.menu->menu_list,
dir, label, type, dir, label, type,
driver.menu->selection_ptr); driver.menu->selection_ptr);
return 0; return 0;
@ -680,7 +682,8 @@ static int action_ok_configurations_list(const char *path,
if (!driver.menu) if (!driver.menu)
return -1; return -1;
menu_list_push_stack_refresh(driver.menu->menu_list->menu_stack, menu_list_push_stack_refresh(
driver.menu->menu_list,
dir ? dir : label, label, type, dir ? dir : label, label, type,
driver.menu->selection_ptr); driver.menu->selection_ptr);
return 0; return 0;
@ -692,7 +695,8 @@ static int action_ok_push_default(const char *path,
if (!driver.menu) if (!driver.menu)
return -1; return -1;
menu_list_push_stack_refresh(driver.menu->menu_list->menu_stack, menu_list_push_stack_refresh(
driver.menu->menu_list,
label, label, type, label, label, type,
driver.menu->selection_ptr); driver.menu->selection_ptr);
return 0; return 0;
@ -813,7 +817,7 @@ static int action_ok_shader_pass(const char *path,
return -1; return -1;
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, driver.menu->menu_list,
g_settings.video.shader_dir, g_settings.video.shader_dir,
"video_shader_pass", "video_shader_pass",
type, type,
@ -847,7 +851,7 @@ static int action_ok_shader_preset(const char *path,
return -1; return -1;
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, driver.menu->menu_list,
g_settings.video.shader_dir, g_settings.video.shader_dir,
"video_shader_preset", "video_shader_preset",
type, type,
@ -1011,7 +1015,8 @@ static int action_ok_shader_parameters(const char *path,
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, "", driver.menu->menu_list,
"",
"video_shader_parameters", "video_shader_parameters",
MENU_FILE_PUSH, MENU_FILE_PUSH,
driver.menu->selection_ptr); driver.menu->selection_ptr);

8
frontend/menu/menu_list.c
View File

@ -261,14 +261,16 @@ void menu_list_push_refresh(file_list_t *list,
driver.menu->need_refresh = true; driver.menu->need_refresh = true;
} }
void menu_list_push_stack(file_list_t *list, void menu_list_push_stack(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)
{ {
menu_list_push(list, path, label, type, directory_ptr); if (!list)
return;
menu_list_push(list->menu_stack, path, label, type, directory_ptr);
} }
void menu_list_push_stack_refresh(file_list_t *list, void 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)
{ {

4
frontend/menu/menu_list.h
View File

@ -79,11 +79,11 @@ void menu_list_push_refresh(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(file_list_t *list, void menu_list_push_stack(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);
void menu_list_push_stack_refresh(file_list_t *list, void 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);

2
settings_data.c
View File

@ -2399,7 +2399,7 @@ static void general_write_handler(void *data)
{ {
#ifdef HAVE_MENU #ifdef HAVE_MENU
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver.menu->menu_list->menu_stack, driver.menu->menu_list,
"", "",
"help", "help",
0, 0,