mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create public init_menu/uninit_menu

Browse Source
This commit is contained in:
twinaphex 2014-06-05 20:26:21 +02:00
parent 17b5b55314
commit 8f7e9edd88
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
driver.c
View File

@ -506,7 +506,7 @@ bool driver_update_system_av_info(const struct retro_system_av_info *info)
} }
#ifdef HAVE_MENU #ifdef HAVE_MENU
static void init_menu(void) void init_menu(void)
{ {
if (driver.menu) if (driver.menu)
return; return;
@ -517,6 +517,9 @@ static void init_menu(void)
RARCH_ERR("Cannot initialize menu.\n"); RARCH_ERR("Cannot initialize menu.\n");
rarch_fail(1, "init_menu()"); rarch_fail(1, "init_menu()");
} }
if (driver.menu && driver.menu_ctx && driver.menu_ctx->context_reset)
driver.menu_ctx->context_reset(driver.menu);
} }
#endif #endif
@ -569,9 +572,6 @@ void init_drivers(void)
#ifdef HAVE_MENU #ifdef HAVE_MENU
init_menu(); init_menu();
if (driver.menu && driver.menu_ctx && driver.menu_ctx->context_reset)
driver.menu_ctx->context_reset(driver.menu);
#endif #endif
// Keep non-throttled state as good as possible. // Keep non-throttled state as good as possible.
@ -629,14 +629,9 @@ static void compute_monitor_fps_statistics(void)
} }
} }
void uninit_drivers(void)
{
uninit_audio();
if (g_extern.system.hw_render_callback.context_destroy && !driver.video_cache_context)
g_extern.system.hw_render_callback.context_destroy();
#ifdef HAVE_MENU #ifdef HAVE_MENU
void uninit_menu(void)
{
if (driver.menu && driver.menu_ctx && driver.menu_ctx->context_destroy) if (driver.menu && driver.menu_ctx && driver.menu_ctx->context_destroy)
driver.menu_ctx->context_destroy(driver.menu); driver.menu_ctx->context_destroy(driver.menu);
@ -645,8 +640,18 @@ void uninit_drivers(void)
menu_free(driver.menu); menu_free(driver.menu);
driver.menu = NULL; driver.menu = NULL;
} }
}
#endif #endif
void uninit_drivers(void)
{
uninit_audio();
if (g_extern.system.hw_render_callback.context_destroy && !driver.video_cache_context)
g_extern.system.hw_render_callback.context_destroy();
uninit_menu();
uninit_video_input(); uninit_video_input();
if (!driver.video_data_own) if (!driver.video_data_own)

5
general.h
View File

@ -746,6 +746,11 @@ int rarch_main(int argc, char *argv[]);
#define MAX_ARGS 32 #define MAX_ARGS 32
#endif #endif
#ifdef HAVE_MENU
void init_menu(void);
void uninit_menu(void);
#endif
void rarch_main_init_wrap(const struct rarch_main_wrap *args, int *argc, char **argv); void rarch_main_init_wrap(const struct rarch_main_wrap *args, int *argc, char **argv);
int rarch_main_init(int argc, char *argv[]); int rarch_main_init(int argc, char *argv[]);