Fix audio stream accidentally muted if early media was received.

This commit is contained in:
Simon Morlat 2016-10-10 11:47:56 +02:00
parent 88e41d4893
commit 0a9176ebba
2 changed files with 6 additions and 4 deletions

View file

@ -5114,7 +5114,7 @@ void linphone_core_enable_mic(LinphoneCore *lc, bool_t enable) {
call = (LinphoneCall *)elem->data;
call->audio_muted = !enable;
if (call->audiostream)
linphone_core_mute_audio_stream(lc, call->audiostream, enable);
linphone_core_mute_audio_stream(lc, call->audiostream, call->audio_muted);
}
}

View file

@ -254,19 +254,21 @@ static void simple_conference_base(LinphoneCoreManager* marie, LinphoneCoreManag
bool_t is_remote_conf;
bool_t focus_is_up = (focus && ((LinphoneConferenceServer *)focus)->reg_state == LinphoneRegistrationOk);
bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
lcs=bctbx_list_append(lcs,pauline->lc);
lcs=bctbx_list_append(lcs,laure->lc);
if(focus) lcs=bctbx_list_append(lcs,focus->lc);
if (focus) lcs=bctbx_list_append(lcs,focus->lc);
is_remote_conf = (strcmp(lp_config_get_string(marie->lc->config, "misc", "conference_type", "local"), "remote") == 0);
if(is_remote_conf) BC_ASSERT_PTR_NOT_NULL(focus);
BC_ASSERT_TRUE(call(marie,pauline));
if (!BC_ASSERT_TRUE(call(marie,pauline))) goto end;
marie_call_pauline=linphone_core_get_current_call(marie->lc);
pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
BC_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie));
BC_ASSERT_TRUE(call(marie,laure));
if (!BC_ASSERT_TRUE(call(marie,laure))) goto end;
initial_marie_stat=marie->stat;
initial_pauline_stat=pauline->stat;
initial_laure_stat=laure->stat;