mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move initing/deiniting of menu_list over to menu_common.c - turn

Browse Source 
rgui.c into a rasterizer
This commit is contained in:
twinaphex 2013-11-04 13:18:07 +01:00
parent 6d89601cf4
commit 9688288837
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/menu/menu_common.c
View File

@ -382,6 +382,15 @@ void menu_init(void)
rarch_fail(1, "menu_init()");
}
strlcpy(rgui->base_path, g_settings.rgui_browser_directory, sizeof(rgui->base_path));
rgui->menu_stack = (rgui_list_t*)calloc(1, sizeof(rgui_list_t));
rgui->selection_buf = (rgui_list_t*)calloc(1, sizeof(rgui_list_t));
rgui_list_push(rgui->menu_stack, "", RGUI_SETTINGS, 0);
rgui->selection_ptr = 0;
rgui->push_start_screen = g_settings.rgui_show_start_screen;
g_settings.rgui_show_start_screen = false;
menu_populate_entries(rgui, RGUI_SETTINGS);
rgui->trigger_state = 0;
rgui->old_input_state = 0;
rgui->do_held = false;
@ -431,6 +440,13 @@ void menu_free(void)
if (menu_ctx && menu_ctx->free)
menu_ctx->free(rgui);
#ifdef HAVE_DYNAMIC
libretro_free_system_info(&rgui->info);
#endif
rgui_list_free(rgui->menu_stack);
rgui_list_free(rgui->selection_buf);
#ifdef HAVE_FILEBROWSER
filebrowser_free(rgui->browser);
#endif

17
frontend/menu/rgui.c
View File

@ -87,16 +87,6 @@ static void *rgui_init(void)
return NULL;
}
strlcpy(rgui->base_path, g_settings.rgui_browser_directory, sizeof(rgui->base_path));
rgui->menu_stack = (rgui_list_t*)calloc(1, sizeof(rgui_list_t));
rgui->selection_buf = (rgui_list_t*)calloc(1, sizeof(rgui_list_t));
rgui_list_push(rgui->menu_stack, "", RGUI_SETTINGS, 0);
rgui->selection_ptr = 0;
rgui->push_start_screen = g_settings.rgui_show_start_screen;
g_settings.rgui_show_start_screen = false;
menu_populate_entries(rgui, RGUI_SETTINGS);
return rgui;
}
@ -105,13 +95,6 @@ static void rgui_free(void *data)
rgui_handle_t *rgui = (rgui_handle_t*)data;
if (rgui->alloc_font)
free((uint8_t*)rgui->font);
#ifdef HAVE_DYNAMIC
libretro_free_system_info(&rgui->info);
#endif
rgui_list_free(rgui->menu_stack);
rgui_list_free(rgui->selection_buf);
}
static int rgui_core_setting_toggle(unsigned setting, rgui_action_t action)