ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Frontend/Menu) start refactoring load_menu_game

This commit is contained in:
Twinaphex 2014-07-27 08:17:38 +02:00
parent 4d5e5d9a13
commit b67b481f1c
3 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/frontend.c
View File

@ -272,7 +272,7 @@ void main_exit(args_type() args)
driver.frontend_ctx->shutdown(false); driver.frontend_ctx->shutdown(false);
} }
static void free_args(struct rarch_main_wrap *wrap_args, char **argv_copy, unsigned argv_size) void free_args(struct rarch_main_wrap *wrap_args, char **argv_copy, unsigned argv_size)
{ {
unsigned i; unsigned i;
if (!wrap_args->touched) if (!wrap_args->touched)
@ -346,6 +346,9 @@ returntype main_entry(signature())
} }
} }
if (g_extern.main_is_init)
rarch_main_deinit();
if ((ret = rarch_main_init(*rarch_argc_ptr, rarch_argv_ptr))) if ((ret = rarch_main_init(*rarch_argc_ptr, rarch_argv_ptr)))
{ {
free_args(wrap_args, argv_copy, ARRAY_SIZE(argv_copy)); free_args(wrap_args, argv_copy, ARRAY_SIZE(argv_copy));

1
frontend/frontend.h
View File

@ -38,6 +38,7 @@ extern "C" {
int main_entry_iterate(signature(), args_type() args); int main_entry_iterate(signature(), args_type() args);
void main_exit(args_type() args); void main_exit(args_type() args);
returntype main_entry(signature()); returntype main_entry(signature());
void free_args(struct rarch_main_wrap *wrap_args, char **argv_copy, unsigned argv_size);
#ifdef __cplusplus #ifdef __cplusplus
} }

64
frontend/menu/menu_common.c
View File

@ -180,55 +180,61 @@ static void menu_update_libretro_info(menu_handle_t *menu)
bool load_menu_game(void) bool load_menu_game(void)
{ {
int rarch_argc, ret; int *rarch_argc_ptr;
char **rarch_argv_ptr;
struct rarch_main_wrap *wrap_args;
unsigned i; unsigned i;
struct rarch_main_wrap args = {0}; int ret, rarch_argc = 0;
char *argv_copy[MAX_ARGS];
char *rarch_argv[MAX_ARGS] = {NULL}; char *rarch_argv[MAX_ARGS] = {NULL};
char *argv_copy[MAX_ARGS] = {NULL};
if (!driver.menu) wrap_args = (struct rarch_main_wrap*)calloc(1, sizeof(*wrap_args));
return false; rarch_assert(wrap_args);
args.no_rom = driver.menu->load_no_rom; wrap_args->no_rom = driver.menu->load_no_rom;
args.verbose = g_extern.verbosity; wrap_args->verbose = g_extern.verbosity;
args.config_path = *g_extern.config_path ? g_extern.config_path : NULL; wrap_args->config_path = *g_extern.config_path ? g_extern.config_path : NULL;
args.sram_path = *g_extern.savefile_dir ? g_extern.savefile_dir : NULL; wrap_args->sram_path = *g_extern.savefile_dir ? g_extern.savefile_dir : NULL;
args.state_path = *g_extern.savestate_dir ? g_extern.savestate_dir : NULL; wrap_args->state_path = *g_extern.savestate_dir ? g_extern.savestate_dir : NULL;
args.rom_path = *g_extern.fullpath ? g_extern.fullpath : NULL; wrap_args->rom_path = *g_extern.fullpath ? g_extern.fullpath : NULL;
args.libretro_path = *g_settings.libretro ? g_settings.libretro : NULL; wrap_args->libretro_path = *g_settings.libretro ? g_settings.libretro : NULL;
rarch_argc = 0; rarch_argc = 0;
ret = 0; ret = 0;
rarch_main_init_wrap(&args, &rarch_argc, rarch_argv); rarch_main_init_wrap(wrap_args, &rarch_argc, rarch_argv);
if (rarch_argc > 0) memcpy(argv_copy, rarch_argv, sizeof(rarch_argv));
rarch_argv_ptr = (char**)rarch_argv;
rarch_argc_ptr = (int*)&rarch_argc;
if (g_extern.main_is_init)
rarch_main_deinit();
if (ret = rarch_main_init(rarch_argc, rarch_argv))
{ {
// The pointers themselves are not const, and can be messed around with by getopt_long(). free_args(wrap_args, argv_copy, ARRAY_SIZE(argv_copy));
memcpy(argv_copy, rarch_argv, sizeof(rarch_argv)); free(wrap_args);
if (g_extern.main_is_init)
rarch_main_deinit();
ret = rarch_main_init(rarch_argc, rarch_argv);
for (i = 0; i < ARRAY_SIZE(argv_copy); i++)
free(argv_copy[i]);
}
if (ret != 0)
{
char name[PATH_MAX], msg[PATH_MAX]; char name[PATH_MAX], msg[PATH_MAX];
fill_pathname_base(name, g_extern.fullpath, sizeof(name)); fill_pathname_base(name, g_extern.fullpath, sizeof(name));
snprintf(msg, sizeof(msg), "Failed to load %s.\n", name); snprintf(msg, sizeof(msg), "Failed to load %s.\n", name);
msg_queue_push(g_extern.msg_queue, msg, 1, 90); msg_queue_push(g_extern.msg_queue, msg, 1, 90);
driver.menu->msg_force = true;
if (driver.menu)
driver.menu->msg_force = true;
return false; return false;
} }
if (wrap_args)
free_args(wrap_args, argv_copy, ARRAY_SIZE(argv_copy));
free(wrap_args);
// Update menu state which depends on config. // Update menu state which depends on config.
menu_update_libretro_info(driver.menu); if (driver.menu)
menu_update_libretro_info(driver.menu);
if (g_extern.history) if (g_extern.history)
content_history_free(g_extern.history); content_history_free(g_extern.history);