Skip to content

GitLab

Commit a48296ec authored by Guillaume Beraudo's avatar Guillaume Beraudo
Browse files

Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

parents 268b035d 3fbde7c8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
coreapi/callbacks.c
View file @ a48296ec
......@@ -235,10 +235,12 @@ static void call_ringing(SalOp *h){
if (lc->ringstream!=NULL) return; /*already ringing !*/
if (lc->sound_conf.play_sndcard!=NULL){
MSSndCard *ringcard=lc->sound_conf.lsd_card ? lc->sound_conf.lsd_card : lc->sound_conf.play_sndcard;
ms_message("Remote ringing...");
lc->ringstream=ring_start(lc->sound_conf.remote_ring,2000,ringcard);
linphone_call_set_state(call,LinphoneCallOutgoingRinging,"Remote ringing");
}
ms_message("Remote ringing...");
if (lc->vtable.display_status)
lc->vtable.display_status(lc,_("Remote ringing..."));
linphone_call_set_state(call,LinphoneCallOutgoingRinging,"Remote ringing");
}else{
/*accept early media */
if (call->audiostream && call->audiostream->ticker!=NULL){
......
mediastreamer2 @ b0eddd4c
Subproject commit b9a6dad7339175e894d1a0f291ccb5d1143e3199
Subproject commit b0eddd4c81b5055534aceb0bf85f0eafb6151d42
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