mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 18:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Style nits

Browse Source
This commit is contained in:
Twinaphex 2015-04-13 16:00:56 +02:00
parent 90399c6ca7
commit 13c922250d
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
apple/common/apple_cocoa_common.m
View File

@ -87,9 +87,9 @@ void CFSearchPathForDirectoriesInDomains(unsigned flags,
CFTypeRef array_val = (CFTypeRef)CFBridgingRetainCompat( CFTypeRef array_val = (CFTypeRef)CFBridgingRetainCompat(
NSSearchPathForDirectoriesInDomains(NSConvertFlagsCF(flags), NSSearchPathForDirectoriesInDomains(NSConvertFlagsCF(flags),
NSConvertDomainFlagsCF(domain_mask), (BOOL)expand_tilde)); NSConvertDomainFlagsCF(domain_mask), (BOOL)expand_tilde));
CFArrayRef array = array_val ? CFRetain(array_val) : NULL; CFArrayRef array = array_val ? CFRetain(array_val) : NULL;
CFTypeRef path_val = (CFTypeRef)CFArrayGetValueAtIndex(array, 0); CFTypeRef path_val = (CFTypeRef)CFArrayGetValueAtIndex(array, 0);
CFStringRef path = path_val ? CFRetain(path_val) : NULL; CFStringRef path = path_val ? CFRetain(path_val) : NULL;
if (!path || !array) if (!path || !array)
return; return;
@ -268,10 +268,10 @@ void *glkitview_init(void);
{ {
UIInterfaceOrientation orientation = self.interfaceOrientation; UIInterfaceOrientation orientation = self.interfaceOrientation;
CGRect screenSize = [[UIScreen mainScreen] bounds]; CGRect screenSize = [[UIScreen mainScreen] bounds];
float width = ((int)orientation < 3) ? CGRectGetWidth(screenSize) : CGRectGetHeight(screenSize); float width = ((int)orientation < 3) ? CGRectGetWidth(screenSize) : CGRectGetHeight(screenSize);
float height = ((int)orientation < 3) ? CGRectGetHeight(screenSize) : CGRectGetWidth(screenSize); float height = ((int)orientation < 3) ? CGRectGetHeight(screenSize) : CGRectGetWidth(screenSize);
float tenpctw = width / 10.0f; float tenpctw = width / 10.0f;
float tenpcth = height / 10.0f; float tenpcth = height / 10.0f;
g_pause_indicator_view.frame = CGRectMake(tenpctw * 4.0f, 0.0f, tenpctw * 2.0f, tenpcth); g_pause_indicator_view.frame = CGRectMake(tenpctw * 4.0f, 0.0f, tenpctw * 2.0f, tenpcth);
[g_pause_indicator_view viewWithTag:1].frame = CGRectMake(0, 0, tenpctw * 2.0f, tenpcth); [g_pause_indicator_view viewWithTag:1].frame = CGRectMake(0, 0, tenpctw * 2.0f, tenpcth);
@ -443,6 +443,7 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
/* Add the device to the session. */ /* Add the device to the session. */
input = (AVCaptureDeviceInput*)[AVCaptureDeviceInput deviceInputWithDevice:videoDevice error:&error]; input = (AVCaptureDeviceInput*)[AVCaptureDeviceInput deviceInputWithDevice:videoDevice error:&error];
if (error) if (error)
{ {
RARCH_ERR("video device input %s\n", error.localizedDescription.UTF8String); RARCH_ERR("video device input %s\n", error.localizedDescription.UTF8String);
@ -503,23 +504,23 @@ static CLLocationAccuracy currentVerticalAccuracy;
- (void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLocation *)newLocation fromLocation:(CLLocation *)oldLocation - (void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLocation *)newLocation fromLocation:(CLLocation *)oldLocation
{ {
locationChanged = true; locationChanged = true;
currentLatitude = newLocation.coordinate.latitude; currentLatitude = newLocation.coordinate.latitude;
currentLongitude = newLocation.coordinate.longitude; currentLongitude = newLocation.coordinate.longitude;
currentHorizontalAccuracy = newLocation.horizontalAccuracy; currentHorizontalAccuracy = newLocation.horizontalAccuracy;
currentVerticalAccuracy = newLocation.verticalAccuracy; currentVerticalAccuracy = newLocation.verticalAccuracy;
RARCH_LOG("didUpdateToLocation - latitude %f, longitude %f\n", (float)currentLatitude, (float)currentLongitude); RARCH_LOG("didUpdateToLocation - latitude %f, longitude %f\n", (float)currentLatitude, (float)currentLongitude);
} }
- (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations - (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations
{ {
CLLocation *location = (CLLocation*)[locations objectAtIndex:([locations count] - 1)]; CLLocation *location = (CLLocation*)[locations objectAtIndex:([locations count] - 1)];
locationChanged = true; locationChanged = true;
currentLatitude = [location coordinate].latitude; currentLatitude = [location coordinate].latitude;
currentLongitude = [location coordinate].longitude; currentLongitude = [location coordinate].longitude;
currentHorizontalAccuracy = location.horizontalAccuracy; currentHorizontalAccuracy = location.horizontalAccuracy;
currentVerticalAccuracy = location.verticalAccuracy; currentVerticalAccuracy = location.verticalAccuracy;
RARCH_LOG("didUpdateLocations - latitude %f, longitude %f\n", (float)currentLatitude, (float)currentLongitude); RARCH_LOG("didUpdateLocations - latitude %f, longitude %f\n", (float)currentLatitude, (float)currentLongitude);
} }
@ -545,10 +546,10 @@ static CLLocationAccuracy currentVerticalAccuracy;
*/ */
if (locationManager == nil) if (locationManager == nil)
locationManager = [[CLLocationManager alloc] init]; locationManager = [[CLLocationManager alloc] init];
locationManager.delegate = self; locationManager.delegate = self;
locationManager.desiredAccuracy = kCLLocationAccuracyBest; locationManager.desiredAccuracy = kCLLocationAccuracyBest;
locationManager.distanceFilter = kCLDistanceFilterNone; locationManager.distanceFilter = kCLDistanceFilterNone;
[locationManager startUpdatingLocation]; [locationManager startUpdatingLocation];
} }
#endif #endif