mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Apple) Reduce apple_run_core in complexity

Browse Source
This commit is contained in:
Twinaphex 2014-10-17 02:57:02 +02:00
parent 9357b86fe1
commit 4f9812da6b
4 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apple/OSX/platform.m
View File

@ -175,7 +175,7 @@ static char** waiting_argv;
[cb addItemWithObjectValue:desc];
}
apple_run_core(waiting_argc, waiting_argv, nil, 0);
apple_run_core(waiting_argc, waiting_argv);
waiting_argc = 0;
}

2
apple/common/RetroArch_Apple.h
View File

@ -40,7 +40,7 @@ extern char** apple_argv;
extern id<RetroArch_Platform> apple_platform;
// main.m
extern void apple_run_core(int argc, char **argv, const char * core, const char* file);
extern void apple_run_core(int argc, char **argv);
extern void apple_start_iteration(void);
extern void apple_stop_iteration(void);

27
apple/common/main.m
View File

@ -30,39 +30,22 @@ void apple_rarch_exited(void)
[apple_platform unloadingCore];
}
void apple_run_core(int argc, char **argv, const char* core,
const char* file)
void apple_run_core(int argc, char **argv)
{
static char core_path[PATH_MAX], file_path[PATH_MAX],
config_path[PATH_MAX];
NSString *core_to_load = core ? BOXSTRING(core) : nil;
[apple_platform loadingCore:core_to_load withFile:file];
if (file)
strlcpy(file_path, file, sizeof(file_path));
if (core)
strlcpy(core_path, core, sizeof(core_path));
static char config_path[PATH_MAX];
[apple_platform loadingCore:nil withFile:nil];
strlcpy(config_path, g_defaults.config_path, sizeof(config_path));
core_info_get_custom_config(core, config_path, sizeof(config_path));
static const char* const argv_game[] = { "retroarch", "-c", config_path, "-L", core_path, file_path, 0 };
static const char* const argv_menu[] = { "retroarch", "-c", config_path, "--menu", 0 };
if (argc == 0)
argc = (file && core) ? 6 : 4;
argc = 4;
if (!argv)
argv = (char**)((file && core) ? argv_game : argv_menu);
argv = (char**)(argv_menu);
if (rarch_main(argc, argv))
{
char basedir[256];
fill_pathname_basedir(basedir, file ? file : "", sizeof(basedir));
if (file && access(basedir, R_OK | W_OK | X_OK))
apple_display_alert("The directory containing the selected file must have write permissions. This will prevent zipped content from loading, and will cause some cores to not function.", "Warning");
else
apple_display_alert("Failed to load content.", "Error");
main_exit(NULL);
}
}

2
apple/iOS/platform.m
View File

@ -230,7 +230,7 @@ static void handle_touch_event(NSArray* touches)
// Warn if there are no cores present
core_info_set_core_path();
apple_run_core(0, NULL, nil, 0);
apple_run_core(0, NULL);
apple_gamecontroller_init();
}