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

(iOS) Get rid of apple_run_core invocations in apple/iOS/menu.m and

Browse Source 
move over to new way of loading core. TODO: might need some kind
of explicit return to game in case main menu doesn't get shut down
when we invoke this
This commit is contained in:
Twinaphex 2014-10-17 02:49:25 +02:00
parent d31c903ada
commit 9357b86fe1
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout
View File

@ -10,23 +10,23 @@
<string>RetroArch_iOS</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>49FCA0A2-0FE0-4A7A-9C54-642C68ED726A</key>
<string>git://github.com/libretro/common-overlays.git</string>
<key>76200F0D6584D865E96F58DE862E738E88B23A3C</key>
<string>https://github.com/libretro/libretro-super.git</string>
<key>C7C12374C7051F8843B3EFA1ACCAF2907102CCF7</key>
<string>https://github.com/libretro/RetroArch.git</string>
<key>EF363D58F01B3FB341FA6C851870E60E4F080E97</key>
<string>git://github.com/libretro/common-overlays.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>apple/RetroArch_iOS.xcodeproj/project.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>49FCA0A2-0FE0-4A7A-9C54-642C68ED726A</key>
<string>../../../media/overlays</string>
<key>76200F0D6584D865E96F58DE862E738E88B23A3C</key>
<string>../../../..</string>
<key>C7C12374C7051F8843B3EFA1ACCAF2907102CCF7</key>
<string>../../..</string>
<key>EF363D58F01B3FB341FA6C851870E60E4F080E97</key>
<string>../../../media/overlays</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/libretro/RetroArch.git</string>
@ -40,7 +40,15 @@
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>49FCA0A2-0FE0-4A7A-9C54-642C68ED726A</string>
<string>76200F0D6584D865E96F58DE862E738E88B23A3C</string>
<key>IDESourceControlWCCName</key>
<string></string>
</dict>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>EF363D58F01B3FB341FA6C851870E60E4F080E97</string>
<key>IDESourceControlWCCName</key>
<string>overlays</string>
</dict>

24
apple/iOS/menu.m
View File

@ -608,8 +608,10 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
{
if (path)
{
/* TODO - reimplement this - should no longer use apple_run_core. */
apple_run_core(0, NULL, core.UTF8String, path.UTF8String);
strlcpy(g_settings.libretro, core.UTF8String, sizeof(g_settings.libretro));
strlcpy(g_extern.fullpath, path.UTF8String, sizeof(g_extern.fullpath));
rarch_main_command(RARCH_CMD_LOAD_CORE);
rarch_main_command(RARCH_CMD_LOAD_CONTENT);
}
else
{
@ -636,8 +638,10 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
{
if (weakSelf.core)
{
/* TODO - reimplement this - should no longer use apple_run_core. */
apple_run_core(0, NULL, weakSelf.core.UTF8String, item.path.UTF8String);
strlcpy(g_settings.libretro, weakSelf.core.UTF8String, sizeof(g_settings.libretro));
strlcpy(g_extern.fullpath, item.path.UTF8String, sizeof(g_extern.fullpath));
rarch_main_command(RARCH_CMD_LOAD_CORE);
rarch_main_command(RARCH_CMD_LOAD_CONTENT);
}
else
[weakSelf chooseCoreWithPath:item.path];
@ -713,10 +717,14 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
const char *core_name = NULL;
content_playlist_get_index(weakSelf.history, i, &path, &core_path, &core_name);
/* TODO - reimplement this - should no longer use apple_run_core. */
apple_run_core(0, NULL, core_path ? core_path : "",
path ? path : "");
if (!path || !core_path)
return;
strlcpy(g_settings.libretro, core_path, sizeof(g_settings.libretro));
strlcpy(g_extern.fullpath, path, sizeof(g_extern.fullpath));
rarch_main_command(RARCH_CMD_LOAD_CORE);
rarch_main_command(RARCH_CMD_LOAD_CONTENT);
}
detail:
^{