mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Apple) Cleanups to RAGAmeView.m

Browse Source
This commit is contained in:
twinaphex 2014-07-09 13:15:36 +02:00
parent a22807cb60
commit 0551e95ebe
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
apple/common/RAGameView.m
View File

@ -17,17 +17,6 @@
#import "RetroArch_Apple.h" #import "RetroArch_Apple.h"
#include "../../general.h" #include "../../general.h"
#ifdef HAVE_LOCATION
#include <CoreLocation/CoreLocation.h>
static CLLocationManager *locationManager;
static bool locationChanged;
static CLLocationDegrees currentLatitude;
static CLLocationDegrees currentLongitude;
static CLLocationAccuracy currentHorizontalAccuracy;
static CLLocationAccuracy currentVerticalAccuracy;
#endif
// Define compatibility symbols and categories // Define compatibility symbols and categories
#ifdef IOS #ifdef IOS
@ -83,18 +72,8 @@ static CLLocationAccuracy currentVerticalAccuracy;
static GLKView *g_view; static GLKView *g_view;
static UIView *g_pause_indicator_view; static UIView *g_pause_indicator_view;
#ifdef HAVE_CAMERA
static AVCaptureSession *_session;
static NSString *_sessionPreset;
CVOpenGLESTextureCacheRef textureCache;
GLuint outputTexture;
static bool newFrame = false;
#endif
#elif defined(OSX) #elif defined(OSX)
#include "../../input/apple_input.h"
static bool g_has_went_fullscreen; static bool g_has_went_fullscreen;
static NSOpenGLPixelFormat* g_format; static NSOpenGLPixelFormat* g_format;
@ -237,6 +216,13 @@ static bool g_is_syncing = true;
} }
#ifdef HAVE_CAMERA #ifdef HAVE_CAMERA
static AVCaptureSession *_session;
static NSString *_sessionPreset;
CVOpenGLESTextureCacheRef textureCache;
GLuint outputTexture;
static bool newFrame = false;
void event_process_camera_frame(void* pixelBufferPtr) void event_process_camera_frame(void* pixelBufferPtr)
{ {
CVPixelBufferRef pixelBuffer = (CVPixelBufferRef)pixelBufferPtr; CVPixelBufferRef pixelBuffer = (CVPixelBufferRef)pixelBufferPtr;
@ -369,6 +355,15 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
#endif #endif
#ifdef HAVE_LOCATION #ifdef HAVE_LOCATION
#include <CoreLocation/CoreLocation.h>
static CLLocationManager *locationManager;
static bool locationChanged;
static CLLocationDegrees currentLatitude;
static CLLocationDegrees currentLongitude;
static CLLocationAccuracy currentHorizontalAccuracy;
static CLLocationAccuracy currentVerticalAccuracy;
- (bool)onLocationHasChanged - (bool)onLocationHasChanged
{ {
bool hasChanged = locationChanged; bool hasChanged = locationChanged;
@ -392,6 +387,7 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
- (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations - (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations
{ {
CLLocation *location; CLLocation *location;
locationChanged = true; locationChanged = true;
location = (CLLocation*)[locations objectAtIndex:([locations count] - 1)]; location = (CLLocation*)[locations objectAtIndex:([locations count] - 1)];
currentLatitude = [location coordinate].latitude; currentLatitude = [location coordinate].latitude;