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

Merge pull request #1045 from lioncash/warnings

Browse Source 
iOS: Kill off some more warnings.
This commit is contained in:
Twinaphex 2014-09-21 05:31:29 +02:00
commit 0dd4c17b93
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apple/iOS/platform.h
View File

@ -37,6 +37,9 @@ const void* apple_get_frontend_settings(void);
@interface RetroArch_iOS : UINavigationController<UIApplicationDelegate, UINavigationControllerDelegate, RetroArch_Platform>
@property (nonatomic) UIWindow* window;
@property (nonatomic) NSString* documentsDirectory; // e.g. /var/mobile/Documents
+ (RetroArch_iOS*)get;
- (void)showGameView;
@ -45,9 +48,6 @@ const void* apple_get_frontend_settings(void);
- (void)unloadingCore;
- (void)refreshSystemConfig;
@property (nonatomic) NSString* documentsDirectory; // e.g. /var/mobile/Documents
@end
// modes are: keyboard, icade and btstack

14
apple/iOS/platform.m
View File

@ -73,7 +73,7 @@ const void* apple_get_frontend_settings(void)
// Input helpers: This is kept here because it needs objective-c
static void handle_touch_event(NSArray* touches)
{
int i;
NSUInteger i;
const float scale = [[UIScreen mainScreen] scale];
g_current_input_data.touch_count = 0;
@ -165,10 +165,6 @@ static void handle_touch_event(NSArray* touches)
@end
@implementation RetroArch_iOS
{
UIWindow* _window;
NSString* _path;
}
+ (RetroArch_iOS*)get
{
@ -185,9 +181,9 @@ static void handle_touch_event(NSArray* touches)
[self setDelegate:self];
// Setup window
_window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
[self showPauseMenu:self];
[_window makeKeyAndVisible];
[self.window makeKeyAndVisible];
// Build system paths and test permissions
self.documentsDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
@ -278,7 +274,7 @@ static void handle_touch_event(NSArray* touches)
[self setToolbarHidden:true animated:NO];
[[UIApplication sharedApplication] setStatusBarHidden:true withAnimation:UIStatusBarAnimationNone];
[[UIApplication sharedApplication] setIdleTimerDisabled:true];
[_window setRootViewController:[RAGameView get]];
[self.window setRootViewController:[RAGameView get]];
g_extern.is_paused = false;
}
@ -287,7 +283,7 @@ static void handle_touch_event(NSArray* touches)
g_extern.is_paused = true;
[[UIApplication sharedApplication] setStatusBarHidden:false withAnimation:UIStatusBarAnimationNone];
[[UIApplication sharedApplication] setIdleTimerDisabled:false];
[_window setRootViewController:self];
[self.window setRootViewController:self];
}
- (void)loadingCore:(NSString*)core withFile:(const char*)file