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

Use create_core_2 in Java wrapper

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-19 11:36:30 +02:00
parent 95ead0586a
commit f545d1d955
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wrappers/java/java_class.mustache
View file

@ -97,7 +97,7 @@ public {{#isLinphoneFactory}}abstract class{{/isLinphoneFactory}}{{#isNotLinphon
abstract public void setDebugMode(boolean enable, String tag);
abstract public Core createCore(CoreListener listener, String configPath, String factoryConfigPath);
abstract public Core createCore(CoreListener listener, String configPath, String factoryConfigPath, Context context);
{{/isLinphoneFactory}}
{{#isLinphoneCore}}
@ -171,10 +171,10 @@ class {{classImplName}} {{#isLinphoneFactory}}extends{{/isLinphoneFactory}}{{#is
@Override
public native void setDebugMode(boolean enable, String tag);
private native Core createCore(Factory factory, CoreListener listener, String configPath, String factoryConfigPath);
private native Core createCore(Factory factory, CoreListener listener, String configPath, String factoryConfigPath, Context context);
@Override
public Core createCore(CoreListener listener, String configPath, String factoryConfigPath) {
return createCore(this, listener, configPath, factoryConfigPath);
public Core createCore(CoreListener listener, String configPath, String factoryConfigPath, Context context) {
return createCore(this, listener, configPath, factoryConfigPath, context);
}
{{/isLinphoneFactory}}

4
wrappers/java/jni.mustache
View file

@ -363,7 +363,7 @@ jobject Java_{{jni_package}}CoreImpl_getMediastreamerFactory(JNIEnv *env, jobjec
return env->NewObject(ljb->ms_factory_class, ljb->ms_factory_class_constructor, (jlong)factory);
}
jobject Java_{{jni_package}}FactoryImpl_createCore(JNIEnv *env, jobject thiz, jobject jfactory, jobject jlistener, jstring jconfig_path, jstring jfactory_config_path) {
jobject Java_{{jni_package}}FactoryImpl_createCore(JNIEnv *env, jobject thiz, jobject jfactory, jobject jlistener, jstring jconfig_path, jstring jfactory_config_path, jobject jcontext) {
LinphoneFactory *cptr = linphone_factory_get();
SetObjectNativePtr(env, jfactory, (jlong)cptr); // Set the C factory ptr as Factory.nativePtr for next factory calls
@ -409,7 +409,7 @@ jobject Java_{{jni_package}}FactoryImpl_createCore(JNIEnv *env, jobject thiz, jo
linphone_core_cbs_set_log_collection_upload_state_changed(cbs, linphone_core_on_log_collection_upload_state_changed);
linphone_core_cbs_set_dtmf_received(cbs, linphone_core_on_dtmf_received);
core = linphone_factory_create_core(linphone_factory_get(), cbs, config_path, factory_config_path);
core = linphone_factory_create_core_2(linphone_factory_get(), cbs, config_path, factory_config_path, NULL, (void *)jcontext);
ReleaseStringUTFChars(env, jconfig_path, config_path);
ReleaseStringUTFChars(env, jfactory_config_path, factory_config_path);