mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-05-01 01:46:23 +00:00
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
This commit is contained in:
commit
091a2c90a6
2 changed files with 1 additions and 7 deletions
|
|
@ -3363,13 +3363,7 @@ static MSFilter *get_dtmf_gen(LinphoneCore *lc){
|
||||||
}
|
}
|
||||||
if (lc->ringstream==NULL){
|
if (lc->ringstream==NULL){
|
||||||
MSSndCard *ringcard=lc->sound_conf.lsd_card ?lc->sound_conf.lsd_card : lc->sound_conf.ring_sndcard;
|
MSSndCard *ringcard=lc->sound_conf.lsd_card ?lc->sound_conf.lsd_card : lc->sound_conf.ring_sndcard;
|
||||||
const char *playfile;
|
lc->ringstream=ring_start(NULL,0,ringcard);
|
||||||
#ifdef ANDROID
|
|
||||||
playfile="/data/data/org.linphone/files/silence.wav";
|
|
||||||
#else
|
|
||||||
playfile=NULL;
|
|
||||||
#endif
|
|
||||||
lc->ringstream=ring_start(playfile,0,ringcard);
|
|
||||||
lc->dmfs_playing_start_time=time(NULL);
|
lc->dmfs_playing_start_time=time(NULL);
|
||||||
}else{
|
}else{
|
||||||
if (lc->dmfs_playing_start_time!=0)
|
if (lc->dmfs_playing_start_time!=0)
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Add table
Reference in a new issue