mirror of
https://github.com/libretro/RetroArch
synced 2024-12-28 09:29:16 +00:00
Create RARCH_CTL_MAIN_INIT and RARCH_CTL_MAIN_DEINIT
This commit is contained in:
twinaphex
parent
aa0f0a2738
commit
8670c2e405
@ -70,7 +70,7 @@ void main_exit(void *args)
|
||||
/* Do not want menu context to live any more. */
|
||||
menu_driver_ctl(RARCH_MENU_CTL_UNSET_OWN_DRIVER, NULL);
|
||||
#endif
|
||||
rarch_main_deinit();
|
||||
rarch_ctl(RARCH_CTL_MAIN_DEINIT, NULL);
|
||||
}
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_PERFCNT_REPORT_FRONTEND_LOG, NULL);
|
||||
@ -265,7 +265,7 @@ bool main_load_content(int argc, char **argv, void *args,
|
||||
{
|
||||
unsigned i;
|
||||
bool retval = true;
|
||||
int ret = 0, rarch_argc = 0;
|
||||
int rarch_argc = 0;
|
||||
char *rarch_argv[MAX_ARGS] = {NULL};
|
||||
char *argv_copy [MAX_ARGS] = {NULL};
|
||||
char **rarch_argv_ptr = (char**)argv;
|
||||
@ -278,7 +278,6 @@ bool main_load_content(int argc, char **argv, void *args,
|
||||
|
||||
(void)rarch_argc_ptr;
|
||||
(void)rarch_argv_ptr;
|
||||
(void)ret;
|
||||
|
||||
retro_assert(wrap_args);
|
||||
|
||||
@ -293,10 +292,12 @@ bool main_load_content(int argc, char **argv, void *args,
|
||||
rarch_argc_ptr = (int*)&rarch_argc;
|
||||
}
|
||||
|
||||
if (rarch_ctl(RARCH_CTL_IS_INITED, NULL))
|
||||
rarch_main_deinit();
|
||||
rarch_ctl(RARCH_CTL_MAIN_DEINIT, NULL);
|
||||
|
||||
if ((ret = rarch_main_init(*rarch_argc_ptr, rarch_argv_ptr)))
|
||||
wrap_args->argc = *rarch_argc_ptr;
|
||||
wrap_args->argv = rarch_argv_ptr;
|
||||
|
||||
if (!rarch_ctl(RARCH_CTL_MAIN_INIT, wrap_args))
|
||||
{
|
||||
retval = false;
|
||||
goto error;
|
||||
|
||||
91
retroarch.c
91
retroarch.c
@ -1170,7 +1170,7 @@ bool rarch_option_create(char *path, size_t len)
|
||||
*
|
||||
* Returns: 0 on success, otherwise 1 if there was an error.
|
||||
**/
|
||||
int rarch_main_init(int argc, char *argv[])
|
||||
static int rarch_main_init(int argc, char *argv[])
|
||||
{
|
||||
int sjlj_ret;
|
||||
bool *verbosity = NULL;
|
||||
@ -1273,6 +1273,40 @@ error:
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* rarch_main_deinit:
|
||||
*
|
||||
* Deinitializes the program.
|
||||
**/
|
||||
static void rarch_main_deinit(void)
|
||||
{
|
||||
global_t *global = global_get_ptr();
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_NETPLAY_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_COMMAND_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_REMOTE_DEINIT, NULL);
|
||||
|
||||
if (global->sram.use)
|
||||
event_cmd_ctl(EVENT_CMD_AUTOSAVE_DEINIT, NULL);
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_RECORD_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_SAVEFILES, NULL);
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_REWIND_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_CHEATS_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_BSV_MOVIE_DEINIT, NULL);
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_AUTOSAVE_STATE, NULL);
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_CORE_DEINIT, NULL);
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_TEMPORARY_CONTENT_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_SAVEFILES_DEINIT, NULL);
|
||||
|
||||
rarch_ctl(RARCH_CTL_UNSET_INITED, NULL);
|
||||
}
|
||||
|
||||
#define FAIL_CPU(simd_type) do { \
|
||||
RARCH_ERR(simd_type " code is compiled in, but CPU does not support this feature. Cannot continue.\n"); \
|
||||
retro_fail(1, "validate_cpu_features()"); \
|
||||
@ -1329,7 +1363,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
|
||||
runloop_ctl(RUNLOOP_CTL_GLOBAL_FREE, NULL);
|
||||
runloop_ctl(RUNLOOP_CTL_DATA_DEINIT, NULL);
|
||||
config_free();
|
||||
return true;
|
||||
break;
|
||||
case RARCH_CTL_DEINIT:
|
||||
{
|
||||
bool inited = false;
|
||||
@ -1342,7 +1376,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
|
||||
event_cmd_ctl(EVENT_CMD_DRIVERS_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_DRIVERS_INIT, NULL);
|
||||
}
|
||||
return true;
|
||||
break;
|
||||
case RARCH_CTL_PREINIT:
|
||||
if (!config_realloc())
|
||||
return false;
|
||||
@ -1350,7 +1384,19 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
|
||||
event_cmd_ctl(EVENT_CMD_HISTORY_DEINIT, NULL);
|
||||
|
||||
runloop_ctl(RUNLOOP_CTL_CLEAR_STATE, NULL);
|
||||
return true;
|
||||
break;
|
||||
case RARCH_CTL_MAIN_DEINIT:
|
||||
if (!rarch_ctl(RARCH_CTL_IS_INITED, NULL))
|
||||
return false;
|
||||
rarch_main_deinit();
|
||||
break;
|
||||
case RARCH_CTL_MAIN_INIT:
|
||||
{
|
||||
struct rarch_main_wrap *wrap = (struct rarch_main_wrap*)data;
|
||||
if (rarch_main_init(wrap->argc, wrap->argv))
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case RARCH_CTL_INIT:
|
||||
rarch_ctl(RARCH_CTL_DEINIT, NULL);
|
||||
init_state();
|
||||
@ -1360,7 +1406,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
|
||||
settings->input.libretro_device[i] = RETRO_DEVICE_JOYPAD;
|
||||
}
|
||||
runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_INIT, NULL);
|
||||
return true;
|
||||
break;
|
||||
case RARCH_CTL_SET_PATHS_REDIRECT:
|
||||
if(settings->sort_savestates_enable || settings->sort_savefiles_enable)
|
||||
{
|
||||
@ -1419,7 +1465,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
|
||||
*settings->libretro = '\0'; /* Load core in new config. */
|
||||
}
|
||||
runloop_ctl(RUNLOOP_CTL_PREPARE_DUMMY, NULL);
|
||||
return true;
|
||||
break;
|
||||
case RARCH_CTL_MENU_RUNNING:
|
||||
#ifdef HAVE_MENU
|
||||
menu_driver_ctl(RARCH_MENU_CTL_SET_TOGGLE, NULL);
|
||||
@ -1500,39 +1546,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* rarch_main_deinit:
|
||||
*
|
||||
* Deinitializes the program.
|
||||
**/
|
||||
void rarch_main_deinit(void)
|
||||
{
|
||||
global_t *global = global_get_ptr();
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_NETPLAY_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_COMMAND_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_REMOTE_DEINIT, NULL);
|
||||
|
||||
if (global->sram.use)
|
||||
event_cmd_ctl(EVENT_CMD_AUTOSAVE_DEINIT, NULL);
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_RECORD_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_SAVEFILES, NULL);
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_REWIND_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_CHEATS_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_BSV_MOVIE_DEINIT, NULL);
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_AUTOSAVE_STATE, NULL);
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_CORE_DEINIT, NULL);
|
||||
|
||||
event_cmd_ctl(EVENT_CMD_TEMPORARY_CONTENT_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT, NULL);
|
||||
event_cmd_ctl(EVENT_CMD_SAVEFILES_DEINIT, NULL);
|
||||
|
||||
rarch_ctl(RARCH_CTL_UNSET_INITED, NULL);
|
||||
}
|
||||
|
||||
int rarch_info_get_capabilities(enum rarch_capabilities type,
|
||||
char *s, size_t len)
|
||||
|
||||
26
retroarch.h
26
retroarch.h
@ -61,6 +61,12 @@ enum rarch_ctl_state
|
||||
/* Initialize all drivers. */
|
||||
RARCH_CTL_INIT,
|
||||
|
||||
/* Initializes RetroArch. */
|
||||
RARCH_CTL_MAIN_INIT,
|
||||
|
||||
/* Deinitializes RetroArch. */
|
||||
RARCH_CTL_MAIN_DEINIT,
|
||||
|
||||
RARCH_CTL_UNSET_INITED,
|
||||
|
||||
RARCH_CTL_SET_INITED,
|
||||
@ -144,6 +150,8 @@ enum rarch_capabilities
|
||||
|
||||
struct rarch_main_wrap
|
||||
{
|
||||
int argc;
|
||||
char **argv;
|
||||
const char *content_path;
|
||||
const char *sram_path;
|
||||
const char *state_path;
|
||||
@ -157,24 +165,6 @@ struct rarch_main_wrap
|
||||
|
||||
bool rarch_ctl(enum rarch_ctl_state state, void *data);
|
||||
|
||||
/**
|
||||
* rarch_main_init:
|
||||
* @argc : Count of (commandline) arguments.
|
||||
* @argv : (Commandline) arguments.
|
||||
*
|
||||
* Initializes RetroArch.
|
||||
*
|
||||
* Returns: 0 on success, otherwise 1 if there was an error.
|
||||
**/
|
||||
int rarch_main_init(int argc, char *argv[]);
|
||||
|
||||
/**
|
||||
* rarch_main_deinit:
|
||||
*
|
||||
* Deinitializes RetroArch.
|
||||
**/
|
||||
void rarch_main_deinit(void);
|
||||
|
||||
int rarch_info_get_capabilities(enum rarch_capabilities type,
|
||||
char *s, size_t len);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user