From 869a6a85ab79d5027538d65c960ec0207ea7aae1 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 25 Mar 2010 15:38:05 +0100
Subject: [PATCH] add linphone_core_is_mic_muted method

---
 coreapi/linphonecore.c      | 9 +++++++++
 coreapi/linphonecore.h      | 6 ++++++
 coreapi/linphonecore_jni.cc | 6 ++++++
 mediastreamer2              | 2 +-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index fc9fef5f1..65b11d3c3 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -2780,6 +2780,15 @@ void linphone_core_mute_mic(LinphoneCore *lc, bool_t val){
 	}
 }
 
+bool_t linphone_core_is_mic_muted(LinphoneCore *lc) {
+	float gain=1.0;
+	if (lc->audiostream && lc->audiostream->volsend){
+			ms_filter_call_method(lc->audiostream->volsend,MS_VOLUME_GET_GAIN,&gain);
+	}else ms_warning("Could not get gain: gain control wasn't activated. ");
+
+	return gain==0;
+}
+
 void linphone_core_enable_agc(LinphoneCore *lc, bool_t val){
 	lc->sound_conf.agc=val;
 }
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index ee515f4e9..2582cfbee 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -667,6 +667,12 @@ void linphone_core_enable_agc(LinphoneCore *lc, bool_t val);
 bool_t linphone_core_agc_enabled(const LinphoneCore *lc);
 
 void linphone_core_mute_mic(LinphoneCore *lc, bool_t muted);
+/**
+ * return mic state.
+ *
+ * @ingroup media_parameters
+**/
+bool_t linphone_core_is_mic_muted(LinphoneCore *lc);
 
 void linphone_core_set_presence_info(LinphoneCore *lc,int minutes_away,const char *contact,LinphoneOnlineStatus os);
 
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 04373c159..e65193e3b 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -329,6 +329,12 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_clearCallLogs(JNIEnv*  e
 																		,jlong lc) {
 	linphone_core_clear_call_logs((LinphoneCore*)lc);
 }
+extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isMicMuted(	JNIEnv*  env
+		,jobject  thiz
+		,jlong lc) {
+	return linphone_core_is_mic_muted((LinphoneCore*)lc);
+}
+
 
 
 //ProxyConfig
diff --git a/mediastreamer2 b/mediastreamer2
index 6d48f5ac0..af7bfe348 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 6d48f5ac0b1e1df8f455c7b26824dae631663cc8
+Subproject commit af7bfe348919a44cec3f10cc3a3b5ade3483784f