From 7ea99b5a4c0c828d21482ede94f71c85c2d1cfd2 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 20 Oct 2011 15:12:50 +0200 Subject: [PATCH] fix mute button that did not work anymore, fix missing symbols --- coreapi/linphonecore.c | 3 ++- mediastreamer2 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 49a9aa9c2..0f8901fa9 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -384,7 +384,7 @@ static void sound_config_read(LinphoneCore *lc) ms_snd_card_manager_add_card(ms_snd_card_manager_get(),card); } tmp=lp_config_get_int(lc->config,"sound","alsa_forced_rate",-1); - ms_alsa_card_set_forced_sample_rate(tmp); + if (tmp>0) ms_alsa_card_set_forced_sample_rate(tmp); #endif /* retrieve all sound devices */ build_sound_devices_table(lc); @@ -3065,6 +3065,7 @@ void linphone_core_mute_mic(LinphoneCore *lc, bool_t val){ ms_warning("linphone_core_mute_mic(): No current call !"); return; }else{ + st=call->audiostream; call->audio_muted=val; } if (st!=NULL){ diff --git a/mediastreamer2 b/mediastreamer2 index 00dfc7dd6..ba5d625fb 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 00dfc7dd6aab93dcc9b81527370842b38fc3987d +Subproject commit ba5d625fb8609f2af2487dd165d227641cd7b898