From c3122702f7d1ca69496f92b4a1a5d299b51fcdae Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 14 May 2015 08:54:47 +0200
Subject: [PATCH] add wrapper for multicast call param

---
 .../src/org/linphone/tester/Tester.java         |  2 ++
 .../src/org/linphone/tester/WrapperTester.java  | 17 ++++++++++++++++-
 submodules/linphone                             |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/liblinphone_tester/src/org/linphone/tester/Tester.java b/liblinphone_tester/src/org/linphone/tester/Tester.java
index 5359cf58a..aeae460a2 100644
--- a/liblinphone_tester/src/org/linphone/tester/Tester.java
+++ b/liblinphone_tester/src/org/linphone/tester/Tester.java
@@ -40,6 +40,8 @@ public class Tester {
 			//Main library
 			try {
 				System.loadLibrary("linphone-" + abi);
+				System.loadLibrary("linphone_tester-" + abi);
+				
 				Log.i("LinphoneCoreFactoryImpl","Loading done with " + abi);
 				libLoaded=true;
 				break;
diff --git a/liblinphone_tester/src/org/linphone/tester/WrapperTester.java b/liblinphone_tester/src/org/linphone/tester/WrapperTester.java
index e9ea4b869..f0c17300f 100644
--- a/liblinphone_tester/src/org/linphone/tester/WrapperTester.java
+++ b/liblinphone_tester/src/org/linphone/tester/WrapperTester.java
@@ -1,5 +1,6 @@
 package org.linphone.tester;
 
+import org.linphone.core.LinphoneCallParams;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListenerBase;
@@ -19,6 +20,7 @@ public class WrapperTester extends AndroidTestCase {
 	LinphoneCore mCore;
 	@Override
 	protected void runTest() throws Throwable {
+		//multicast begin
 		mCore.enableAudioMulticast(true);
 		Assert.assertEquals(true, mCore.audioMulticastEnabled());
 		mCore.enableAudioMulticast(false);
@@ -29,6 +31,18 @@ public class WrapperTester extends AndroidTestCase {
 		mCore.enableVideoMulticast(false);
 		Assert.assertEquals(false, mCore.videoMulticastEnabled());
 		
+		LinphoneCallParams params = mCore.createDefaultCallParameters();
+		params.enableAudioMulticast(true);
+		Assert.assertEquals(true, params.audioMulticastEnabled());
+		params.enableAudioMulticast(false);
+		Assert.assertEquals(false, params.audioMulticastEnabled());
+		
+		params.enableVideoMulticast(true);
+		Assert.assertEquals(true, params.videoMulticastEnabled());
+		params.enableVideoMulticast(false);
+		Assert.assertEquals(false, params.videoMulticastEnabled());
+		
+		
 		String ip = "224.3.2.1";
 		mCore.setAudioMulticastAddr(ip);
 		Assert.assertEquals(ip, mCore.getAudioMulticastAddr());
@@ -42,7 +56,8 @@ public class WrapperTester extends AndroidTestCase {
 		
 		mCore.setVideoMulticastTtl(4);
 		Assert.assertEquals(4, mCore.getVideoMulticastTtl());
-
+		//multicast end
+		
 		//Test setPrimaryContact
 		String address = "Linphone Android <sip:linphone.android@unknown-host>";
 		mCore.setPrimaryContact(address);
diff --git a/submodules/linphone b/submodules/linphone
index 3b9a71708..38ff54a6b 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 3b9a717089de8d5ff5412021b2ce194c66013443
+Subproject commit 38ff54a6bf747b07e3062de6af02d066ba66ca87