From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 8 Nov 2011 15:21:25 +0000 (+0100)
Subject: test if sample rate is supported by android sound card, remove areStreamsEncrypted... 
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=32527a1bc1100ef99cc02823f617943d73d2d4ca

test if sample rate is supported by android sound card, remove areStreamsEncrypted from Android
---

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 1bd7d091..fb62302a 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1577,9 +1577,6 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCallImpl_isAuthenticationToke
 	LinphoneCall *call = (LinphoneCall *) ptr;
 	return linphone_call_get_authentication_token_verified(call);
 }
-extern "C" jboolean Java_org_linphone_core_LinphoneCallImpl_areStreamsEncrypted(JNIEnv*  env,jobject thiz,jlong ptr) {
-	return linphone_call_are_all_streams_encrypted((LinphoneCall *) ptr);
-}
 
 extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_soundResourcesLocked(JNIEnv* env,jobject thiz,jlong ptr){
 	return linphone_core_sound_resources_locked((LinphoneCore *) ptr);
diff --git a/java/common/org/linphone/core/LinphoneCall.java b/java/common/org/linphone/core/LinphoneCall.java
index b4a38667..1c4b0e85 100644
--- a/java/common/org/linphone/core/LinphoneCall.java
+++ b/java/common/org/linphone/core/LinphoneCall.java
@@ -223,6 +223,5 @@ public interface LinphoneCall {
 	
 	String getAuthenticationToken();
 	boolean isAuthenticationTokenVerified();
-	boolean areStreamsEncrypted();
 	boolean isInConference();
 }
diff --git a/mediastreamer2 b/mediastreamer2
index 548a7f01..e39ed394 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 548a7f014b5066d1d4571f91eb4440aefa35244b
+Subproject commit e39ed3940eb2d4c0589ea488f9a2eba5a335f059