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

(menu.c) Cleanups

This commit is contained in:
twinaphex 2015-08-21 20:54:56 +02:00
parent 5479bae312
commit e8a290bd7b
1 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
menu/menu.c
View File

@ -180,15 +180,6 @@ void menu_common_load_content(bool persist, enum rarch_core_type type)
menu_common_push_content_settings(); menu_common_push_content_settings();
} }
static int menu_init_entries(menu_entries_t *entries)
{
if (!(entries->menu_list = (menu_list_t*)menu_list_new()))
return -1;
return 0;
}
/** /**
* menu_init: * menu_init:
* @data : Menu context handle. * @data : Menu context handle.
@ -201,20 +192,23 @@ void *menu_init(const void *data)
{ {
menu_handle_t *menu = NULL; menu_handle_t *menu = NULL;
menu_display_t *disp = NULL; menu_display_t *disp = NULL;
menu_entries_t *entries = NULL;
menu_ctx_driver_t *menu_ctx = (menu_ctx_driver_t*)data; menu_ctx_driver_t *menu_ctx = (menu_ctx_driver_t*)data;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!menu_ctx) if (!menu_ctx)
return NULL; return NULL;
if (!(menu = (menu_handle_t*)menu_ctx->init())) if (!(menu = (menu_handle_t*)menu_ctx->init()))
return NULL; return NULL;
entries = &menu->entries;
strlcpy(settings->menu.driver, menu_ctx->ident, strlcpy(settings->menu.driver, menu_ctx->ident,
sizeof(settings->menu.driver)); sizeof(settings->menu.driver));
if (menu_init_entries(&menu->entries) != 0) if (!(entries->menu_list = (menu_list_t*)menu_list_new()))
goto error; goto error;
global->core_info.current = (core_info_t*)calloc(1, sizeof(core_info_t)); global->core_info.current = (core_info_t*)calloc(1, sizeof(core_info_t));
@ -270,25 +264,6 @@ error:
return NULL; return NULL;
} }
/**
* menu_free_list:
* @menu : Menu handle.
*
* Frees menu lists.
**/
static void menu_free_list(menu_entries_t *entries)
{
if (!entries)
return;
menu_setting_free(entries->list_settings);
entries->list_settings = NULL;
menu_list_free(entries->menu_list);
entries->menu_list = NULL;
}
/** /**
* menu_free: * menu_free:
* @menu : Menu handle. * @menu : Menu handle.
@ -299,11 +274,10 @@ void menu_free(menu_handle_t *menu)
{ {
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
menu_display_t *disp = menu_display_get_ptr(); menu_display_t *disp = menu_display_get_ptr();
menu_entries_t *entries = menu ? &menu->entries : NULL;
if (!menu || !disp) if (!menu || !disp)
return; return;
if (menu->playlist) if (menu->playlist)
content_playlist_free(menu->playlist); content_playlist_free(menu->playlist);
menu->playlist = NULL; menu->playlist = NULL;
@ -318,7 +292,14 @@ void menu_free(menu_handle_t *menu)
menu_display_free(menu); menu_display_free(menu);
menu_free_list(&menu->entries); if (entries)
{
menu_setting_free(entries->list_settings);
entries->list_settings = NULL;
menu_list_free(entries->menu_list);
entries->menu_list = NULL;
}
event_command(EVENT_CMD_HISTORY_DEINIT); event_command(EVENT_CMD_HISTORY_DEINIT);