Merge pull request #3 from indevizible/master

Auto-detect video orientation
nenosinc · Feb 19, 2014 · ccd3662 · ccd3662
2 parents fb02145 + ecf576d
commit ccd3662
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/RMScannerView.h b/RMScannerView.h
@@ -85,9 +85,6 @@ NS_CLASS_AVAILABLE_IOS(7_0) @interface RMScannerView : UIView <AVCaptureMetadata
  @param flashMode The AVCaptureFlashMode which specifies the flash mode, ON, OFF, or AUTO. */
 - (void)setDeviceFlash:(AVCaptureFlashMode)flashMode;
 
-// Rotate Camera when device will rotate ,call this from -(void)willRotateToInterfaceOrientation:duration:
--(void)setScannerViewOrientation:(UIInterfaceOrientation)toInterfaceOrientation;
-
 @end
 
 @class RMScannerView;

diff --git a/RMScannerView.m b/RMScannerView.m
@@ -34,6 +34,12 @@ @implementation RMScannerView
 
 - (void)initialize {
     self.captureSession = [[AVCaptureSession alloc] init];
+    [[NSNotificationCenter defaultCenter]
+     addObserver:self
+     selector:@selector(setScannerViewOrientation:)
+     name:UIDeviceOrientationDidChangeNotification
+     object:nil];
+
 }
 
 - (id)initWithCoder:(NSCoder *)aDecoder {
@@ -76,6 +82,12 @@ - (void)dealloc {
     metadataOutput = nil;
     videoInput = nil;
     previewLayer = nil;
+
+    // Remove orient observer
+    [[NSNotificationCenter defaultCenter]
+     removeObserver:self
+     name:UIDeviceOrientationDidChangeNotification
+     object:nil];
 }
 
 #pragma mark - Scanner Checks
@@ -249,9 +261,7 @@ - (void)setupPreviewLayer {
     previewLayer.frame = self.layer.bounds;
     previewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
     previewLayer.position = CGPointMake(CGRectGetMidX(self.layer.bounds), CGRectGetMidY(self.layer.bounds));
-    if ([self.delegate respondsToSelector:@selector(interfaceOrientation)]) {
-        [[previewLayer connection] setVideoOrientation:((AVCaptureVideoOrientation)[(UIViewController *)self.delegate interfaceOrientation])];
-    }
+    [[previewLayer connection] setVideoOrientation:((AVCaptureVideoOrientation)[[UIDevice currentDevice] orientation])];
     if ([self.layer.sublayers containsObject:previewLayer] == NO) [self.layer addSublayer:previewLayer];
 }
 
@@ -441,10 +451,10 @@ - (NSArray *)translatePoints:(NSArray *)points fromView:(UIView *)fromView toVie
     return [translatedPoints copy];
 }
 
--(void)setScannerViewOrientation:(UIInterfaceOrientation)toInterfaceOrientation
+-(void)setScannerViewOrientation:(UIDeviceOrientation)toDeviceOrientation
 {
     if (previewLayer) {
-        [[previewLayer connection] setVideoOrientation:(AVCaptureVideoOrientation)toInterfaceOrientation];
+        [[previewLayer connection] setVideoOrientation:(AVCaptureVideoOrientation)[[UIDevice currentDevice] orientation]];
     }
 }
 

diff --git a/Scanner App/Scanner App/ViewController.m b/Scanner App/Scanner App/ViewController.m
@@ -88,9 +88,4 @@ - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)butto
 - (UIBarPosition)positionForBar:(id <UIBarPositioning>)bar {
     return UIBarPositionTopAttached;
 }
-
--(void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
-{
-    [scannerView setScannerViewOrientation:toInterfaceOrientation];
-}
 @end