From d3f2881587ed012e6b9136edd7e2eac2d534a5ef Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 29 Jan 2015 11:45:00 +0100 Subject: [PATCH] Fix android build --- coreapi/linphonecore_jni.cc | 7 ++++--- mediastreamer2 | 2 +- oRTP | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index fd89d9578..10e4bb2ab 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -29,6 +29,7 @@ extern "C" { #include "mediastreamer2/mscommon.h" #include "mediastreamer2/dsptools.h" #include "mediastreamer2/msmediaplayer.h" +#include "mediastreamer2/msutils.h" } #include "mediastreamer2/msjava.h" #include "private.h" @@ -420,7 +421,7 @@ public: if (fileTransferRecvId) { vTable->file_transfer_recv = fileTransferRecv; } - + logCollectionUploadStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$LogCollectionUploadState")); logCollectionUploadStateFromIntId = env->GetStaticMethodID(logCollectionUploadStateClass, "fromInt", "(I)Lorg/linphone/core/LinphoneCore$LogCollectionUploadState;"); logCollectionUploadProgressId = env->GetMethodID(listenerClass, "uploadProgressIndication", "(Lorg/linphone/core/LinphoneCore;II)V"); @@ -810,7 +811,7 @@ public: ms_error("cannot attach VM"); return; } - + LinphoneCoreVTable *table = (LinphoneCoreVTable*) data; if (table) { LinphoneCoreData* lcData = (LinphoneCoreData*) linphone_core_v_table_get_user_data(table); @@ -1832,7 +1833,7 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_startEchoCalibration(JNI LinphoneCoreVTable *vTable = linphone_core_v_table_new(); LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, data); linphone_core_v_table_set_user_data(vTable, ldata); - + return (jint)linphone_core_start_echo_calibration((LinphoneCore*)lc, ldata->ecCalibrationStatus, NULL, NULL, vTable); } diff --git a/mediastreamer2 b/mediastreamer2 index a7f233d15..923716634 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit a7f233d15940315f9d1362e2aea1a5bc2220268d +Subproject commit 9237166347c79198fb2b43930143573a8a97766d diff --git a/oRTP b/oRTP index f16c49c5f..e54ac4094 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit f16c49c5f1372f6d7dfd55c3f7f43d4bdad80a03 +Subproject commit e54ac40941b30d15c3981ec374b02b0a06de2120