From 2b7bd0b0e4c01ae08cb8064d2c70528b9770a807 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 20 Jul 2010 17:38:39 +0200 Subject: [PATCH] add Android sound card support --- coreapi/linphonecore_jni.cc | 6 +++--- mediastreamer2 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index fcf3cc1ce..67da96a02 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern "C" void libmsilbc_init(); #endif /*ANDROID*/ -extern "C" void ms_andsnd_register_card(JavaVM *jvm) ; +extern "C" void ms_andsnd_set_jvm(JavaVM *jvm) ; static JavaVM *jvm=0; #ifdef ANDROID @@ -44,7 +44,7 @@ static void linphone_android_log_handler(OrtpLogLevel lev, const char *fmt, va_l JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *ajvm, void *reserved) { #ifdef ANDROID - ms_andsnd_register_card(ajvm); + ms_andsnd_set_jvm(ajvm); #endif /*ANDROID*/ jvm=ajvm; return JNI_VERSION_1_2; @@ -161,7 +161,7 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv* const char* factoryConfig = env->GetStringUTFChars(jfactoryConfig, NULL); LinphoneCoreData* ldata = new LinphoneCoreData(env,thiz,jlistener,juserdata); #ifdef ANDROID - ms_andsnd_register_card(jvm); + ms_andsnd_set_jvm(jvm); #endif /*ANDROID*/ #ifdef HAVE_ILBC diff --git a/mediastreamer2 b/mediastreamer2 index c6d39ca3e..45b7c4ce2 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit c6d39ca3e664ad89a8c437f630817334ada056ca +Subproject commit 45b7c4ce2aa39d313e4cfdd933bf3d795cc6bf24