mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-19 03:58:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix android build

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-01-29 11:45:00 +01:00
parent 37c17e2703
commit d3f2881587
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
coreapi/linphonecore_jni.cc
View file

@ -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);
}

2
mediastreamer2

@ -1 +1 @@
Subproject commit a7f233d15940315f9d1362e2aea1a5bc2220268d
Subproject commit 9237166347c79198fb2b43930143573a8a97766d

2
oRTP

@ -1 +1 @@
Subproject commit f16c49c5f1372f6d7dfd55c3f7f43d4bdad80a03
Subproject commit e54ac40941b30d15c3981ec374b02b0a06de2120