Commit 7f7ee739 authored by Simon Morlat's avatar Simon Morlat
Browse files

Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

parents 053205bc ee341e2e
...@@ -424,6 +424,10 @@ static void call_updating(SalOp *op){ ...@@ -424,6 +424,10 @@ static void call_updating(SalOp *op){
} }
/*accept the modification (sends a 200Ok)*/ /*accept the modification (sends a 200Ok)*/
sal_call_accept(op); sal_call_accept(op);
<<<<<<< HEAD
=======
>>>>>>> 949b3cd84135d234abab27a023885ad977f715c9
if (prevstate!=LinphoneCallIdle){ if (prevstate!=LinphoneCallIdle){
linphone_call_set_state (call,prevstate,"Connected (streams running)"); linphone_call_set_state (call,prevstate,"Connected (streams running)");
} }
......
...@@ -61,6 +61,8 @@ void linphone_call_add_to_conf(LinphoneCall *call){ ...@@ -61,6 +61,8 @@ void linphone_call_add_to_conf(LinphoneCall *call){
LinphoneCore *lc=call->core; LinphoneCore *lc=call->core;
LinphoneConference *conf=&lc->conf_ctx; LinphoneConference *conf=&lc->conf_ctx;
MSAudioEndpoint *ep; MSAudioEndpoint *ep;
call->params.has_video = FALSE;
call->camera_active = FALSE;
ep=ms_audio_endpoint_get_from_stream(call->audiostream,TRUE); ep=ms_audio_endpoint_get_from_stream(call->audiostream,TRUE);
ms_audio_conference_add_member(conf->conf,ep); ms_audio_conference_add_member(conf->conf,ep);
call->endpoint=ep; call->endpoint=ep;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment