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

don't call prepare_sound with soundcards when the core is in use_files mode. It makes double instanciation of card readers causing crashes on iOS

Browse source
This commit is contained in:
Simon Morlat 2015-08-06 11:16:14 +02:00
parent 75de919def
commit 63b1c6196d
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
coreapi/linphonecore.c
View file

@ -2775,7 +2775,8 @@ int linphone_core_start_invite(LinphoneCore *lc, LinphoneCall *call, const Linph
if (call->localdesc->streams[0].max_rate>0) {
ms_snd_card_set_preferred_sample_rate(lc->sound_conf.play_sndcard, call->localdesc->streams[0].max_rate);
}
audio_stream_prepare_sound(call->audiostream,lc->sound_conf.play_sndcard,lc->sound_conf.capt_sndcard);
if (!lc->use_files)
audio_stream_prepare_sound(call->audiostream,lc->sound_conf.play_sndcard,lc->sound_conf.capt_sndcard);
}
}
real_url=linphone_address_as_string( destination ? destination : call->log->to);
@ -3612,7 +3613,7 @@ int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call,
ms_snd_card_set_preferred_sample_rate(lc->sound_conf.capt_sndcard, call->localdesc->streams[0].max_rate);
}
if (!was_ringing && call->audiostream->ms.state==MSStreamInitialized){
if (!was_ringing && call->audiostream->ms.state==MSStreamInitialized && !lc->use_files){
audio_stream_prepare_sound(call->audiostream,lc->sound_conf.play_sndcard,lc->sound_conf.capt_sndcard);
}

2
mediastreamer2

@ -1 +1 @@
Subproject commit 5a0a6c56ab973a920e275708e732ed5c4688aa4d
Subproject commit 5ca97404c6466c6bec2a44deddaadb48a522c2b8