From 22f6228c961a0621bff573e242cd5674a638cebe Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 4 Jun 2014 16:31:29 +0200 Subject: [PATCH] fix android build --- coreapi/linphonecore_jni.cc | 4 ++++ java/common/org/linphone/core/LinphoneProxyConfig.java | 3 ++- mediastreamer2 | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index e1f2da371..a24d2c589 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -2948,6 +2948,10 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneProxyConfigImpl_enableAvpf linphone_proxy_config_enable_avpf((LinphoneProxyConfig *)ptr, (bool)enable); } +JNIEXPORT jboolean JNICALL Java_org_linphone_core_LinphoneProxyConfigImpl_avpfEnabled(JNIEnv *env, jobject thiz, jlong ptr) { + return linphone_proxy_config_avpf_enabled((LinphoneProxyConfig *)ptr); +} + JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneProxyConfigImpl_setAvpfRRInterval(JNIEnv *env, jobject thiz, jlong ptr, jint interval) { linphone_proxy_config_set_avpf_rr_interval((LinphoneProxyConfig *)ptr, (uint8_t)interval); } diff --git a/java/common/org/linphone/core/LinphoneProxyConfig.java b/java/common/org/linphone/core/LinphoneProxyConfig.java index 5c2b8f1e6..ded4f9457 100644 --- a/java/common/org/linphone/core/LinphoneProxyConfig.java +++ b/java/common/org/linphone/core/LinphoneProxyConfig.java @@ -183,8 +183,9 @@ public interface LinphoneProxyConfig { /** * Whether AVPF is used for calls through this proxy. + * @return */ - void avpfEnabled(); + boolean avpfEnabled(); /** * Set optional contact parameters that will be added to the contact information sent in the registration. diff --git a/mediastreamer2 b/mediastreamer2 index e0ff32eeb..9c3d93635 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit e0ff32eebb29671e855cb3cfe9c0ea46929419b4 +Subproject commit 9c3d936356fe4d4c8a1fa8ca57a47598ece44f81