Manually merged in the details for Redth#37 Closes Redth#37

shenjler · Jun 17, 2013 · 90802c9 · 90802c9
1 parent 2082bf3
commit 90802c9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 24 deletions.
diff --git a/samples/MonoTouch/MonoTouch.Sample/Info.plist b/samples/MonoTouch/MonoTouch.Sample/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleDisplayName</key>
 	<string>ZXing Sample</string>
 	<key>MinimumOSVersion</key>
-	<string>6.0</string>
+	<string>5.0</string>
 </dict>
 </plist>
diff --git a/src/ZXing.Net.Mobile/MonoTouch/ZXingScannerView.cs b/src/ZXing.Net.Mobile/MonoTouch/ZXingScannerView.cs
@@ -1,17 +1,18 @@
 using System;
-using MonoTouch.Foundation;
-using MonoTouch.CoreFoundation;
-using MonoTouch.UIKit;
-using MonoTouch.AVFoundation;
+using System.Collections.Generic;
 using System.Drawing;
+using System.Threading;
+using System.Threading.Tasks;
+using MonoTouch.AVFoundation;
+using MonoTouch.CoreFoundation;
+using MonoTouch.CoreGraphics;
 using MonoTouch.CoreMedia;
 using MonoTouch.CoreVideo;
-using MonoTouch.CoreGraphics;
-using ZXing.Mobile;
+using MonoTouch.Foundation;
+using MonoTouch.ObjCRuntime;
+using MonoTouch.UIKit;
 using ZXing.Common;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Threading;
+using ZXing.Mobile;
 
 namespace ZXing.Mobile
 {
@@ -211,7 +212,9 @@ bool SetupCaptureSession ()
 			previewLayer = new AVCaptureVideoPreviewLayer(session);
 
 			//Framerate set here (15 fps)
-			previewLayer.Connection.VideoMinFrameDuration = new CMTime(1, 10);
+			if (previewLayer.RespondsToSelector(new Selector("connection")))
+				previewLayer.Connection.VideoMinFrameDuration = new CMTime(1, 10);
+
 			previewLayer.LayerVideoGravity = AVLayerVideoGravity.ResizeAspectFill;
 			previewLayer.Frame = this.Frame;
 			previewLayer.Position = new PointF(this.Layer.Bounds.Width / 2, (this.Layer.Bounds.Height / 2));
@@ -346,20 +349,23 @@ public void ResizePreview (UIInterfaceOrientation orientation)
 		{
 			previewLayer.Frame = this.Frame;
 
-			switch (orientation)
+			if (previewLayer.RespondsToSelector(new Selector("connection")))
 			{
-				case UIInterfaceOrientation.LandscapeLeft:
-					previewLayer.Connection.VideoOrientation = AVCaptureVideoOrientation.LandscapeLeft;
-					break;
-				case UIInterfaceOrientation.LandscapeRight:
-					previewLayer.Connection.VideoOrientation = AVCaptureVideoOrientation.LandscapeRight;
-					break;
-				case UIInterfaceOrientation.Portrait:
-					previewLayer.Connection.VideoOrientation = AVCaptureVideoOrientation.Portrait;
-					break;
-				case UIInterfaceOrientation.PortraitUpsideDown:
-					previewLayer.Connection.VideoOrientation = AVCaptureVideoOrientation.PortraitUpsideDown;
-					break;
+				switch (orientation)
+				{
+					case UIInterfaceOrientation.LandscapeLeft:
+						previewLayer.Connection.VideoOrientation = AVCaptureVideoOrientation.LandscapeLeft;
+						break;
+					case UIInterfaceOrientation.LandscapeRight:
+						previewLayer.Connection.VideoOrientation = AVCaptureVideoOrientation.LandscapeRight;
+						break;
+					case UIInterfaceOrientation.Portrait:
+						previewLayer.Connection.VideoOrientation = AVCaptureVideoOrientation.Portrait;
+						break;
+					case UIInterfaceOrientation.PortraitUpsideDown:
+						previewLayer.Connection.VideoOrientation = AVCaptureVideoOrientation.PortraitUpsideDown;
+						break;
+				}
 			}
 		}