Commit d3f28815 authored by Gautier Pelloux-Prayer's avatar Gautier Pelloux-Prayer
Browse files

Fix android build

parent 37c17e27
......@@ -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);
}
......
mediastreamer2 @ 92371663
Subproject commit a7f233d15940315f9d1362e2aea1a5bc2220268d
Subproject commit 9237166347c79198fb2b43930143573a8a97766d
oRTP @ e54ac409
Subproject commit f16c49c5f1372f6d7dfd55c3f7f43d4bdad80a03
Subproject commit e54ac40941b30d15c3981ec374b02b0a06de2120
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment