From 89c039935b042d0076e3cdb0f6679cb0417425dc Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Wed, 4 Apr 2012 12:01:29 +0200
Subject: [PATCH] Fixes for ipad transfer and video rotation

---
 Classes/InCallViewController-ipad.xib | 17 ++++++++---------
 Classes/IncallViewController.m        |  7 +++++--
 Classes/MainScreenWithVideoPreview.m  |  4 ++++
 linphonerc-ipad                       |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Classes/InCallViewController-ipad.xib b/Classes/InCallViewController-ipad.xib
index c9752f961..b040469f2 100644
--- a/Classes/InCallViewController-ipad.xib
+++ b/Classes/InCallViewController-ipad.xib
@@ -180,7 +180,6 @@
 									<string key="NSFrame">{{0, 1}, {320, 66}}</string>
 									<reference key="NSSuperview" ref="677109388"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView"/>
 									<object class="NSColor" key="IBUIBackgroundColor">
 										<int key="NSColorSpace">1</int>
 										<bytes key="NSRGB">MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA</bytes>
@@ -373,16 +372,16 @@
 										<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
 									</object>
 									<reference key="IBUINormalTitleShadowColor" ref="275823755"/>
-									<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="90138757">
+									<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="594382055">
 										<string key="NSClassName">NSImage</string>
 										<string key="NSResourceName">clavier-01-160px.png</string>
 									</object>
 									<reference key="IBUIFontDescription" ref="995447773"/>
 									<reference key="IBUIFont" ref="588625926"/>
 								</object>
-								<object class="IBUIButton" id="217295040">
+								<object class="IBUIButton" id="270376652">
 									<reference key="NSNextResponder" ref="331380355"/>
-									<int key="NSvFlags">-2147483356</int>
+									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{160, 70}, {80, 66}}</string>
 									<reference key="NSSuperview" ref="331380355"/>
 									<reference key="NSWindow"/>
@@ -401,7 +400,7 @@
 										<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
 									</object>
 									<reference key="IBUINormalTitleShadowColor" ref="275823755"/>
-									<reference key="IBUINormalBackgroundImage" ref="90138757"/>
+									<reference key="IBUINormalBackgroundImage" ref="594382055"/>
 									<reference key="IBUIFontDescription" ref="995447773"/>
 									<reference key="IBUIFont" ref="588625926"/>
 								</object>
@@ -481,7 +480,7 @@
 									<string key="NSFrame">{{80, 70}, {80, 66}}</string>
 									<reference key="NSSuperview" ref="331380355"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="217295040"/>
+									<reference key="NSNextKeyView" ref="270376652"/>
 									<reference key="IBUIBackgroundColor" ref="379880382"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1128,7 +1127,7 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">transfer</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="217295040"/>
+						<reference key="destination" ref="270376652"/>
 					</object>
 					<int key="connectionID">170</int>
 				</object>
@@ -1248,7 +1247,7 @@
 							<reference ref="1070839124"/>
 							<reference ref="43602080"/>
 							<reference ref="887651058"/>
-							<reference ref="217295040"/>
+							<reference ref="270376652"/>
 						</array>
 						<reference key="parent" ref="134115264"/>
 						<string key="objectName">controls</string>
@@ -1449,7 +1448,7 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">169</int>
-						<reference key="object" ref="217295040"/>
+						<reference key="object" ref="270376652"/>
 						<reference key="parent" ref="331380355"/>
 						<string key="objectName">transfer</string>
 					</object>
diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m
index f5ba66ade..c6e6bcad9 100644
--- a/Classes/IncallViewController.m
+++ b/Classes/IncallViewController.m
@@ -464,7 +464,7 @@ void addAnimationFadeTransition(UIView* view, float duration) {
     NSString* title = NSLocalizedString(@"Transfer call to:",nil);
     visibleActionSheet = [[UIActionSheet alloc] initWithTitle:title
                                                      delegate:cd 
-                                            cancelButtonTitle:NSLocalizedString(@"Cancel",nil) 
+                                            cancelButtonTitle:[LinphoneManager runningOnIpad] ? nil : NSLocalizedString(@"Cancel",nil) 
                                        destructiveButtonTitle:NSLocalizedString(@"A new call",nil)
                                             otherButtonTitles:nil];
     
@@ -484,7 +484,10 @@ void addAnimationFadeTransition(UIView* view, float duration) {
     }
     
     visibleActionSheet.actionSheetStyle = UIActionSheetStyleDefault;
-    [visibleActionSheet showInView:self.view];    
+    if ([LinphoneManager runningOnIpad])
+        [visibleActionSheet showFromRect:transfer.bounds inView:transfer animated:NO];
+    else
+        [visibleActionSheet showInView:self.view];
 }
 
 -(void) addCallPressed {
diff --git a/Classes/MainScreenWithVideoPreview.m b/Classes/MainScreenWithVideoPreview.m
index a9629a990..220c9bd73 100644
--- a/Classes/MainScreenWithVideoPreview.m
+++ b/Classes/MainScreenWithVideoPreview.m
@@ -93,6 +93,10 @@
     
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc]init];
     NSArray* array = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+    if ( [array count] == 0) {
+        ms_warning("No camera available (running on simulator ?");
+        return;
+    }
     currentCamera = camIndex % [array count];
     AVCaptureDevice* device =  (AVCaptureDevice*) [array objectAtIndex:currentCamera];
     input = [[AVCaptureDeviceInput deviceInputWithDevice:device
diff --git a/linphonerc-ipad b/linphonerc-ipad
index 402f17b15..f537c1ee1 100644
--- a/linphonerc-ipad
+++ b/linphonerc-ipad
@@ -44,4 +44,5 @@ capture=1
 show_local=0
 enabled=1
 size=vga
+display_filter_auto_rotate=1