From 2b7f2fd1cb82b2c36014f03914f02e3325990da4 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 5 Feb 2015 14:40:20 +0100 Subject: [PATCH] Finilize multicast api java binding --- build/android/liblinphone_tester.mk | 3 +- coreapi/linphonecore_jni.cc | 50 ++++++++----------- .../org/linphone/core/LinphoneCoreImpl.java | 4 +- 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/build/android/liblinphone_tester.mk b/build/android/liblinphone_tester.mk index d92bb60b5..9f1ab7408 100644 --- a/build/android/liblinphone_tester.mk +++ b/build/android/liblinphone_tester.mk @@ -19,7 +19,8 @@ common_SRC_FILES := \ player_tester.c \ dtmf_tester.c \ accountmanager.c \ - offeranswer_tester.c + offeranswer_tester.c \ + multicast_call_tester.c common_C_INCLUDES += \ $(LOCAL_PATH) \ diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index d093a3e30..7c5736705 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -5631,9 +5631,9 @@ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoMulticas * Signature: (J)Ljava/lang/String; */ extern "C" jstring JNICALL Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticastAddr - (JNIEnv *, jobject, jlong) { - ms_error("Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticastAddr not implemented yet"); - return NULL; + (JNIEnv *env , jobject, jlong ptr) { + const char *tmp=linphone_core_get_audio_multicast_addr((LinphoneCore*)ptr); + return tmp ? env->NewStringUTF(tmp) : NULL; } /* @@ -5642,9 +5642,9 @@ extern "C" jstring JNICALL Java_org_linphone_core_LinphoneCoreImpl_getAudioMulti * Signature: (J)Ljava/lang/String; */ extern "C" jstring JNICALL Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticastAddr - (JNIEnv *, jobject, jlong) { - ms_error("Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticastAddr not implemented yet"); - return NULL; + (JNIEnv * env, jobject, jlong ptr) { + const char *tmp=linphone_core_get_video_multicast_addr((LinphoneCore*)ptr); + return tmp ? env->NewStringUTF(tmp) : NULL; } /* @@ -5653,9 +5653,8 @@ extern "C" jstring JNICALL Java_org_linphone_core_LinphoneCoreImpl_getVideoMulti * Signature: (JI)I */ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setAudioMulticastTtl - (JNIEnv *, jobject, jlong, jint) { - ms_error("Java_org_linphone_core_LinphoneCoreImpl_setAudioMulticastTtl not implemented yet"); - return -1; + (JNIEnv *, jobject, jlong ptr, jint value) { + return linphone_core_set_audio_multicast_ttl((LinphoneCore*)ptr,value); } /* @@ -5664,9 +5663,8 @@ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setAudioMulticas * Signature: (JI)I */ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoMulticastTtl - (JNIEnv *, jobject, jlong, jint) { - ms_error("Java_org_linphone_core_LinphoneCoreImpl_setVideoMulticastTtl not implemented yet"); - return -1; + (JNIEnv *, jobject, jlong ptr, jint value) { + return linphone_core_set_video_multicast_ttl((LinphoneCore*)ptr,value); } /* @@ -5675,9 +5673,8 @@ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoMulticas * Signature: (J)I */ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticastTtl - (JNIEnv *, jobject, jlong) { - ms_error("Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticastTtl not implemented yet"); - return -1; + (JNIEnv *, jobject, jlong ptr) { + return linphone_core_get_audio_multicast_ttl((LinphoneCore*)ptr); } /* @@ -5686,9 +5683,8 @@ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getAudioMulticas * Signature: (J)I */ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticastTtl - (JNIEnv *, jobject, jlong) { - ms_error("Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticastTtl not implemented yet"); - return -1; + (JNIEnv *, jobject, jlong ptr) { + return linphone_core_get_video_multicast_ttl((LinphoneCore*)ptr); } /* @@ -5697,8 +5693,8 @@ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getVideoMulticas * Signature: (JZ)V */ extern "C" void JNICALL Java_org_linphone_core_LinphoneCoreImpl_enableAudioMulticast - (JNIEnv *, jobject, jlong, jboolean) { - ms_error("Java_org_linphone_core_LinphoneCoreImpl_enableAudioMulticast not implemented yet"); + (JNIEnv *, jobject, jlong ptr, jboolean yesno) { + return linphone_core_enable_audio_multicast((LinphoneCore*)ptr,yesno); } /* @@ -5707,9 +5703,8 @@ extern "C" void JNICALL Java_org_linphone_core_LinphoneCoreImpl_enableAudioMulti * Signature: (J)Z */ extern "C" jboolean JNICALL Java_org_linphone_core_LinphoneCoreImpl_audioMulticastEnabled - (JNIEnv *, jobject, jlong) { - ms_error("Java_org_linphone_core_LinphoneCoreImpl_audioMulticastEnabled not implemented yet"); - return false; + (JNIEnv *, jobject, jlong ptr) { + return linphone_core_audio_multicast_enabled((LinphoneCore*)ptr); } /* @@ -5718,8 +5713,8 @@ extern "C" jboolean JNICALL Java_org_linphone_core_LinphoneCoreImpl_audioMultica * Signature: (JZ)V */ extern "C" void JNICALL Java_org_linphone_core_LinphoneCoreImpl_enableVideoMulticast - (JNIEnv *, jobject, jlong, jboolean) { - ms_error("Java_org_linphone_core_LinphoneCoreImpl_enableVideoMulticast not implemented yet"); + (JNIEnv *, jobject, jlong ptr, jboolean yesno) { + return linphone_core_enable_video_multicast((LinphoneCore*)ptr,yesno); } /* @@ -5728,9 +5723,8 @@ extern "C" void JNICALL Java_org_linphone_core_LinphoneCoreImpl_enableVideoMulti * Signature: (J)Z */ extern "C" jboolean JNICALL Java_org_linphone_core_LinphoneCoreImpl_videoMulticastEnabled - (JNIEnv *, jobject, jlong) { - ms_error("Java_org_linphone_core_LinphoneCoreImpl_videoMulticastEnabled not implemented yet"); - return false; + (JNIEnv *, jobject, jlong ptr) { + return linphone_core_video_multicast_enabled((LinphoneCore*)ptr); } diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java index 11f62619c..fd1796102 100644 --- a/java/impl/org/linphone/core/LinphoneCoreImpl.java +++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java @@ -1381,12 +1381,12 @@ public class LinphoneCoreImpl implements LinphoneCore { private native String getAudioMulticastAddr(long ptr); @Override public String getAudioMulticastAddr() { - return getAudioMulticastAddr() ; + return getAudioMulticastAddr(nativePtr) ; } private native String getVideoMulticastAddr(long ptr); @Override public String getVideoMulticastAddr() { - return getVideoMulticastAddr(); + return getVideoMulticastAddr(nativePtr); } private native int setAudioMulticastTtl(long ptr,int ttl); @Override