From ffb03f9c359bbf59cf5a2ff5d047fea438397dba Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@belledonne-communications.com>
Date: Mon, 2 Jan 2012 15:30:05 +0100
Subject: [PATCH] Call quality indicator on all video views

---
 Classes/VideoViewController.h   |   2 +
 Classes/VideoViewController.m   |  16 ++++
 Classes/VideoViewController.xib | 139 +++++++++++++++++++++++---------
 3 files changed, 119 insertions(+), 38 deletions(-)

diff --git a/Classes/VideoViewController.h b/Classes/VideoViewController.h
index a8958ff9d..1cad26a13 100644
--- a/Classes/VideoViewController.h
+++ b/Classes/VideoViewController.h
@@ -59,6 +59,7 @@
 @property (nonatomic, retain) IBOutlet UIMuteButton* mMuteLandRight;
 @property (nonatomic, retain) IBOutlet UIHangUpButton* mHangUpLandRight;
 @property (nonatomic, retain) IBOutlet UICamSwitch* mCamSwitchLandRight;
+@property (nonatomic, retain) IBOutlet UIImageView *mCallQualityLandRight;
 
 @property (nonatomic, retain) IBOutlet UIView* mLandscapeLeft;
 @property (nonatomic, retain) IBOutlet UIView* mDisplayLandLeft;
@@ -66,6 +67,7 @@
 @property (nonatomic, retain) IBOutlet UIMuteButton* mMuteLandLeft;
 @property (nonatomic, retain) IBOutlet UIHangUpButton* mHangUpLandLeft;
 @property (nonatomic, retain) IBOutlet UICamSwitch* mCamSwitchLandLeft;
+@property (retain, nonatomic) IBOutlet UIImageView *mCallQualityLandLeft;
 
 - (void) updateCallQualityIndicator;
 
diff --git a/Classes/VideoViewController.m b/Classes/VideoViewController.m
index 5fbcd648b..424f0d118 100644
--- a/Classes/VideoViewController.m
+++ b/Classes/VideoViewController.m
@@ -36,6 +36,7 @@
 @synthesize mMuteLandRight;
 @synthesize mHangUpLandRight;
 @synthesize mCamSwitchLandRight;
+@synthesize mCallQualityLandRight;
 
 @synthesize mLandscapeLeft;
 @synthesize mDisplayLandLeft;
@@ -43,6 +44,7 @@
 @synthesize mMuteLandLeft;
 @synthesize mHangUpLandLeft;
 @synthesize mCamSwitchLandLeft;
+@synthesize mCallQualityLandLeft;
 
 NSTimer *callQualityRefresher;
 
@@ -58,6 +60,8 @@ NSTimer *callQualityRefresher;
 - (void)dealloc
 {
 	[mCallQuality release];
+	[mCallQualityLandRight release];
+	[mCallQualityLandLeft release];
     [super dealloc];
 }
 
@@ -90,18 +94,28 @@ NSTimer *callQualityRefresher;
 	
 	if (linphone_call_get_average_quality(call) >= 4) {
 		[mCallQuality setImage: [UIImage imageNamed:@"stat_sys_signal_4.png"]];
+		[mCallQualityLandRight setImage: [UIImage imageNamed:@"stat_sys_signal_4.png"]];
+		[mCallQualityLandLeft setImage: [UIImage imageNamed:@"stat_sys_signal_4.png"]];
 	}
 	else if (linphone_call_get_average_quality(call) >= 3) {
 		[mCallQuality setImage: [UIImage imageNamed:@"stat_sys_signal_3.png"]];
+		[mCallQualityLandRight setImage: [UIImage imageNamed:@"stat_sys_signal_3.png"]];
+		[mCallQualityLandLeft setImage: [UIImage imageNamed:@"stat_sys_signal_3.png"]];
 	}
 	else if (linphone_call_get_average_quality(call) >= 2) {
 		[mCallQuality setImage: [UIImage imageNamed:@"stat_sys_signal_2.png"]];
+		[mCallQualityLandRight setImage: [UIImage imageNamed:@"stat_sys_signal_2.png"]];
+		[mCallQualityLandLeft setImage: [UIImage imageNamed:@"stat_sys_signal_2.png"]];
 	}
 	else if (linphone_call_get_average_quality(call) >= 1) {
 		[mCallQuality setImage: [UIImage imageNamed:@"stat_sys_signal_1.png"]];
+		[mCallQualityLandRight setImage: [UIImage imageNamed:@"stat_sys_signal_1.png"]];
+		[mCallQualityLandLeft setImage: [UIImage imageNamed:@"stat_sys_signal_1.png"]];
 	}
 	else {
 		[mCallQuality setImage: [UIImage imageNamed:@"stat_sys_signal_0.png"]];
+		[mCallQualityLandRight setImage: [UIImage imageNamed:@"stat_sys_signal_0.png"]];
+		[mCallQualityLandLeft setImage: [UIImage imageNamed:@"stat_sys_signal_0.png"]];
 	}
 }
 
@@ -141,6 +155,8 @@ NSTimer *callQualityRefresher;
 {
 	[mCallQuality release];
 	mCallQuality = nil;
+	[self setMCallQualityLandRight:nil];
+	[self setMCallQualityLandLeft:nil];
     [super viewDidUnload];
 	
     // Release any retained subviews of the main view.
diff --git a/Classes/VideoViewController.xib b/Classes/VideoViewController.xib
index 0ba0cefe2..cd1e2025e 100644
--- a/Classes/VideoViewController.xib
+++ b/Classes/VideoViewController.xib
@@ -36,9 +36,11 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="82063733">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<string key="NSFrameSize">{320, 460}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSNextKeyView"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MCAwIDAAA</bytes>
@@ -46,7 +48,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="191373211">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -127,6 +129,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{211, 418}, {108, 62}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
@@ -170,6 +173,7 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 480}</string>
+				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="733070734"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@@ -178,7 +182,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="977413659">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -227,7 +231,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{420, 107}, {60, 106}}</string>
 						<reference key="NSSuperview" ref="977413659"/>
-						<reference key="NSNextKeyView" ref="124303267"/>
+						<reference key="NSNextKeyView" ref="142062275"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
@@ -248,6 +252,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{420, 212}, {60, 108}}</string>
 						<reference key="NSSuperview" ref="977413659"/>
+						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
@@ -276,8 +281,19 @@
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
+					<object class="IBUIImageView" id="142062275">
+						<reference key="NSNextResponder" ref="977413659"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{8, 285}, {28, 28}}</string>
+						<reference key="NSSuperview" ref="977413659"/>
+						<reference key="NSNextKeyView" ref="124303267"/>
+						<string key="NSReuseIdentifierKey">_NS:567</string>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
 				</object>
 				<string key="NSFrameSize">{480, 320}</string>
+				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="858597805"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@@ -291,7 +307,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="738244138">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -300,7 +316,7 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{60, 0}, {420, 320}}</string>
 						<reference key="NSSuperview" ref="738244138"/>
-						<reference key="NSNextKeyView" ref="81113981"/>
+						<reference key="NSNextKeyView" ref="359167072"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
@@ -376,6 +392,7 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{360, 233}, {106, 80}}</string>
 						<reference key="NSSuperview" ref="738244138"/>
+						<reference key="NSNextKeyView"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
@@ -383,8 +400,19 @@
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
+					<object class="IBUIImageView" id="359167072">
+						<reference key="NSNextResponder" ref="738244138"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{68, 285}, {28, 28}}</string>
+						<reference key="NSSuperview" ref="738244138"/>
+						<reference key="NSNextKeyView" ref="81113981"/>
+						<string key="NSReuseIdentifierKey">_NS:567</string>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
 				</object>
 				<string key="NSFrameSize">{480, 320}</string>
+				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="689882425"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@@ -489,14 +517,6 @@
 					</object>
 					<int key="connectionID">43</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">mDisplayLandRight</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="858597805"/>
-					</object>
-					<int key="connectionID">44</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">mPreviewLandRight</string>
@@ -505,14 +525,6 @@
 					</object>
 					<int key="connectionID">45</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">mDisplayLandLeft</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="774090532"/>
-					</object>
-					<int key="connectionID">46</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">mMuteLandLeft</string>
@@ -561,6 +573,38 @@
 					</object>
 					<int key="connectionID">54</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mDisplayLandRight</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="858597805"/>
+					</object>
+					<int key="connectionID">44</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mCallQualityLandRight</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="142062275"/>
+					</object>
+					<int key="connectionID">58</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mDisplayLandLeft</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="774090532"/>
+					</object>
+					<int key="connectionID">46</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mCallQualityLandLeft</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="359167072"/>
+					</object>
+					<int key="connectionID">60</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -617,6 +661,9 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">9</int>
 						<reference key="object" ref="955352536"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 						<reference key="parent" ref="191373211"/>
 						<string key="objectName">preview</string>
 					</object>
@@ -641,11 +688,12 @@
 						<reference key="object" ref="977413659"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="858597805"/>
 							<reference ref="1050670507"/>
 							<reference ref="335958099"/>
 							<reference ref="676617489"/>
 							<reference ref="124303267"/>
+							<reference ref="142062275"/>
+							<reference ref="858597805"/>
 						</object>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">landscape-right</string>
@@ -668,15 +716,6 @@
 						<reference key="parent" ref="977413659"/>
 						<string key="objectName">Mute</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="858597805"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="parent" ref="977413659"/>
-						<string key="objectName">display</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">16</int>
 						<reference key="object" ref="124303267"/>
@@ -692,6 +731,7 @@
 							<reference ref="898336236"/>
 							<reference ref="93544236"/>
 							<reference ref="689882425"/>
+							<reference ref="359167072"/>
 							<reference ref="774090532"/>
 						</object>
 						<reference key="parent" ref="0"/>
@@ -700,6 +740,9 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">35</int>
 						<reference key="object" ref="81113981"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 						<reference key="parent" ref="738244138"/>
 						<string key="objectName">preview</string>
 					</object>
@@ -721,17 +764,33 @@
 						<reference key="parent" ref="738244138"/>
 						<string key="objectName">Mute</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">52</int>
+						<reference key="object" ref="162570569"/>
+						<reference key="parent" ref="191373211"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">56</int>
+						<reference key="object" ref="142062275"/>
+						<reference key="parent" ref="977413659"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="858597805"/>
+						<reference key="parent" ref="977413659"/>
+						<string key="objectName">display</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">59</int>
+						<reference key="object" ref="359167072"/>
+						<reference key="parent" ref="738244138"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">39</int>
 						<reference key="object" ref="774090532"/>
 						<reference key="parent" ref="738244138"/>
 						<string key="objectName">display</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">52</int>
-						<reference key="object" ref="162570569"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -764,6 +823,8 @@
 					<string>39.IBPluginDependency</string>
 					<string>5.IBPluginDependency</string>
 					<string>52.IBPluginDependency</string>
+					<string>56.IBPluginDependency</string>
+					<string>59.IBPluginDependency</string>
 					<string>6.CustomClassName</string>
 					<string>6.IBPluginDependency</string>
 					<string>7.CustomClassName</string>
@@ -800,6 +861,8 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIMuteButton</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIHangUpButton</string>
@@ -821,7 +884,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">54</int>
+			<int key="maxID">60</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>