mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-11 00:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Refactor menu_entries_push

Browse Source
This commit is contained in:
twinaphex 2014-08-31 19:41:28 +02:00
parent c5a98467be
commit e649ae80ed
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1483,7 +1483,9 @@ static int menu_settings_iterate(unsigned action)
{ {
bool ret = (menu_common_type_is(menu_type) == MENU_SETTINGS); bool ret = (menu_common_type_is(menu_type) == MENU_SETTINGS);
driver.menu->need_refresh = false; driver.menu->need_refresh = false;
menu_entries_push(driver.menu, label, ret ? menu_type : MENU_SETTINGS); RARCH_LOG("Goes here?\n");
menu_entries_push(driver.menu, path, label,
ret ? menu_type : MENU_SETTINGS);
} }
if (driver.menu_ctx && driver.menu_ctx->render) if (driver.menu_ctx && driver.menu_ctx->render)
@ -1888,7 +1890,7 @@ static void menu_parse_and_resolve(unsigned menu_type)
is_dir ? menu_type : MENU_FILE_PLAIN, 0); is_dir ? menu_type : MENU_FILE_PLAIN, 0);
} }
menu_entries_push(driver.menu, label, menu_type); menu_entries_push(driver.menu, dir, label, menu_type);
string_list_free(list); string_list_free(list);
} }
} }

2
frontend/menu/menu_common.c
View File

@ -265,7 +265,7 @@ void *menu_init(const void *data)
menu->push_start_screen = g_settings.menu_show_start_screen; menu->push_start_screen = g_settings.menu_show_start_screen;
g_settings.menu_show_start_screen = false; g_settings.menu_show_start_screen = false;
menu_entries_push(menu, "mainmenu", MENU_SETTINGS); menu_entries_push(menu, "", "mainmenu", 0);
menu->trigger_state = 0; menu->trigger_state = 0;
menu->old_input_state = 0; menu->old_input_state = 0;

7
frontend/menu/menu_entries.c
View File

@ -40,13 +40,18 @@ static void add_setting_entry(menu_handle_t *menu, const char *label, unsigned i
} }
void menu_entries_push(menu_handle_t *menu, void menu_entries_push(menu_handle_t *menu,
const char *label, unsigned menu_type) const char *path, const char *label,
unsigned menu_type)
{ {
unsigned i; unsigned i;
char tmp[256]; char tmp[256];
rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list(); rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list();
#if 0
RARCH_LOG("Label is: %s\n", label); RARCH_LOG("Label is: %s\n", label);
RARCH_LOG("Path is: %s\n", path);
RARCH_LOG("Menu type is: %d\n", menu_type);
#endif
if (!strcmp(label, "mainmenu")) if (!strcmp(label, "mainmenu"))
{ {

4
frontend/menu/menu_entries.h
View File

@ -19,7 +19,7 @@
#include "menu_common.h" #include "menu_common.h"
void menu_entries_push(menu_handle_t *menu, const char *label, void menu_entries_push(menu_handle_t *menu, const char *path,
unsigned menu_type); const char *label, unsigned menu_type);
#endif #endif