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

fix preview ring bug

Browse source
This commit is contained in:
Simon Morlat 2014-04-09 16:27:30 +02:00
parent 756ae1737a
commit 0868c544d4
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
coreapi/linphonecore.c
View file

@ -2262,7 +2262,15 @@ void linphone_core_iterate(LinphoneCore *lc){
if (lc->ringstream && lc->ringstream_autorelease && lc->dmfs_playing_start_time!=0
&& (curtime-lc->dmfs_playing_start_time)>5){
linphone_core_stop_dtmf_stream(lc);
MSPlayerState state;
bool_t stop=TRUE;
if (lc->ringstream->source && ms_filter_call_method(lc->ringstream->source,MS_PLAYER_GET_STATE,&state)==0){
if (state==MSPlayerPlaying) stop=FALSE;
}
if (stop) {
ms_message("Releasing inactive tone player.");
linphone_core_stop_dtmf_stream(lc);
}
}
sal_iterate(lc->sal);
@ -4412,7 +4420,9 @@ void linphone_core_verify_server_cn(LinphoneCore *lc, bool_t yesno){
static void notify_end_of_ring(void *ud, MSFilter *f, unsigned int event, void *arg){
LinphoneCore *lc=(LinphoneCore*)ud;
lc->preview_finished=1;
if (event==MS_PLAYER_EOF){
lc->preview_finished=1;
}
}
int linphone_core_preview_ring(LinphoneCore *lc, const char *ring,LinphoneCoreCbFunc func,void * userdata)

2
mediastreamer2

@ -1 +1 @@
Subproject commit fd97e9048e2e5f5b8a2dd972d0d7848294742f89
Subproject commit e2a163d31b7e51811dd907a640788c61b24e83b0

2
oRTP

@ -1 +1 @@
Subproject commit daa314ae9c0ba46910299ebc70301897aea7448f
Subproject commit 550e1e1e43ec64b3be96c34e0adb618f4752f34a