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

Revert "Create public init_menu/uninit_menu"

Browse Source 
This reverts commit 8f7e9edd8819fdc1281a069fa06aadaa772b30e3.
This commit is contained in:
twinaphex 2014-06-06 00:51:56 +02:00
parent e91bcd5f6d
commit d3301083ac
2 changed files with 11 additions and 21 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
void init_menu(void) static void init_menu(void)
{ {
if (driver.menu) if (driver.menu)
return; return;
@ -517,9 +517,6 @@ 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
@ -572,6 +569,9 @@ 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,9 +629,14 @@ static void compute_monitor_fps_statistics(void)
} }
} }
#ifdef HAVE_MENU void uninit_drivers(void)
void uninit_menu(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
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);
@ -640,18 +645,8 @@ void uninit_menu(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,11 +746,6 @@ 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[]);