From 4dcafb05001337714e46eb183a0d445c899bb96b Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 21 Jul 2011 18:46:35 +0200
Subject: [PATCH] enhanced video view

---
 Classes/VideoViewController.xib | 35 +++++++++++++++++++++++----------
 submodules/linphone             |  2 +-
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/Classes/VideoViewController.xib b/Classes/VideoViewController.xib
index b2a7f9f62..61ac5ddd6 100644
--- a/Classes/VideoViewController.xib
+++ b/Classes/VideoViewController.xib
@@ -57,7 +57,7 @@
 					<object class="IBUIButton" id="477702441">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{13, 408}, {72, 37}}</string>
+						<string key="NSFrame">{{0, 398}, {106, 62}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="695487530"/>
@@ -82,11 +82,15 @@
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MC41AA</bytes>
 						</object>
+						<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="861970554">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">clavier-01-108px.png</string>
+						</object>
 					</object>
 					<object class="IBUIButton" id="695487530">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{98, 408}, {129, 37}}</string>
+						<string key="NSFrame">{{107, 398}, {106, 63}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="383499753"/>
@@ -105,13 +109,15 @@
 							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">stopcall-red.png</string>
 						</object>
+						<reference key="IBUINormalBackgroundImage" ref="861970554"/>
 					</object>
 					<object class="IBUIButton" id="383499753">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{240, 408}, {72, 37}}</string>
+						<string key="NSFrame">{{213, 398}, {106, 62}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
@@ -125,18 +131,19 @@
 							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 						</object>
 						<reference key="IBUINormalTitleShadowColor" ref="19777660"/>
+						<reference key="IBUINormalBackgroundImage" ref="861970554"/>
 					</object>
 					<object class="IBUIView" id="955352536">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{210, 278}, {102, 114}}</string>
+						<string key="NSFrame">{{216, 263}, {96, 128}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="477702441"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
-							<object class="NSColorSpace" key="NSCustomColorSpace" id="408460901">
+							<object class="NSColorSpace" key="NSCustomColorSpace">
 								<int key="NSID">2</int>
 							</object>
 						</object>
@@ -149,8 +156,7 @@
 				<reference key="NSNextKeyView" ref="733070734"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<reference key="NSCustomColorSpace" ref="408460901"/>
+					<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 				</object>
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -215,10 +221,10 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="733070734"/>
+							<reference ref="955352536"/>
 							<reference ref="477702441"/>
 							<reference ref="695487530"/>
 							<reference ref="383499753"/>
-							<reference ref="955352536"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -427,8 +433,17 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NS.key.0">stopcall-red.png</string>
-			<string key="NS.object.0">{62, 54}</string>
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>clavier-01-108px.png</string>
+				<string>stopcall-red.png</string>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{108, 60}</string>
+				<string>{62, 54}</string>
+			</object>
 		</object>
 		<string key="IBCocoaTouchPluginVersion">300</string>
 	</data>
diff --git a/submodules/linphone b/submodules/linphone
index b57946b55..0f67d9106 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b57946b5518da0a50d62b24b6a06606b6006237c
+Subproject commit 0f67d91065f5668b5520efc2d792cfdd8becc8b4