Merge branch 'master' of git.linphone.org:linphone

This commit is contained in:
Ghislain MARY 2012-08-21 13:21:00 +02:00
commit e46601f822

View file

@ -4246,7 +4246,7 @@ static MSFilter *get_dtmf_gen(LinphoneCore *lc){
return stream->dtmfgen;
}
if (lc->ringstream==NULL){
float amp=0.1;
float amp=lp_config_get_float(lc->config,"sound","dtmf_player_amp",0.1);
MSSndCard *ringcard=lc->sound_conf.lsd_card ?lc->sound_conf.lsd_card : lc->sound_conf.ring_sndcard;
if (ringcard == NULL)
return NULL;