From 0a2996512ba2b7c938c3f3166e73385b77051869 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 2 Feb 2011 22:20:08 +0100 Subject: [PATCH] add getReplacedCall() --- build/android/Android.mk | 2 +- coreapi/linphonecore_jni.cc | 6 ++++++ java/common/org/linphone/core/LinphoneCall.java | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/build/android/Android.mk b/build/android/Android.mk index a292a0ec0..48a4c75be 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -53,7 +53,7 @@ LOCAL_CFLAGS += \ -D_BYTE_ORDER=_LITTLE_ENDIAN \ -DORTP_INET6 \ -DENABLE_TRACE \ - -DLINPHONE_VERSION=\"Linphone-3.3.x\" \ + -DLINPHONE_VERSION=\"3.4.0\" \ -DLINPHONE_PLUGINS_DIR=\"\\tmp\" \ -DLOG_DOMAIN=\"Linphone\" diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index f8b246ace..1284f81b2 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -989,6 +989,12 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCallImpl_isEchoLimiterEnabled return linphone_call_echo_limiter_enabled((LinphoneCall*)ptr); } +extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getReplacedCall( JNIEnv* env + ,jobject thiz + ,jlong ptr) { + return (jlong)linphone_call_get_replaced_call((LinphoneCall*)ptr); +} + //LinphoneFriend extern "C" long Java_org_linphone_core_LinphoneFriendImpl_newLinphoneFriend(JNIEnv* env diff --git a/java/common/org/linphone/core/LinphoneCall.java b/java/common/org/linphone/core/LinphoneCall.java index 29f7f1455..545793eee 100644 --- a/java/common/org/linphone/core/LinphoneCall.java +++ b/java/common/org/linphone/core/LinphoneCall.java @@ -178,5 +178,9 @@ public interface LinphoneCall { * @return true if echo limiter is enabled. */ public boolean isEchoLimiterEnabled(); - + /** + * Returns the object associated to a call this one is replacing. + * Call replacement can occur during transfer scenarios. + */ + public LinphoneCall getReplacedCall(); }