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

Cleanup unnecessary list_mainmenu

This commit is contained in:
twinaphex 2015-01-25 05:39:08 +01:00
parent 8e95e87b2f
commit 7e24fdfdc7
6 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/drivers_backend/menu_common_backend.c
View File

@ -60,7 +60,7 @@ static int menu_info_screen_iterate(unsigned action)
if (current_setting) if (current_setting)
strlcpy(needle, current_setting->name, sizeof(needle)); strlcpy(needle, current_setting->name, sizeof(needle));
else if ((current_setting = (rarch_setting_t*)setting_data_find_setting( else if ((current_setting = (rarch_setting_t*)setting_data_find_setting(
driver.menu->list_mainmenu, driver.menu->list_settings,
list->list[driver.menu->selection_ptr].label))) list->list[driver.menu->selection_ptr].label)))
{ {
if (current_setting) if (current_setting)

3
menu/menu.c
View File

@ -212,10 +212,7 @@ void menu_free_list(void *data)
if (!menu) if (!menu)
return; return;
settings_list_free(menu->list_mainmenu);
settings_list_free(menu->list_settings); settings_list_free(menu->list_settings);
menu->list_mainmenu = NULL;
menu->list_settings = NULL; menu->list_settings = NULL;
} }

8
menu/menu_action.c
View File

@ -119,18 +119,10 @@ static rarch_setting_t *find_setting(void)
const file_list_t *list = (const file_list_t*) const file_list_t *list = (const file_list_t*)
driver.menu->menu_list->selection_buf; driver.menu->menu_list->selection_buf;
/* Check if setting belongs to settings menu. */
rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting( rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting(
driver.menu->list_settings, driver.menu->list_settings,
list->list[driver.menu->selection_ptr].label); list->list[driver.menu->selection_ptr].label);
/* Check if setting belongs to main menu. */
if (!setting)
setting = (rarch_setting_t*)setting_data_find_setting(
driver.menu->list_mainmenu,
list->list[driver.menu->selection_ptr].label);
return setting; return setting;
} }

1
menu/menu_driver.h
View File

@ -138,7 +138,6 @@ typedef struct
unsigned idx; unsigned idx;
} keyboard; } keyboard;
rarch_setting_t *list_mainmenu;
rarch_setting_t *list_settings; rarch_setting_t *list_settings;
} menu_handle_t; } menu_handle_t;

7
menu/menu_entries.c
View File

@ -53,9 +53,9 @@ int menu_entries_push_main_menu_list(menu_handle_t *menu,
{ {
rarch_setting_t *setting = NULL; rarch_setting_t *setting = NULL;
settings_list_free(menu->list_mainmenu); settings_list_free(menu->list_settings);
menu->list_mainmenu = (rarch_setting_t *)setting_data_new(SL_FLAG_MAIN_MENU); menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_MAIN_MENU);
setting = (rarch_setting_t*)setting_data_find_setting(menu->list_mainmenu, setting = (rarch_setting_t*)setting_data_find_setting(menu->list_settings,
label); label);
if (!setting) if (!setting)
@ -434,7 +434,6 @@ bool menu_entries_init(menu_handle_t *menu)
if (!menu) if (!menu)
return false; return false;
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, "", "Main Menu", MENU_SETTINGS, 0); menu_list_push_stack(menu->menu_list, "", "Main Menu", MENU_SETTINGS, 0);

2
settings_data.c
View File

@ -2947,7 +2947,7 @@ void setting_data_get_label(char *type_str,
if (!driver.menu || !driver.menu->menu_list) if (!driver.menu || !driver.menu->menu_list)
return; return;
setting_data = (rarch_setting_t*)driver.menu->list_mainmenu; setting_data = (rarch_setting_t*)driver.menu->list_settings;
setting = (rarch_setting_t*)setting_data_find_setting(setting_data, setting = (rarch_setting_t*)setting_data_find_setting(setting_data,
driver.menu->menu_list->selection_buf->list[idx].label); driver.menu->menu_list->selection_buf->list[idx].label);