mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 19:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't show video acceptance popup when video is disabled

Browse source 
update linphone submodule
This commit is contained in:
Simon Morlat 2012-09-26 13:06:33 +02:00
parent d8657bfe0f
commit 4891d646da
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Classes/InCallViewController.m
View file

@ -226,6 +226,7 @@ static UICompositeViewDescription *compositeDescription = nil;
#pragma mark -
- (void)callUpdate:(LinphoneCall *)call state:(LinphoneCallState)state animated:(BOOL)animated {
LinphoneCore *lc = [LinphoneManager getLc];
// Update table
[callTableView reloadData];
@ -245,7 +246,7 @@ static UICompositeViewDescription *compositeDescription = nil;
case LinphoneCallIncomingReceived:
case LinphoneCallOutgoingInit:
{
if(linphone_core_get_calls_nb([LinphoneManager getLc]) > 1) {
if(linphone_core_get_calls_nb(lc) > 1) {
[callTableController minimizeAll];
}
}
@ -267,10 +268,10 @@ static UICompositeViewDescription *compositeDescription = nil;
const LinphoneCallParams* remote = linphone_call_get_remote_params(call);
/* remote wants to add video */
if (!linphone_call_params_video_enabled(current) &&
if (linphone_core_video_enabled(lc) && !linphone_call_params_video_enabled(current) &&
linphone_call_params_video_enabled(remote) &&
!linphone_core_get_video_policy([LinphoneManager getLc])->automatically_accept) {
linphone_core_defer_call_update([LinphoneManager getLc], call);
!linphone_core_get_video_policy(lc)->automatically_accept) {
linphone_core_defer_call_update(lc, call);
[self displayAskToEnableVideoCall:call];
} else if (linphone_call_params_video_enabled(current) && !linphone_call_params_video_enabled(remote)) {
[self displayTableCall:animated];
@ -287,7 +288,7 @@ static UICompositeViewDescription *compositeDescription = nil;
case LinphoneCallEnd:
case LinphoneCallError:
{
if(linphone_core_get_calls_nb([LinphoneManager getLc]) <= 2) {
if(linphone_core_get_calls_nb(lc) <= 2) {
[callTableController maximizeAll];
}
break;

2
submodules/linphone

@ -1 +1 @@
Subproject commit d2bf8846e3c40ce5b4dec886f2d0fc6d9698fc87
Subproject commit e6d835fa745550a043e18a3b850d0cb353ef9ae8