Commit d7c3e16f authored by QuentinArguillere's avatar QuentinArguillere
Browse files

"In tone-manager and audio-mixer, if the core has use_files enabled, use NULL sound cardsk"

parent c97e0e43
...@@ -103,6 +103,11 @@ void MS2AudioMixer::addLocalParticipant(){ ...@@ -103,6 +103,11 @@ void MS2AudioMixer::addLocalParticipant(){
? core->sound_conf.lsd_card ? core->sound_conf.lsd_card
: core->sound_conf.play_sndcard; : core->sound_conf.play_sndcard;
MSSndCard *captcard = core->sound_conf.capt_sndcard; MSSndCard *captcard = core->sound_conf.capt_sndcard;
// If playfile are supplied don't use soundcards
if (core->use_files) {
captcard = playcard = nullptr;
}
const MSAudioConferenceParams *params = ms_audio_conference_get_params(mConference); const MSAudioConferenceParams *params = ms_audio_conference_get_params(mConference);
mLocalDummyProfile = sMakeDummyProfile(params->samplerate); mLocalDummyProfile = sMakeDummyProfile(params->samplerate);
audio_stream_start_full(st, mLocalDummyProfile, audio_stream_start_full(st, mLocalDummyProfile,
......
...@@ -439,7 +439,7 @@ void ToneManager::doStartRingbackTone(const std::shared_ptr<CallSession> &sessio ...@@ -439,7 +439,7 @@ void ToneManager::doStartRingbackTone(const std::shared_ptr<CallSession> &sessio
if (lc->sound_conf.remote_ring) { if (lc->sound_conf.remote_ring) {
ms_snd_card_set_stream_type(ringCard, MS_SND_CARD_STREAM_VOICE); ms_snd_card_set_stream_type(ringCard, MS_SND_CARD_STREAM_VOICE);
lc->ringstream = ring_start(lc->factory, lc->sound_conf.remote_ring, 2000, ringCard); lc->ringstream = ring_start(lc->factory, lc->sound_conf.remote_ring, 2000, (lc->use_files) ? NULL : ringCard);
} }
} }
...@@ -693,17 +693,20 @@ MSFilter *ToneManager::getAudioResource(AudioResourceType rtype, MSSndCard *card ...@@ -693,17 +693,20 @@ MSFilter *ToneManager::getAudioResource(AudioResourceType rtype, MSSndCard *card
tmp = 0.1f; tmp = 0.1f;
#endif #endif
float amp = linphone_config_get_float(lc->config, "sound", "dtmf_player_amp", tmp); float amp = linphone_config_get_float(lc->config, "sound", "dtmf_player_amp", tmp);
MSSndCard *ringcard = lc->sound_conf.lsd_card MSSndCard *ringcard = NULL;
if (!lc->use_files) {
ringcard = lc->sound_conf.lsd_card
? lc->sound_conf.lsd_card ? lc->sound_conf.lsd_card
: card : card
? card ? card
: lc->sound_conf.ring_sndcard; : lc->sound_conf.ring_sndcard;
if (ringcard == NULL) return NULL;
if (ringcard == NULL) return NULL; ms_snd_card_set_stream_type(ringcard, MS_SND_CARD_STREAM_DTMF);
}
if (!create) return NULL; if (!create) return NULL;
ms_snd_card_set_stream_type(ringcard, MS_SND_CARD_STREAM_DTMF); ringstream = lc->ringstream = ring_start(lc->factory, NULL, 0, ringcard); // passing a NULL ringcard if core if lc->use_files is enabled
ringstream = lc->ringstream = ring_start(lc->factory, NULL, 0, ringcard);
ms_filter_call_method(lc->ringstream->gendtmf, MS_DTMF_GEN_SET_DEFAULT_AMPLITUDE, &amp); ms_filter_call_method(lc->ringstream->gendtmf, MS_DTMF_GEN_SET_DEFAULT_AMPLITUDE, &amp);
} else { } else {
ringstream = lc->ringstream; ringstream = lc->ringstream;
......
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