TouchInstinct
/
CameraManager
313
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1 from davidortinau/master 

Swift syntax updates to resolve compile errors (6.1 6A1052d)
This commit is contained in:
Natalia 2014-10-30 10:36:23 +00:00
parent ebd0295a79 aeb9daab30
commit 420d74b51d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
camera/CameraManager.swift
View File

@ -111,7 +111,7 @@ class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
for device in devices {
let captureDevice = device as AVCaptureDevice
if (captureDevice.position == AVCaptureDevicePosition.Back) {
let avFlashMode = AVCaptureFlashMode.fromRaw(newflashMode.toRaw())
let avFlashMode = AVCaptureFlashMode(rawValue: newflashMode.rawValue)
if (captureDevice.isFlashModeSupported(avFlashMode!)) {
captureDevice.lockForConfiguration(nil)
captureDevice.flashMode = avFlashMode!
@ -237,7 +237,7 @@ class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
if NSFileManager.defaultManager().fileExistsAtPath(tempPath!) {
NSFileManager.defaultManager().removeItemAtPath(tempPath!, error: nil)
}
return NSURL(fileURLWithPath: tempPath!)
return NSURL(fileURLWithPath: tempPath!)!
}()
/// CameraManager singleton instance to use the camera.
@ -360,7 +360,7 @@ class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
}
}
}
imageCompletition(UIImage(data: imageData))
imageCompletition(UIImage(data: imageData)!)
}
})
}

2
camera/ViewController.swift
View File

@ -50,7 +50,7 @@ class ViewController: UIViewController {
@IBAction func changeFlashMode(sender: UIButton)
{
self.cameraManager.flashMode = CameraFlashMode.fromRaw((self.cameraManager.flashMode.toRaw()+1)%3)!
self.cameraManager.flashMode = CameraFlashMode(rawValue: (self.cameraManager.flashMode.rawValue+1)%3)!
switch (self.cameraManager.flashMode) {
case .Off:
sender.setTitle("Flash Off", forState: UIControlState.Normal)