Merge branch 'dev_sal' of belledonne-communications.com:linphone-private into dev_sal

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 2006453b319ec3c9a7d663d0453e07781307fd48..ee515f4e992ff208dc628e528bb5e31cd92fa644 100644 (file)
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -238,6 +238,14 @@ SipSetup *linphone_proxy_config_get_sip_setup(LinphoneProxyConfig *cfg);
  * normalize a human readable phone number into a basic string. 888-444-222 becomes 888444222
  */
 int linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const char *username, char *result, size_t result_len);
+/*
+ *  attached a user data to a proxy config
+ */
+void linphone_proxy_config_set_user_data(LinphoneProxyConfig *cr, void * ud);
+/*
+ *  get user data to a proxy config. return null if any
+ */
+void * linphone_proxy_config_get_user_data(LinphoneProxyConfig *cr);
 
 /**
  * @}

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index a133e21168551486cdf9fab4c351672956134d5b..7acf1cede999a7611cd1c19b10719fffac591d44 100644 (file)
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -193,6 +193,10 @@ extern "C" int Java_org_linphone_core_LinphoneCoreImpl_addProxyConfig(     JNIEnv*
                ,jobject  thiz
                ,jlong lc
                ,jlong pc) {
+       LinphoneProxyConfig* proxy = (LinphoneProxyConfig*)pc;
+       linphone_proxy_config_set_user_data(proxy
+                                                                               ,env->NewGlobalRef((jobject)linphone_proxy_config_get_user_data(proxy)));
+
        return linphone_core_add_proxy_config((LinphoneCore*)lc,(LinphoneProxyConfig*)pc);
 }
 
@@ -281,10 +285,18 @@ extern "C" float Java_org_linphone_core_LinphoneCoreImpl_getSoftPlayLevel(        JNIEn
                return linphone_core_get_soft_play_level((LinphoneCore*)lc);
 }
 
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_muteMic(       JNIEnv*  env
+               ,jobject  thiz
+               ,jlong lc
+               ,jboolean isMuted) {
+               linphone_core_mute_mic((LinphoneCore*)lc,isMuted);
+}
 //ProxyConfig
 
 extern "C" jlong Java_org_linphone_core_LinphoneProxyConfigImpl_newLinphoneProxyConfig(JNIEnv*  env,jobject  thiz) {
-       return  (jlong) linphone_proxy_config_new();
+       LinphoneProxyConfig* proxy = linphone_proxy_config_new();
+       linphone_proxy_config_set_user_data(proxy,thiz);
+       return  (jlong) proxy;
 }
 
 extern "C" void Java_org_linphone_core_LinphoneProxyConfigImpl_delete(JNIEnv*  env,jobject  thiz,jlong ptr) {

diff --git a/coreapi/private.h b/coreapi/private.h
index 4125936ffe4e1da5cf0eb34c696182e70cdf74d1..a3f2155f6e887b35420189de56bd330cc1bd544b 100644 (file)
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -205,6 +205,7 @@ struct _LinphoneProxyConfig
        bool_t registered;
        bool_t publish;
        bool_t dial_escape_plus;
+       void* user_data;
 };
 
 struct _LinphoneAuthInfo 

diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index ad59c06f86fd5b687b3ec6ac32054ac5fbc58553..d31046b80b7e35df6fb941e71162eeba1bd51e7c 100644 (file)
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -737,5 +737,13 @@ void linphone_account_creator_destroy(LinphoneAccountCreator *obj){
        }
 }
 
+void linphone_proxy_config_set_user_data(LinphoneProxyConfig *cr, void * ud) {
+       cr->user_data=ud;
+}
+
+void * linphone_proxy_config_get_user_data(LinphoneProxyConfig *cr) {
+       return cr->user_data;
+}
+