diff --git a/Classes/ConferenceCallDetailView.m b/Classes/ConferenceCallDetailView.m
index ed6ebafea..6ec3bf877 100644
--- a/Classes/ConferenceCallDetailView.m
+++ b/Classes/ConferenceCallDetailView.m
@@ -148,21 +148,7 @@ NSTimer *callQualityRefresher;
}
}
UIImageView* callquality = (UIImageView*) [cell viewWithTag:3];
- if (linphone_call_get_average_quality(call) >= 4) {
- [callquality setImage: [IncallViewController stat_sys_signal_4]];
- }
- else if (linphone_call_get_average_quality(call) >= 3) {
- [callquality setImage: [IncallViewController stat_sys_signal_3]];
- }
- else if (linphone_call_get_average_quality(call) >= 2) {
- [callquality setImage: [IncallViewController stat_sys_signal_2]];
- }
- else if (linphone_call_get_average_quality(call) >= 1) {
- [callquality setImage: [IncallViewController stat_sys_signal_1]];
- }
- else {
- [callquality setImage: [IncallViewController stat_sys_signal_0]];
- }
+ [IncallViewController updateIndicator:callquality withCallQuality:linphone_call_get_average_quality(call)];
tableView.rowHeight = 80;
return cell;
diff --git a/Classes/InCallViewController-ipad.xib b/Classes/InCallViewController-ipad.xib
index 7921a5ac7..5eafb957e 100644
--- a/Classes/InCallViewController-ipad.xib
+++ b/Classes/InCallViewController-ipad.xib
@@ -45,12 +45,12 @@
{768, 805}
-
+
_NS:408
-
+
-2147483374
-
-
+
+
292
{768, 1024}
-
+
-
+
_NS:569
NO
IBIPadFramework
-
-
+
+
292
{{20, 956}, {28, 28}}
-
+
-
+
_NS:567
NO
IBIPadFramework
-
-
+
+
292
{{598, 799}, {170, 225}}
-
+
3
MQA
-
+
IBIPadFramework
-
-
+
+
292
{{0, 962}, {108, 62}}
-
+
-
+
NO
IBIPadFramework
0
@@ -138,7 +138,7 @@
2
15
-
+
Helvetica-Bold
15
16
@@ -148,7 +148,7 @@
{768, 1024}
-
+
_NS:212
3
@@ -191,7 +191,7 @@
clavier-01-106px.png
-
+
{{224, 937}, {320, 77}}
@@ -490,7 +490,7 @@
-
+
@@ -513,7 +513,7 @@
-
+
@@ -536,7 +536,7 @@
-
+
@@ -556,7 +556,7 @@
-
+
@@ -579,7 +579,7 @@
-
+
@@ -602,7 +602,7 @@
-
+
@@ -625,7 +625,7 @@
-
+
@@ -648,7 +648,7 @@
-
+
@@ -671,7 +671,7 @@
-
+
@@ -694,7 +694,7 @@
-
+
@@ -717,7 +717,7 @@
-
+
@@ -740,7 +740,7 @@
-
+
@@ -763,7 +763,7 @@
-
+
{{178, 146}, {320, 310}}
@@ -1020,7 +1020,7 @@
videoGroup
-
+
159
@@ -1028,7 +1028,7 @@
videoView
-
+
161
@@ -1036,10 +1036,18 @@
videoPreview
-
+
162
+
+
+ videoCallQuality
+
+
+
+ 163
+
dataSource
@@ -1119,7 +1127,7 @@
-
+
@@ -1307,37 +1315,37 @@
152
-
+
-
-
-
-
+
+
+
+
video
158
-
-
+
+
video_preview
157
-
-
+
+
video_view
154
-
-
+
+
153
-
-
+
+
call_quality_video
@@ -1408,7 +1416,7 @@
- 162
+ 163
@@ -1453,6 +1461,7 @@
UIButton
UIButton
UIButton
+ UIImageView
UIView
UIView
UIView
@@ -1564,6 +1573,10 @@
two
UIButton
+
+ videoCallQuality
+ UIImageView
+
videoGroup
UIView
diff --git a/Classes/IncallViewController.h b/Classes/IncallViewController.h
index 16d5ae004..696937041 100644
--- a/Classes/IncallViewController.h
+++ b/Classes/IncallViewController.h
@@ -61,6 +61,7 @@
UIView* videoGroup;
UIView* videoView;
UIView* videoPreview;
+ UIImageView* videoCallQuality;
bool dismissed;
@@ -87,18 +88,13 @@
NSTimer* hideControlsTimer;
}
-+ (UIImage*) stat_sys_signal_0;
-+ (UIImage*) stat_sys_signal_1;
-+ (UIImage*) stat_sys_signal_2;
-+ (UIImage*) stat_sys_signal_3;
-+ (UIImage*) stat_sys_signal_4;
-
-(void)displayStatus:(NSString*) message;
- (IBAction)doAction:(id)sender;
+(LinphoneCall*) retrieveCallAtIndex: (NSInteger) index inConference:(bool) conf;
+ (void) updateCellImageView:(UIImageView*)imageView Label:(UILabel*)label DetailLabel:(UILabel*)detailLabel AndAccessoryView:(UIView*)accessoryView withCall:(LinphoneCall*) call;
++(void) updateIndicator:(UIImageView*) indicator withCallQuality:(float) quality;
@property (nonatomic, retain) IBOutlet UIView* controlSubView;
@property (nonatomic, retain) IBOutlet UIView* padSubView;
@@ -134,4 +130,5 @@
@property (nonatomic, retain) IBOutlet UIView* videoGroup;
@property (nonatomic, retain) IBOutlet UIView* videoView;
@property (nonatomic, retain) IBOutlet UIView* videoPreview;
+@property (nonatomic, retain) IBOutlet UIImageView* videoCallQuality;
@end
diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m
index 0ae8d5465..12098d3b0 100644
--- a/Classes/IncallViewController.m
+++ b/Classes/IncallViewController.m
@@ -70,28 +70,23 @@ const NSInteger SECURE_BUTTON_TAG=5;
@synthesize videoGroup;
@synthesize videoView;
@synthesize videoPreview;
+@synthesize videoCallQuality;
@synthesize addVideo;
-+ (UIImage*) stat_sys_signal_0 {
- return [UIImage imageNamed:@"stat_sys_signal_0.png"];
-}
-
-+ (UIImage*) stat_sys_signal_1 {
- return [UIImage imageNamed:@"stat_sys_signal_1.png"];
-}
-
-+ (UIImage*) stat_sys_signal_2 {
- return [UIImage imageNamed:@"stat_sys_signal_2.png"];
-}
-
-+ (UIImage*) stat_sys_signal_3 {
- return [UIImage imageNamed:@"stat_sys_signal_3.png"];
-}
-
-+ (UIImage*) stat_sys_signal_4 {
- return [UIImage imageNamed:@"stat_sys_signal_4.png"];
++(void) updateIndicator:(UIImageView*) indicator withCallQuality:(float) quality {
+ if (quality >= 4 || quality < 0) {
+ [indicator setImage:[UIImage imageNamed:@"stat_sys_signal_4.png"]];
+ } else if (quality >= 3) {
+ [indicator setImage:[UIImage imageNamed:@"stat_sys_signal_3.png"]];
+ } else if (quality >= 2) {
+ [indicator setImage:[UIImage imageNamed:@"stat_sys_signal_2.png"]];
+ } else if (quality >= 1) {
+ [indicator setImage:[UIImage imageNamed:@"stat_sys_signal_1.png"]];
+ } else {
+ [indicator setImage:[UIImage imageNamed:@"stat_sys_signal_0.png"]];
+ }
}
bool isInConference(LinphoneCall* call) {
@@ -172,6 +167,7 @@ void addAnimationFadeTransition(UIView* view, float duration) {
addCall.imageView.transform = transform;
addVideo.imageView.transform = transform;
dialer.imageView.transform = transform;
+ videoCallQuality.transform = transform;
[UIView commitAnimations];
}
}
@@ -251,6 +247,7 @@ void addAnimationFadeTransition(UIView* view, float duration) {
contacts.imageView.transform = CGAffineTransformIdentity;
addCall.imageView.transform = CGAffineTransformIdentity;
dialer.imageView.transform = CGAffineTransformIdentity;
+ videoCallQuality.transform = CGAffineTransformIdentity;
[[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationNone];
}
@@ -288,12 +285,14 @@ void addAnimationFadeTransition(UIView* view, float duration) {
if (linphone_call_get_state(selectedCall) == LinphoneCallStreamsRunning) {
if (linphone_call_params_video_enabled(linphone_call_get_current_params(selectedCall))) {
[addVideo setTitle:NSLocalizedString(@"-video", nil) forState:UIControlStateNormal];
+ [IncallViewController updateIndicator: videoCallQuality withCallQuality:linphone_call_get_average_quality(selectedCall)];
} else {
[addVideo setTitle:NSLocalizedString(@"+video", nil) forState:UIControlStateNormal];
}
[addVideo setEnabled:YES];
} else {
[addVideo setEnabled:NO];
+ [videoCallQuality setImage:nil];
}
} else {
if (callsCount == 1) {
@@ -842,21 +841,7 @@ void addAnimationFadeTransition(UIView* view, float duration) {
[callquality setFrame:CGRectMake(0, 0, 28, 28)];
if (call->state == LinphoneCallStreamsRunning)
{
- if (linphone_call_get_average_quality(call) >= 4) {
- [callquality setImage: [IncallViewController stat_sys_signal_4]];
- }
- else if (linphone_call_get_average_quality(call) >= 3) {
- [callquality setImage: [IncallViewController stat_sys_signal_3]];
- }
- else if (linphone_call_get_average_quality(call) >= 2) {
- [callquality setImage: [IncallViewController stat_sys_signal_2]];
- }
- else if (linphone_call_get_average_quality(call) >= 1) {
- [callquality setImage: [IncallViewController stat_sys_signal_1]];
- }
- else {
- [callquality setImage: [IncallViewController stat_sys_signal_0]];
- }
+ [IncallViewController updateIndicator: callquality withCallQuality:linphone_call_get_average_quality(call)];
}
else {
[callquality setImage:nil];
diff --git a/Classes/IncallViewController.xib b/Classes/IncallViewController.xib
index 82c7d024a..35234f6ba 100644
--- a/Classes/IncallViewController.xib
+++ b/Classes/IncallViewController.xib
@@ -12,6 +12,7 @@
YES
+ IBUIImageView
IBUIViewController
IBUIButton
IBUIView
@@ -53,7 +54,7 @@
{320, 480}
-
+
_NS:196
3
@@ -77,6 +78,17 @@
IBCocoaTouchFramework
+
+
+ 292
+ {{4, 428}, {28, 28}}
+
+
+
+ _NS:567
+ NO
+ IBCocoaTouchFramework
+
{320, 460}
@@ -872,14 +884,6 @@
51
-
-
- eight
-
-
-
- 75
-
six
@@ -1008,6 +1012,22 @@
133
+
+
+ eight
+
+
+
+ 75
+
+
+
+ videoCallQuality
+
+
+
+ 138
+
doAction:
@@ -1146,12 +1166,6 @@
1
-
- 33
-
-
- 8
-
40
@@ -1287,8 +1301,9 @@
YES
-
+
+
video
@@ -1296,6 +1311,9 @@
127
+
+ YES
+
preview
@@ -1305,6 +1323,18 @@
display
+
+ 137
+
+
+ videocallquality
+
+
+ 33
+
+
+ 8
+
@@ -1332,6 +1362,7 @@
13.IBPluginDependency
13.IBUIButtonInspectorSelectedStateConfigurationMetadataKey
132.IBPluginDependency
+ 137.IBPluginDependency
15.IBPluginDependency
16.CustomClassName
16.IBPluginDependency
@@ -1394,6 +1425,7 @@
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
UIMuteButton
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -1444,7 +1476,7 @@
- 136
+ 138
@@ -1493,6 +1525,7 @@
star
three
two
+ videoCallQuality
videoGroup
videoPreview
videoView
@@ -1527,6 +1560,7 @@
UIButton
UIButton
UIButton
+ UIImageView
UIView
UIView
UIView
@@ -1564,6 +1598,7 @@
star
three
two
+ videoCallQuality
videoGroup
videoPreview
videoView
@@ -1676,6 +1711,10 @@
two
UIButton
+
+ videoCallQuality
+ UIImageView
+
videoGroup
UIView
diff --git a/Classes/VideoViewController.xib b/Classes/VideoViewController.xib
index cd1e2025e..f7c680281 100644
--- a/Classes/VideoViewController.xib
+++ b/Classes/VideoViewController.xib
@@ -40,7 +40,6 @@
292
{320, 460}
-
1
MCAwIDAAA
@@ -129,7 +128,6 @@
292
{{211, 418}, {108, 62}}
-
NO
IBCocoaTouchFramework
0
@@ -252,7 +250,6 @@
292
{{420, 212}, {60, 108}}
-
NO
IBCocoaTouchFramework
0
@@ -314,6 +311,19 @@
274
+
+ YES
+
+
+ 292
+ {{8, 285}, {28, 28}}
+
+
+ _NS:567
+ NO
+ IBCocoaTouchFramework
+
+
{{60, 0}, {420, 320}}
@@ -392,7 +402,6 @@
274
{{360, 233}, {106, 80}}
-
3
MQA
@@ -400,16 +409,6 @@
IBCocoaTouchFramework
-
-
- 292
- {{68, 285}, {28, 28}}
-
-
- _NS:567
- NO
- IBCocoaTouchFramework
-
{480, 320}
@@ -731,7 +730,6 @@
-
@@ -780,17 +778,21 @@
display
-
- 59
-
-
-
39
+
+ YES
+
+
display
+
+ 59
+
+
+
diff --git a/linphonerc b/linphonerc
index ef80ec31e..6dd0d69b0 100644
--- a/linphonerc
+++ b/linphonerc
@@ -45,4 +45,5 @@ capture=1
show_local=0
enabled=1
size=qvga
+display_filter_auto_rotate=1
diff --git a/submodules/linphone b/submodules/linphone
index 86cb50783..933c931a0 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 86cb50783bf6923fc812219066d4aefd656ee80a
+Subproject commit 933c931a0cd928e74bece7807099f38583d42a3c