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

Reimplement rarch_main_state_free

Browse Source
This commit is contained in:
twinaphex 2015-03-21 19:43:46 +01:00
parent 83947f473b
commit 7e7a42ec21
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
retroarch.c
View File

@ -1686,22 +1686,6 @@ static void main_init_state_config(void)
settings->input.libretro_device[i] = RETRO_DEVICE_JOYPAD; settings->input.libretro_device[i] = RETRO_DEVICE_JOYPAD;
} }
/**
* main_clear_state:
* @inited : Init the drivers after teardown?
*
* Will teardown drivers and clears all
* internal state of RetroArch.
* If @inited is true, will initialize all
* drivers again after teardown.
**/
static void main_clear_state(bool inited)
{
main_clear_state_drivers(inited);
init_state();
main_init_state_config();
}
void rarch_main_state_alloc(void) void rarch_main_state_alloc(void)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -1719,11 +1703,23 @@ void rarch_main_state_alloc(void)
rarch_main_data_clear_state(); rarch_main_data_clear_state();
} }
/**
* rarch_main_state_new:
*
* Will teardown drivers and clears all
* internal state of RetroArch.
* If @inited is true, will initialize all
* drivers again after teardown.
**/
void rarch_main_state_new(void) void rarch_main_state_new(void)
{ {
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
bool inited = global->main_is_init;
main_clear_state_drivers(inited);
init_state();
main_init_state_config();
main_clear_state(global->main_is_init);
rarch_main_command(RARCH_CMD_MSG_QUEUE_INIT); rarch_main_command(RARCH_CMD_MSG_QUEUE_INIT);
} }
@ -1732,8 +1728,9 @@ void rarch_main_state_free(void)
rarch_main_command(RARCH_CMD_MSG_QUEUE_DEINIT); rarch_main_command(RARCH_CMD_MSG_QUEUE_DEINIT);
rarch_main_command(RARCH_CMD_LOG_FILE_DEINIT); rarch_main_command(RARCH_CMD_LOG_FILE_DEINIT);
main_clear_state(false); rarch_main_state_deinit();
rarch_main_global_deinit();
config_free();
} }
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB

4
runloop.c
View File

@ -1003,7 +1003,7 @@ runloop_t *rarch_main_get_ptr(void)
return g_runloop; return g_runloop;
} }
static void rarch_main_state_deinit(void) void rarch_main_state_deinit(void)
{ {
runloop_t *runloop = rarch_main_get_ptr(); runloop_t *runloop = rarch_main_get_ptr();
@ -1013,7 +1013,7 @@ static void rarch_main_state_deinit(void)
free(runloop); free(runloop);
} }
static void rarch_main_global_deinit(void) void rarch_main_global_deinit(void)
{ {
global_t *global = NULL; global_t *global = NULL;

4
runloop.h
View File

@ -482,6 +482,10 @@ void rarch_main_data_clear_state(void);
void rarch_main_data_iterate(void); void rarch_main_data_iterate(void);
void rarch_main_state_deinit(void);
void rarch_main_global_deinit(void);
void rarch_main_data_deinit(void); void rarch_main_data_deinit(void);
void rarch_main_data_init_queues(void); void rarch_main_data_init_queues(void);