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

fix potential crash at end of conference

Browse source
This commit is contained in:
Simon Morlat 2011-11-14 13:50:17 +01:00
parent f73c27ab0f
commit 40fd07b9b3
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
coreapi/conference.c
View file

@ -43,6 +43,7 @@ static void remove_local_endpoint(LinphoneConference *ctx){
ctx->local_endpoint=NULL;
audio_stream_stop(ctx->local_participant);
ctx->local_participant=NULL;
rtp_profile_destroy(ctx->local_dummy_profile);
}
}
@ -96,9 +97,9 @@ static void add_local_endpoint(LinphoneConference *conf,LinphoneCore *lc){
lc->sound_conf.lsd_card : lc->sound_conf.play_sndcard;
MSSndCard *captcard=lc->sound_conf.capt_sndcard;
const MSAudioConferenceParams *params=ms_audio_conference_get_params(conf->conf);
RtpProfile *prof=make_dummy_profile(params->samplerate);
conf->local_dummy_profile=make_dummy_profile(params->samplerate);
audio_stream_start_full(st, prof,
audio_stream_start_full(st, conf->local_dummy_profile,
"127.0.0.1",
65000,
65001,
@ -114,8 +115,7 @@ static void add_local_endpoint(LinphoneConference *conf,LinphoneCore *lc){
conf->local_participant=st;
conf->local_endpoint=ms_audio_endpoint_get_from_stream(st,FALSE);
ms_audio_conference_add_member(conf->conf,conf->local_endpoint);
/*normally and exceptionnaly, the profile is no more accessed past this point*/
rtp_profile_destroy(prof);
}
float linphone_core_get_conference_local_input_volume(LinphoneCore *lc){

1
coreapi/private.h
View file

@ -405,6 +405,7 @@ struct _LinphoneConference{
MSAudioConference *conf;
AudioStream *local_participant;
MSAudioEndpoint *local_endpoint;
RtpProfile *local_dummy_profile;
bool_t local_muted;
};

2
mediastreamer2

@ -1 +1 @@
Subproject commit f7bf945917f71afc050edb0968e3262201572a34
Subproject commit 4ee916b3fcae0aba38a0d595079298242c9ac2cd