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

Merge pull request #26 from aukaost/master 

allow disabling of handling device orientation changes
This commit is contained in:
Natalia 2015-12-11 11:26:28 +00:00
parent bf9add31dd 48c92640c5
commit 334ce5b7a5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
camera/CameraManager.swift
View File

@ -57,6 +57,8 @@ public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
/// Property to determine if manager should write the resources to the phone library. Default value is true.
public var writeFilesToPhoneLibrary = true
public var shouldRespondToOrientationChanges = true
/// The Bool property to determine if current device has front camera.
public var hasFrontCamera: Bool = {
@ -186,11 +188,11 @@ public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
}
}
if cameraIsSetup {
_addPreeviewLayerToView(view)
_addPreviewLayerToView(view)
cameraOutputMode = newCameraOutputMode
} else {
_setupCamera({ Void -> Void in
self._addPreeviewLayerToView(view)
self._addPreviewLayerToView(view)
self.cameraOutputMode = newCameraOutputMode
})
}
@ -245,7 +247,7 @@ public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
}
_setupCamera({Void -> Void in
if let validEmbedingView = self.embedingView {
self._addPreeviewLayerToView(validEmbedingView)
self._addPreviewLayerToView(validEmbedingView)
}
self._startFollowingDeviceOrientation()
})
@ -533,7 +535,7 @@ public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
}
private func _startFollowingDeviceOrientation() {
if !cameraIsObservingDeviceOrientation {
if shouldRespondToOrientationChanges && !cameraIsObservingDeviceOrientation {
NSNotificationCenter.defaultCenter().addObserver(self, selector: "_orientationChanged", name: UIDeviceOrientationDidChangeNotification, object: nil)
cameraIsObservingDeviceOrientation = true
}
@ -546,7 +548,7 @@ public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
}
}
private func _addPreeviewLayerToView(view: UIView) {
private func _addPreviewLayerToView(view: UIView) {
embedingView = view
dispatch_async(dispatch_get_main_queue(), { () -> Void in
guard let _ = self.previewLayer else {