mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-03 20:46:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Conference fixes. current call must not be set for conference calls.

Browse source
This commit is contained in:
Simon Morlat 2017-06-07 16:03:14 +02:00
parent f28e3884ba
commit a9b93af101
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
coreapi/conference.cc
View file

@ -409,6 +409,7 @@ int LocalConference::inviteAddresses(const std::list<const LinphoneAddress*> &ad
LinphoneCall *call;
/*toggle this flag so the call is immediately added to the conference upon acceptance*/
new_params->in_conference = TRUE;
linphone_call_params_enable_video(new_params, FALSE); /*turn off video as it is not supported for conferencing at this time*/
call = linphone_core_invite_address_with_params(m_core, addr, new_params);
if (!call){
ms_error("LocalConference::inviteAddresses(): could not invite participant");

4
coreapi/linphonecore.c
View file

@ -3542,8 +3542,8 @@ LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const
return NULL;
}
/* this call becomes now the current one*/
lc->current_call=call;
/* Unless this call is for a conference, it becomes now the current one*/
if (linphone_call_params_get_local_conference_mode(params) == FALSE) lc->current_call=call;
linphone_call_set_state (call,LinphoneCallOutgoingInit,"Starting outgoing call");
call->log->start_date_time=ms_time(NULL);
linphone_call_init_media_streams(call);