AVClub 0.1.4 → 1.0.3

data/README.md

@@ -12,9 +12,9 @@ I just moved more code into the Manager class, and renamed "AVCamManager" to
 "AVClub", since that's the central "wrapper" class.
 
 This tool - and AVFoundation in general - is much more low level than the
-UIImagePickerController (see Camera Programming Topics for iOS).  If you're
-looking for an easy off-the-shelf solution, use BW::Camera or an instance of
-UIImagePickerController.
+`UIImagePickerController` (see Camera Programming Topics for iOS).  If you're
+looking for an easy off-the-shelf solution, use `BubbleWrap::Camera` or an
+instance of `UIImagePickerController`.
 
 Working with AVFoundation is like holding a dozen loose wires, plugging them all
 into each other, and hoping that a photo or video comes out the end.  If it goes
@@ -23,14 +23,14 @@ wrong, lemme know.
 
 The basic process is this:
 
-Create a view for where you want the camera to appear.  Or don't, it's optional.
- If you want to take a picture using the front camera with no preview, you can
- do it!  (creepy! :-P)
+Create a view-finder, for where you want the preview image to appear.  Or don't,
+it's optional.
 
 1. Create a "club" - `AVClub.new`.
 2. Assign your controller as the delegate - `club.delegate = self`.
-3. and when you're ready - `startInView(viewfinder_view)`.  You can start and
-   stop the session by calling `club.stopSession`
+3. When you're ready, pass the view-finder to AVClub:
+   `club.startInView(viewfinder_view)`.  You can start and stop the session by
+   calling `club.stopSession ; club.startSession`
 
 ```ruby
 def viewDidLoad
@@ -41,16 +41,35 @@ def viewDidLoad
 end
 ```
 
-
-For convenience, there is an included `AVClubController` class that adds two
-methods you can use or refer to:
+You might have noticed that AVClub uses `camelCased` method names, rather than
+the more rubyesque `snake_case`.  This is to distinguish it as an *Objective-C*
+class.  *However*, for convenience, there is an included `AVClubController`
+class that is a *Ruby* class, and so uses `snake_case`. It adds two methods you
+can use or refer to: `start_in_view(viewfinder)` (it just passes it on to the
+`AVClub` object, `@club`) and `rotate_camera_to(orientation:duration:)`.
 
 ```ruby
 # this method creates the club, assigns it to self.club, and assigns the
 # viewFinderView that you pass to self.viewFinderView
-def startInView(view)
+def viewWillAppear(animated)
+  self.start_in_view(view)
+end
+
+# you have to tell AVClub to rotate the image using rotate_camera_to()
+def willRotateToInterfaceOrientation(to_interface_orientation, duration:duration)
+  # you'll need to adjust the frame yourself!
 
-# call this in willRotateToInterfaceOrientation(toInterfaceOrientation,
-# duration:duration) and pass the new camera frame
-def rotateCameraTo(new_frame, orientation:toInterfaceOrientation, duration:duration)
+  case to_interface_orientation
+  when UIInterfaceOrientationLandscapeLeft
+    new_frame = CGRect.new([0, 0], [480, 320])
+  when UIInterfaceOrientationLandscapeRight
+    new_frame = CGRect.new([0, 0], [480, 320])
+  when UIInterfaceOrientationPortrait
+    new_frame = CGRect.new([0, 0], [320, 480])
+  when UIInterfaceOrientationPortraitUpsideDown
+    new_frame = CGRect.new([0, 0], [320, 480])
+  end
+
+  rotate_camera_to(new_frame, orientation: to_interface_orientation, duration:duration)
+end
 ```

data/Rakefile

@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
 $:.unshift("/Library/RubyMotion/lib")
 require 'motion/project'
+if File.exists?(File.expand_path('~/.rubymotion.rb'))
+  require '~/.rubymotion.rb'
+end
 
 
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'AVClub-Demo'
   app.files.insert(0, 'lib/AVClub/AVClubController.rb')
-  # app.files_dependencies 'app/camera_controller.rb' => 'lib/AVClub/AVClubController.rb'
 
-  app.vendor_project('vendor/AVClub', :xcode)
-  # app.detect_dependencies = false
+  app.vendor_project('vendor/AVClub', :static, cflags: '-fobjc-arc')
   app.frameworks.concat [
     'MediaPlayer',
     'QuartzCore',

data/app/camera_controller.rb

@@ -1,18 +1,17 @@
 class CameraController < AVClubController
-  attr_accessor :record_button, :still_button, :toggle_button;
+  attr_accessor :record_button, :still_button, :toggle_button
 
   def viewDidLoad
     super
     self.view.backgroundColor = UIColor.darkGrayColor
 
-    self.viewFinderView = UIView.alloc.initWithFrame(UIEdgeInsetsInsetRect(self.view.bounds, [50, 20, 20, 20]))
-    self.viewFinderView.autoresizingMask = UIViewAutoresizingFlexibleHeight |
-                                             UIViewAutoresizingFlexibleWidth
-    self.viewFinderView.backgroundColor = UIColor.lightGrayColor
-    self.view.addSubview(self.viewFinderView)
+    view_finder = UIView.alloc.initWithFrame(UIEdgeInsetsInsetRect(self.view.bounds, [50, 20, 20, 20]))
+    view_finder.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth
+    view_finder.backgroundColor = UIColor.lightGrayColor
+    self.view.addSubview(view_finder)
 
     ### important ###
-    startInView(self.viewFinderView)
+    start_in_view(view_finder)
 
     width = 0
     height = 0
@@ -22,7 +21,7 @@ class CameraController < AVClubController
       width += CGRectGetWidth(button.frame)
       height = CGRectGetHeight(button.frame)
 
-      button.addTarget(self, action: 'toggleCamera:', forControlEvents:UIControlEventTouchUpInside)
+      button.addTarget(self, action: 'toggle_camera:', forControlEvents:UIControlEventTouchUpInside)
     end
     width += 10
 
@@ -31,7 +30,7 @@ class CameraController < AVClubController
       button.sizeToFit
       width += CGRectGetWidth(button.frame)
 
-      button.addTarget(self, action: 'toggleRecording:', forControlEvents:UIControlEventTouchUpInside)
+      button.addTarget(self, action: 'toggle_recording:', forControlEvents:UIControlEventTouchUpInside)
     end
     width += 10
 
@@ -40,7 +39,7 @@ class CameraController < AVClubController
       button.sizeToFit
       width += CGRectGetWidth(button.frame)
 
-      button.addTarget(self, action: 'captureStillImage:', forControlEvents:UIControlEventTouchUpInside)
+      button.addTarget(self, action: 'capture_still_image:', forControlEvents:UIControlEventTouchUpInside)
     end
 
     left = (CGRectGetWidth(self.view.frame) - width) / 2.0
@@ -69,27 +68,26 @@ class CameraController < AVClubController
     self.update_button_states
 
     # Add a single tap gesture to focus on the point tapped, then lock focus
-    singleTap = UITapGestureRecognizer.alloc.initWithTarget(self, action:'tapToAutoFocus:')
+    singleTap = UITapGestureRecognizer.alloc.initWithTarget(self, action:'tap_to_auto_focus:')
     singleTap.setDelegate(self)
     singleTap.setNumberOfTapsRequired(1)
-    self.viewFinderView.addGestureRecognizer(singleTap)
+    view_finder.addGestureRecognizer(singleTap)
   end
 
-  # Auto focus at a particular point. The focus mode will change to locked once
-  # the auto focus happens.
-  def tapToAutoFocus(gestureRecognizer)
+  # Auto focus at a particular point. The focus mode will remain locked.
+  def tap_to_auto_focus(gesture_recognizer)
     return unless club.videoInput
 
     if club.videoInput.device.isFocusPointOfInterestSupported
-      tapPoint = gestureRecognizer.locationInView(viewFinderView)
+      tapPoint = gesture_recognizer.locationInView(gesture_recognizer.view)
       convertedFocusPoint = club.convertToPointOfInterestFromViewCoordinates(tapPoint)
       club.autoFocusAtPoint(convertedFocusPoint)
     end
   end
 
-  # Change to continuous auto focus. The camera will constantly focus at the
-  # point choosen.
-  def tapToContinouslyAutoFocus(gestureRecognizer)
+  # Change to continuous auto focus. The camera will focus at the point choosen,
+  # and then continue to auto focus.
+  def tapToContinouslyAutoFocus(gesture_recognizer)
     return unless club.videoInput
 
     if club.videoInput.device.isFocusPointOfInterestSupported
@@ -97,7 +95,7 @@ class CameraController < AVClubController
     end
   end
 
-  def toggleCamera(sender)
+  def toggle_camera(sender)
     # Toggle between cameras when there is more than one
     club.toggleCamera
 
@@ -105,9 +103,9 @@ class CameraController < AVClubController
     club.continuousFocusAtPoint(CGPoint.new(0.5, 0.5))
   end
 
-  def toggleRecording(sender)
+  def toggle_recording(sender)
     # Start recording if there isn't a recording running. Stop recording if there is.
-    record_button.setEnabled(false)
+    record_button.enabled = false
     unless club.recorder.isRecording
       club.startRecording
     else
@@ -115,11 +113,11 @@ class CameraController < AVClubController
     end
   end
 
-  def captureStillImage(sender)
+  def capture_still_image(sender)
     return unless still_button.isEnabled
 
     # Capture a still image
-    still_button.setEnabled(false)
+    still_button.enabled = false
     club.captureStillImageAnimated(true)
   end
 
@@ -172,10 +170,10 @@ class CameraController < AVClubController
     update_button_states
   end
 
-  def willRotateToInterfaceOrientation(toInterfaceOrientation, duration:duration)
+  def willRotateToInterfaceOrientation(to_interface_duration, duration:duration)
     super
 
-    case toInterfaceOrientation
+    case to_interface_duration
     when UIInterfaceOrientationLandscapeLeft
       new_frame = CGRect.new([0, 0], [480, 320])
     when UIInterfaceOrientationLandscapeRight
@@ -187,7 +185,7 @@ class CameraController < AVClubController
     end
 
     ### important ###
-    rotateCameraTo(new_frame, orientation:toInterfaceOrientation, duration:duration)
+    rotate_camera_to(new_frame, orientation:to_interface_duration, duration:duration)
   end
 
 end

data/lib/AVClub/AVClubController.rb

@@ -1,25 +1,25 @@
 class AVClubController < UIViewController
   attr_accessor :club
-  attr_accessor :viewFinderView
+  attr_accessor :view_finder_view
 
-  def startInView(view)
-    self.viewFinderView = view
+  def start_in_view(view)
+    @view_finder_view = view
 
-    unless club
-      self.club = AVClub.new
-      self.club.delegate = self
-      self.club.startInView(view)
+    unless @club
+      @club = AVClub.new
+      @club.delegate = self
+      @club.startInView(view)
     end
   end
 
   def club(club, didFailWithError:error)
-      alertView = UIAlertView.alloc.initWithTitle(error.localizedDescription,
-                                          message:error.localizedFailureReason,
-                                         delegate:nil,
-                                cancelButtonTitle:'OK',
-                                otherButtonTitles:nil
-                                                 )
-      alertView.show
+      alert_view = UIAlertView.alloc.initWithTitle(error.localizedDescription,
+                                           message:error.localizedFailureReason,
+                                          delegate:nil,
+                                 cancelButtonTitle:'OK',
+                                 otherButtonTitles:nil
+                                                  )
+      alert_view.show
   end
 
   def club(club, stillImageCaptured:image, error:error)
@@ -37,19 +37,19 @@ class AVClubController < UIViewController
   def clubDeviceConfigurationChanged(club)
   end
 
-  def rotateCameraTo(new_frame, orientation:toInterfaceOrientation, duration:duration)
-    return unless viewFinderView
+  def rotate_camera_to(new_frame, orientation:to_interface_orientation, duration:duration)
+    return unless @view_finder_view
 
-    captureVideoPreviewLayer = nil
-    viewFinderView.layer.sublayers.each do |layer|
+    capture_video_preview_layer = nil
+    @view_finder_view.layer.sublayers.each do |layer|
       if layer.is_a? AVCaptureVideoPreviewLayer
-        captureVideoPreviewLayer = layer
+        capture_video_preview_layer = layer
         break
       end
     end
-    return unless captureVideoPreviewLayer
+    return unless capture_video_preview_layer
 
-    case toInterfaceOrientation
+    case to_interface_orientation
     when UIInterfaceOrientationLandscapeLeft
       rotation = Math::PI / 2
     when UIInterfaceOrientationLandscapeRight
@@ -60,10 +60,14 @@ class AVClubController < UIViewController
       rotation = 2 * Math::PI
     end
 
-    captureVideoPreviewLayer.masksToBounds = true
+    capture_video_preview_layer.masksToBounds = true
     UIView.animateWithDuration(duration, animations:lambda{
-      captureVideoPreviewLayer.frame = new_frame
-      captureVideoPreviewLayer.orientation = toInterfaceOrientation
+      transform = CATransform3DMakeRotation(rotation, 0, 0, 1.0)
+      capture_video_preview_layer.anchorPoint = [0.5, 0.5]
+      capture_video_preview_layer.transform = transform
+      capture_video_preview_layer.frame = new_frame
+      club.orientation = to_interface_orientation
     })
   end
+
 end

data/lib/AVClub/version.rb

@@ -1,3 +1,3 @@
 module AVClub
-  VERSION = '0.1.4'
+  VERSION = '1.0.3'
 end

data/lib/avclub.rb

@@ -21,7 +21,7 @@ Motion::Project::App.setup do |app|
     app.files.insert(insert_point, file)
   end
 
-  app.vendor_project(File.join(File.dirname(__FILE__), '../vendor/AVClub'), :xcode)
+  app.vendor_project(File.join(File.dirname(__FILE__), '../vendor/AVClub'), :static, cflags: '-fobjc-arc')
 
   app.frameworks.concat [
     'MediaPlayer',

data/vendor/AVClub/{AVClub/AVCamRecorder.h → AVCamRecorder.h}

@@ -70,6 +70,8 @@
 -(BOOL)isMirrored;
 -(void)startRecordingWithOrientation:(AVCaptureVideoOrientation)videoOrientation;
 -(void)stopRecording;
+- (AVCaptureConnection*) audioConnection;
+- (AVCaptureConnection*) videoConnection;
 
 @end
 

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

@@ -66,10 +66,10 @@
         AVCaptureMovieFileOutput *aMovieFileOutput = [[AVCaptureMovieFileOutput alloc] init];
         if ([aSession canAddOutput:aMovieFileOutput])
             [aSession addOutput:aMovieFileOutput];
-        [self setMovieFileOutput:aMovieFileOutput];
+        self.movieFileOutput = aMovieFileOutput;
 
-		[self setSession:aSession];
-		[self setOutputFileURL:anOutputFileURL];
+		self.session = aSession;
+		self.outputFileURL = anOutputFileURL;
     }
 
 	return self;
@@ -80,34 +80,40 @@
     [[self session] removeOutput:[self movieFileOutput]];
 }
 
+- (AVCaptureConnection *)videoConnection
+{
+    return [AVCamUtilities connectionWithMediaType:AVMediaTypeVideo fromConnections:[[self movieFileOutput] connections]];
+}
+
+- (AVCaptureConnection *)audioConnection
+{
+    return [AVCamUtilities connectionWithMediaType:AVMediaTypeAudio fromConnections:[[self movieFileOutput] connections]];
+}
+
+
 -(BOOL)isOrientationSupported
 {
-	AVCaptureConnection *videoConnection = [AVCamUtilities connectionWithMediaType:AVMediaTypeVideo fromConnections:[[self movieFileOutput] connections]];
-    return [videoConnection isVideoOrientationSupported];
+    return [self.videoConnection isVideoOrientationSupported];
 }
 
 -(void)setOrientation:(AVCaptureVideoOrientation)orientation
 {
-	AVCaptureConnection *videoConnection = [AVCamUtilities connectionWithMediaType:AVMediaTypeVideo fromConnections:[[self movieFileOutput] connections]];
-    return [videoConnection setVideoOrientation:orientation];
+    return [self.videoConnection setVideoOrientation:orientation];
 }
 
 -(BOOL)isMirrored
 {
-	AVCaptureConnection *videoConnection = [AVCamUtilities connectionWithMediaType:AVMediaTypeVideo fromConnections:[[self movieFileOutput] connections]];
-	return [videoConnection isVideoMirrored];
+	return [self.videoConnection isVideoMirrored];
 }
 
 -(BOOL)recordsVideo
 {
-	AVCaptureConnection *videoConnection = [AVCamUtilities connectionWithMediaType:AVMediaTypeVideo fromConnections:[[self movieFileOutput] connections]];
-	return [videoConnection isActive];
+	return [self.videoConnection isActive];
 }
 
 -(BOOL)recordsAudio
 {
-	AVCaptureConnection *audioConnection = [AVCamUtilities connectionWithMediaType:AVMediaTypeAudio fromConnections:[[self movieFileOutput] connections]];
-	return [audioConnection isActive];
+	return [self.audioConnection isActive];
 }
 
 -(BOOL)isRecording
@@ -117,12 +123,11 @@
 
 -(void)startRecordingWithOrientation:(AVCaptureVideoOrientation)videoOrientation;
 {
-    AVCaptureConnection *videoConnection = [AVCamUtilities connectionWithMediaType:AVMediaTypeVideo fromConnections:[[self movieFileOutput] connections]];
-    if ( ! videoConnection )
+    if ( ! self.videoConnection )
         return;
 
-    if ([videoConnection isVideoOrientationSupported])
-        [videoConnection setVideoOrientation:videoOrientation];
+    if ([self.videoConnection isVideoOrientationSupported])
+        [self.videoConnection setVideoOrientation:videoOrientation];
 
     [[self movieFileOutput] startRecordingToOutputFileURL:[self outputFileURL] recordingDelegate:self];
 }
@@ -134,6 +139,7 @@
 
 @end
 
+
 @implementation AVCamRecorder (FileOutputDelegate)
 
 - (void)             captureOutput:(AVCaptureFileOutput *)captureOutput

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

@@ -1,8 +1,8 @@
 //
 //  AVClub.h
-//  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.
 //
 
@@ -37,12 +37,15 @@
 - (void) startSession;
 - (void) stopSession;
 
-- (CGPoint)convertToPointOfInterestFromViewCoordinates:(CGPoint)viewCoordinates;
+- (CGPoint) convertToPointOfInterestFromViewCoordinates:(CGPoint)viewCoordinates;
 - (void) startRecording;
 - (void) stopRecording;
 - (void) saveImageToLibrary:(UIImage*)image;
 - (void) captureStillImage;
 - (void) captureStillImageAnimated:(BOOL)animated;
+- (AVCaptureDevice *) frontFacingCamera;
+- (AVCaptureDevice *) backFacingCamera;
+- (AVCaptureDevicePosition) currentCamera;
 - (BOOL) toggleCamera;
 - (BOOL) toggleCameraAnimated:(BOOL)animated;
 - (void) autoFocusAtPoint:(CGPoint)point;