AVClub 0.1.4 → 1.0.3

data/vendor/AVClub/{AVClub/AVClub.m → AVClub.m}

@@ -1,8 +1,8 @@
 //
 //  AVClub.m
-//  AVClub
+//  AVClub.  Based on the AVCam demo by Apple.
 //
-//  Created by Colin Thomas-Arnold on 11/16/12.
+//  Created by Colin T.A. Gray on 11/16/12.
 //  Copyright (c) 2012 colinta. All rights reserved.
 //
 
@@ -21,8 +21,6 @@
 #pragma mark -
 @interface AVClub (InternalUtilityMethods)
 - (AVCaptureDevice *) cameraWithPosition:(AVCaptureDevicePosition)position;
-- (AVCaptureDevice *) frontFacingCamera;
-- (AVCaptureDevice *) backFacingCamera;
 - (AVCaptureDevice *) audioDevice;
 - (NSURL *) tempFileURL;
 - (void) removeFile:(NSURL *)outputFileURL;
@@ -46,7 +44,7 @@
 
         __block AVClub *weakSelf = self;
         void (^deviceConnectedBlock)(NSNotification *) = ^(NSNotification *notification) {
-            AVCaptureDevice *device = [notification object];
+            AVCaptureDevice *device = notification.object;
 
             BOOL sessionHasDeviceWithMatchingMediaType = NO;
             NSString *deviceMediaType = nil;
@@ -59,7 +57,7 @@
             {
                 for (AVCaptureDeviceInput *input in [self.session inputs])
                 {
-                    if ( [[input device] hasMediaType:deviceMediaType] )
+                    if ( [input.device hasMediaType:deviceMediaType] )
                     {
                         sessionHasDeviceWithMatchingMediaType = YES;
                         break;
@@ -79,14 +77,14 @@
                 CFRunLoopPerformBlock(CFRunLoopGetMain(), kCFRunLoopCommonModes, ^{ [delegate clubDeviceConfigurationChanged:self]; });
         };
         void (^deviceDisconnectedBlock)(NSNotification *) = ^(NSNotification *notification) {
-            AVCaptureDevice *device = [notification object];
+            AVCaptureDevice *device = notification.object;
 
             if ( [device hasMediaType:AVMediaTypeAudio] ) {
-                [session removeInput:[weakSelf audioInput]];
+                [session removeInput:weakSelf.audioInput];
                 weakSelf.audioInput = nil;
             }
             else if ( [device hasMediaType:AVMediaTypeVideo] ) {
-                [session removeInput:[weakSelf videoInput]];
+                [session removeInput:weakSelf.videoInput];
                 weakSelf.videoInput = nil;
             }
 
@@ -95,8 +93,8 @@
         };
 
         NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
-        [self setDeviceConnectedObserver:[notificationCenter addObserverForName:AVCaptureDeviceWasConnectedNotification object:nil queue:nil usingBlock:deviceConnectedBlock]];
-        [self setDeviceDisconnectedObserver:[notificationCenter addObserverForName:AVCaptureDeviceWasDisconnectedNotification object:nil queue:nil usingBlock:deviceDisconnectedBlock]];
+        self.deviceConnectedObserver = [notificationCenter addObserverForName:AVCaptureDeviceWasConnectedNotification object:nil queue:nil usingBlock:deviceConnectedBlock];
+        self.deviceDisconnectedObserver = [notificationCenter addObserverForName:AVCaptureDeviceWasDisconnectedNotification object:nil queue:nil usingBlock:deviceDisconnectedBlock];
         [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
         [notificationCenter addObserver:self selector:@selector(deviceOrientationDidChange) name:UIDeviceOrientationDidChangeNotification object:nil];
         self.orientation = AVCaptureVideoOrientationPortrait;
@@ -108,8 +106,8 @@
 - (void) dealloc
 {
     NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
-    [notificationCenter removeObserver:[self deviceConnectedObserver]];
-    [notificationCenter removeObserver:[self deviceDisconnectedObserver]];
+    [notificationCenter removeObserver:self.deviceConnectedObserver];
+    [notificationCenter removeObserver:self.deviceDisconnectedObserver];
     [notificationCenter removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
     [[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
 
@@ -119,30 +117,31 @@
 - (void) startInView:(UIView*)videoView
 {
     // Set torch and flash mode to auto
-    if ( [[self backFacingCamera] hasFlash] )
+    if ( self.backFacingCamera.hasFlash )
     {
-        if ( [[self backFacingCamera] lockForConfiguration:nil] )
+        if ( [self.backFacingCamera lockForConfiguration:nil] )
         {
-            if ( [[self backFacingCamera] isFlashModeSupported:AVCaptureFlashModeAuto] )
-                [[self backFacingCamera] setFlashMode:AVCaptureFlashModeAuto];
+            if ( [self.backFacingCamera isFlashModeSupported:AVCaptureFlashModeAuto] )
+                self.backFacingCamera.flashMode = AVCaptureFlashModeAuto;
 
-            [[self backFacingCamera] unlockForConfiguration];
+            [self.backFacingCamera unlockForConfiguration];
         }
     }
-    if ( [[self backFacingCamera] hasTorch] )
+
+    if ( self.backFacingCamera.hasTorch )
     {
-        if ( [[self backFacingCamera] lockForConfiguration:nil] )
+        if ( [self.backFacingCamera lockForConfiguration:nil] )
         {
-            if ( [[self backFacingCamera] isTorchModeSupported:AVCaptureTorchModeAuto] )
-                [[self backFacingCamera] setTorchMode:AVCaptureTorchModeAuto];
+            if ( [self.backFacingCamera isTorchModeSupported:AVCaptureTorchModeAuto] )
+                self.backFacingCamera.torchMode = AVCaptureTorchModeAuto;
 
-            [[self backFacingCamera] unlockForConfiguration];
+            [self.backFacingCamera unlockForConfiguration];
         }
     }
 
     // Init the device inputs
-    AVCaptureDeviceInput *newVideoInput = [[AVCaptureDeviceInput alloc] initWithDevice:[self backFacingCamera] error:nil];
-    AVCaptureDeviceInput *newAudioInput = [[AVCaptureDeviceInput alloc] initWithDevice:[self audioDevice] error:nil];
+    AVCaptureDeviceInput *newVideoInput = [[AVCaptureDeviceInput alloc] initWithDevice:self.backFacingCamera error:nil];
+    AVCaptureDeviceInput *newAudioInput = [[AVCaptureDeviceInput alloc] initWithDevice:self.audioDevice error:nil];
 
 
     // Setup the still image file output
@@ -150,7 +149,7 @@
     NSDictionary *outputSettings = [[NSDictionary alloc] initWithObjectsAndKeys:
                                     AVVideoCodecJPEG, AVVideoCodecKey,
                                     nil];
-    [newStillImageOutput setOutputSettings:outputSettings];
+    newStillImageOutput.outputSettings = outputSettings;
 
 
     // Create session (use default AVCaptureSessionPresetHigh)
@@ -173,12 +172,12 @@
     self.session = newCaptureSession;
 
     // Set up the movie file output
-    NSURL *outputFileURL = [self tempFileURL];
-    AVCamRecorder *newRecorder = [[AVCamRecorder alloc] initWithSession:[self session] outputFileURL:outputFileURL];
-    [newRecorder setDelegate:self];
+    NSURL *outputFileURL = self.tempFileURL;
+    AVCamRecorder *newRecorder = [[AVCamRecorder alloc] initWithSession:self.session outputFileURL:outputFileURL];
+    newRecorder.delegate = self;
 
     // Send an error to the delegate if video recording is unavailable
-    if ( ! [newRecorder recordsVideo] && [newRecorder recordsAudio] )
+    if ( ! newRecorder.recordsVideo && newRecorder.recordsAudio )
     {
         NSString *localizedDescription = NSLocalizedString(@"Video recording unavailable", @"Video recording unavailable description");
         NSString *localizedFailureReason = NSLocalizedString(@"Movies recorded on this device will only contain audio. They will be accessible through iTunes file sharing.", @"Video recording unavailable failure reason");
@@ -196,19 +195,19 @@
     // Create video preview layer and add it to the UI
     if ( videoView )
     {
-        AVCaptureVideoPreviewLayer *newCaptureVideoPreviewLayer = [[AVCaptureVideoPreviewLayer alloc] initWithSession:[self session]];
-        CALayer *viewLayer = [videoView layer];
-        [viewLayer setMasksToBounds:YES];
+        AVCaptureVideoPreviewLayer *newCaptureVideoPreviewLayer = [[AVCaptureVideoPreviewLayer alloc] initWithSession:self.session];
+        CALayer *viewLayer = videoView.layer;
+        viewLayer.masksToBounds = YES;
 
-        CGRect bounds = [videoView bounds];
-        [newCaptureVideoPreviewLayer setFrame:bounds];
+        CGRect bounds = videoView.bounds;
+        newCaptureVideoPreviewLayer.frame = bounds;
 
-        if ( [[self recorder] isOrientationSupported] )
-            [[self recorder] setOrientation:AVCaptureVideoOrientationPortrait];
+        if ( self.recorder.isOrientationSupported )
+            self.recorder.orientation = AVCaptureVideoOrientationPortrait;
 
-        [newCaptureVideoPreviewLayer setVideoGravity:AVLayerVideoGravityResizeAspectFill];
+        newCaptureVideoPreviewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
 
-        [viewLayer insertSublayer:newCaptureVideoPreviewLayer below:[[viewLayer sublayers] objectAtIndex:0]];
+        [viewLayer insertSublayer:newCaptureVideoPreviewLayer below:[viewLayer.sublayers objectAtIndex:0]];
 
         self.captureVideoPreviewLayer = newCaptureVideoPreviewLayer;
 
@@ -225,7 +224,7 @@
 {
     if ( ! self.isRunning )
     {
-        [[self session] startRunning];
+        [self.session startRunning];
         self.isRunning = YES;
     }
 }
@@ -234,7 +233,7 @@
 {
     if ( self.isRunning )
     {
-        [[self session] stopRunning];
+        [self.session stopRunning];
         self.isRunning = NO;
     }
 }
@@ -247,16 +246,16 @@
         // to the foreground unless you request background execution time. This also ensures that there will be time to write the file to the assets library
         // when AVCam is backgrounded. To conclude this background execution, -endBackgroundTask is called in -recorder:recordingDidFinishToOutputFileURL:error:
         // after the recorded file has been saved.
-        [self setBackgroundRecordingID:[[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler:^{}]];
+        self.backgroundRecordingID = [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler:^{}];
     }
 
-    [self removeFile:[[self recorder] outputFileURL]];
-    [[self recorder] startRecordingWithOrientation:self.orientation];
+    [self removeFile:[self.recorder outputFileURL]];
+    [self.recorder startRecordingWithOrientation:self.orientation];
 }
 
 - (void) stopRecording
 {
-    [[self recorder] stopRecording];
+    [self.recorder stopRecording];
 }
 
 - (void) saveImageToLibrary:(UIImage*)image
@@ -268,8 +267,8 @@
             CFRunLoopPerformBlock(CFRunLoopGetMain(), kCFRunLoopCommonModes, ^{ [delegate club:self assetSavedToURL:assetURL error:error]; });
     };
 
-    [library writeImageToSavedPhotosAlbum:[image CGImage]
-                  orientation:(ALAssetOrientation)[image imageOrientation]
+    [library writeImageToSavedPhotosAlbum:image.CGImage
+                  orientation:(ALAssetOrientation)image.imageOrientation
                 completionBlock:completionBlock];
 }
 
@@ -279,23 +278,23 @@
 }
 - (void) captureStillImageAnimated:(BOOL)animated
 {
-    AVCaptureConnection *stillImageConnection = [AVCamUtilities connectionWithMediaType:AVMediaTypeVideo fromConnections:[[self stillImageOutput] connections]];
+    AVCaptureConnection *stillImageConnection = [AVCamUtilities connectionWithMediaType:AVMediaTypeVideo fromConnections:self.stillImageOutput.connections];
     if ( ! stillImageConnection )
         return;
 
     if ( [stillImageConnection isVideoOrientationSupported] )
-        [stillImageConnection setVideoOrientation:self.orientation];
+        stillImageConnection.videoOrientation = self.orientation;
 
     if ( animated )
     {
         // Flash the screen white and fade it out to give UI feedback that a still image was taken
-        UIView *flashView = [[UIView alloc] initWithFrame:[[[self viewFinderView] window] bounds]];
-        [flashView setBackgroundColor:[UIColor whiteColor]];
-        [[[self viewFinderView] window] addSubview:flashView];
+        UIView *flashView = [[UIView alloc] initWithFrame:self.viewFinderView.window.bounds];
+        flashView.backgroundColor = [UIColor whiteColor];
+        [self.viewFinderView.window addSubview:flashView];
 
         [UIView animateWithDuration:.4f
                          animations:^{
-                             [flashView setAlpha:0.f];
+                             flashView.alpha = 0.f;
                          }
                          completion:^(BOOL finished){
                              [flashView removeFromSuperview];
@@ -303,7 +302,7 @@
          ];
     }
 
-    [[self stillImageOutput] captureStillImageAsynchronouslyFromConnection:stillImageConnection
+    [self.stillImageOutput captureStillImageAsynchronouslyFromConnection:stillImageConnection
                                                          completionHandler:^(CMSampleBufferRef imageDataSampleBuffer, NSError *error) {
 
                                                              void (^completionBlock)(UIImage*,NSError*) = ^(UIImage *image, NSError *error) {
@@ -337,38 +336,44 @@
 {
     BOOL success = NO;
 
-    if ( [self cameraCount] > 1 )
+    if ( self.cameraCount > 1 )
     {
         NSError *error;
         AVCaptureDeviceInput *newVideoInput;
-        AVCaptureDevicePosition position = [[self.videoInput device] position];
+        AVCaptureDevicePosition position = [self currentCamera];
 
         if ( position == AVCaptureDevicePositionBack )
-            newVideoInput = [[AVCaptureDeviceInput alloc] initWithDevice:[self frontFacingCamera] error:&error];
+        {
+            newVideoInput = [[AVCaptureDeviceInput alloc] initWithDevice:self.frontFacingCamera error:&error];
+        }
         else if ( position == AVCaptureDevicePositionFront )
-            newVideoInput = [[AVCaptureDeviceInput alloc] initWithDevice:[self backFacingCamera] error:&error];
+        {
+            newVideoInput = [[AVCaptureDeviceInput alloc] initWithDevice:self.backFacingCamera error:&error];
+        }
         else
             goto bail;
 
-        if ( newVideoInput != nil )
+        if ( error )
+        {
+            if ( [delegate respondsToSelector:@selector(club:didFailWithError:)] )
+                CFRunLoopPerformBlock(CFRunLoopGetMain(), kCFRunLoopCommonModes, ^{ [delegate club:self didFailWithError:error]; });
+        }
+        else
         {
-            [[self session] beginConfiguration];
-            [[self session] removeInput:[self videoInput]];
-            if ( [[self session] canAddInput:newVideoInput] )
+            [self.session beginConfiguration];
+            [self.session removeInput:self.videoInput];
+            if ( [self.session canAddInput:newVideoInput] )
             {
-                [[self session] addInput:newVideoInput];
+                [self.session addInput:newVideoInput];
                 self.videoInput = newVideoInput;
             }
             else
-                [[self session] addInput:[self videoInput]];
-            [[self session] commitConfiguration];
+            {
+                [self.session addInput:self.videoInput];
+            }
+            [self.session commitConfiguration];
             success = YES;
         }
-        else if ( error )
-        {
-            if ( [delegate respondsToSelector:@selector(club:didFailWithError:)] )
-                CFRunLoopPerformBlock(CFRunLoopGetMain(), kCFRunLoopCommonModes, ^{ [delegate club:self didFailWithError:error]; });
-        }
     }
 
 bail:
@@ -389,19 +394,19 @@ bail:
 
 - (BOOL) hasCamera
 {
-    return [self cameraCount] > 0;
+    return self.cameraCount > 0;
 }
 - (BOOL) hasMultipleCameras
 {
-    return [self cameraCount] > 1;
+    return self.cameraCount > 1;
 }
 - (BOOL) hasAudio
 {
-    return [self micCount] > 0;
+    return self.micCount > 0;
 }
 - (BOOL) hasVideo
 {
-    return [self hasCamera] && [self hasAudio];
+    return self.hasCamera && self.hasAudio;
 }
 
 
@@ -409,13 +414,13 @@ bail:
 // Perform an auto focus at the specified point. The focus mode will automatically change to locked once the auto focus is complete.
 - (void) autoFocusAtPoint:(CGPoint)point
 {
-    AVCaptureDevice *device = [[self videoInput] device];
-    if ([device isFocusPointOfInterestSupported] && [device isFocusModeSupported:AVCaptureFocusModeAutoFocus]) {
+    AVCaptureDevice *device = self.videoInput.device;
+    if ( device.isFocusPointOfInterestSupported && [device isFocusModeSupported:AVCaptureFocusModeAutoFocus] ) {
         NSError *error;
         if ( [device lockForConfiguration:&error] )
         {
-            [device setFocusPointOfInterest:point];
-            [device setFocusMode:AVCaptureFocusModeAutoFocus];
+            device.focusPointOfInterest = point;
+            device.focusMode = AVCaptureFocusModeAutoFocus;
             [device unlockForConfiguration];
         }
         else
@@ -429,15 +434,15 @@ bail:
 // Switch to continuous auto focus mode at the specified point
 - (void) continuousFocusAtPoint:(CGPoint)point
 {
-    AVCaptureDevice *device = [[self videoInput] device];
+    AVCaptureDevice *device = self.videoInput.device;
 
-    if ( [device isFocusPointOfInterestSupported] && [device isFocusModeSupported:AVCaptureFocusModeContinuousAutoFocus] )
+    if ( device.isFocusPointOfInterestSupported && [device isFocusModeSupported:AVCaptureFocusModeContinuousAutoFocus] )
     {
         NSError *error;
         if ( [device lockForConfiguration:&error] )
         {
-            [device setFocusPointOfInterest:point];
-            [device setFocusMode:AVCaptureFocusModeContinuousAutoFocus];
+            device.focusPointOfInterest = point;
+            device.focusMode = AVCaptureFocusModeContinuousAutoFocus;
             [device unlockForConfiguration];
         }
         else
@@ -453,9 +458,9 @@ bail:
 - (CGPoint)convertToPointOfInterestFromViewCoordinates:(CGPoint)viewCoordinates
 {
     CGPoint pointOfInterest = CGPointMake(.5f, .5f);
-    CGSize frameSize = [[self viewFinderView] frame].size;
+    CGSize frameSize = self.viewFinderView.frame.size;
 
-    if ( [[self recorder] isMirrored] )
+    if ( self.recorder.isMirrored )
         viewCoordinates.x = frameSize.width - viewCoordinates.x;
 
     if ( [[self.captureVideoPreviewLayer videoGravity] isEqualToString:AVLayerVideoGravityResize] )
@@ -466,11 +471,11 @@ bail:
     else
     {
         CGRect cleanAperture;
-        for (AVCaptureInputPort *port in [[self videoInput] ports])
+        for (AVCaptureInputPort *port in self.videoInput.ports)
         {
-            if ( [port mediaType] == AVMediaTypeVideo )
+            if ( port.mediaType == AVMediaTypeVideo )
             {
-                cleanAperture = CMVideoFormatDescriptionGetCleanAperture([port formatDescription], YES);
+                cleanAperture = CMVideoFormatDescriptionGetCleanAperture(port.formatDescription, YES);
                 CGSize apertureSize = cleanAperture.size;
                 CGPoint point = viewCoordinates;
 
@@ -565,7 +570,7 @@ bail:
     NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
     for (AVCaptureDevice *device in devices)
     {
-        if ( [device position] == position )
+        if ( device.position == position )
             return device;
     }
     return nil;
@@ -583,11 +588,16 @@ bail:
     return [self cameraWithPosition:AVCaptureDevicePositionBack];
 }
 
+- (AVCaptureDevicePosition) currentCamera
+{
+    return [[self.videoInput device] position];
+}
+
 // Find and return an audio device, returning nil if one is not found
 - (AVCaptureDevice *) audioDevice
 {
     NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
-    if ( [devices count] > 0 )
+    if ( devices.count > 0 )
         return [devices objectAtIndex:0];
     return nil;
 }
@@ -599,7 +609,7 @@ bail:
 
 - (void) removeFile:(NSURL *)fileURL
 {
-    NSString *filePath = [fileURL path];
+    NSString *filePath = fileURL.path;
     NSFileManager *fileManager = [NSFileManager defaultManager];
     if ( [fileManager fileExistsAtPath:filePath] )
     {
@@ -616,7 +626,7 @@ bail:
 {
     NSString *documentsDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0];
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-    [dateFormatter setDateFormat:@"yyyy-MM-dd_HH-mm-ss"];
+    dateFormatter.dateFormat = @"yyyy-MM-dd_HH-mm-ss";
     NSString *destinationPath = [documentsDirectory stringByAppendingFormat:@"/output_%@.mov", [dateFormatter stringFromDate:[NSDate date]]];
     NSError    *error;
     if ( ! [[NSFileManager defaultManager] copyItemAtURL:fileURL toURL:[NSURL fileURLWithPath:destinationPath] error:&error] )
@@ -640,7 +650,7 @@ bail:
 
 -(void)recorder:(AVCamRecorder *)recorder recordingDidFinishToOutputFileURL:(NSURL *)outputFileURL error:(NSError *)error
 {
-    if ( [[self recorder] recordsAudio] && ![[self recorder] recordsVideo] )
+    if ( self.recorder.recordsAudio && ! self.recorder.recordsVideo )
     {
         // If the file was created on a device that doesn't support video recording, it can't be saved to the assets
         // library. Instead, save it in the app's Documents directory, whence it can be copied from the device via
@@ -648,7 +658,7 @@ bail:
         [self copyFileToDocuments:outputFileURL];
 
         if ( [[UIDevice currentDevice] isMultitaskingSupported] )
-            [[UIApplication sharedApplication] endBackgroundTask:[self backgroundRecordingID]];
+            [[UIApplication sharedApplication] endBackgroundTask:self.backgroundRecordingID];
 
         if ( [delegate respondsToSelector:@selector(clubRecordingFinished:)] )
             CFRunLoopPerformBlock(CFRunLoopGetMain(), kCFRunLoopCommonModes, ^{ [delegate clubRecordingFinished:self]; });
@@ -665,7 +675,7 @@ bail:
                                         }
 
                                         if ( [[UIDevice currentDevice] isMultitaskingSupported] )
-                                            [[UIApplication sharedApplication] endBackgroundTask:[self backgroundRecordingID]];
+                                            [[UIApplication sharedApplication] endBackgroundTask:self.backgroundRecordingID];
 
                                         if ( [delegate respondsToSelector:@selector(clubRecordingFinished:)] )
                                             CFRunLoopPerformBlock(CFRunLoopGetMain(), kCFRunLoopCommonModes, ^{ [delegate clubRecordingFinished:self]; });