Skip to content

GitLab

Commit 4218b92e authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix preview window global refs on Android.

parent 6528037a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
coreapi/linphonecore_jni.cc
View file @ 4218b92e
...@@ -1932,13 +1932,13 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setVideoWindowId(JNIEnv* ...@@ -1932,13 +1932,13 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setVideoWindowId(JNIEnv*
,jlong lc ,jlong lc
,jobject obj) { ,jobject obj) {
jobject oldWindow = (jobject) linphone_core_get_native_video_window_id((LinphoneCore*)lc); jobject oldWindow = (jobject) linphone_core_get_native_video_window_id((LinphoneCore*)lc);
if (oldWindow != NULL) {
env->DeleteGlobalRef(oldWindow);
}
if (obj != NULL) { if (obj != NULL) {
obj = env->NewGlobalRef(obj); obj = env->NewGlobalRef(obj);
} }
linphone_core_set_native_video_window_id((LinphoneCore*)lc,(unsigned long)obj); linphone_core_set_native_video_window_id((LinphoneCore*)lc,(unsigned long)obj);
if (oldWindow != NULL) {
env->DeleteGlobalRef(oldWindow);
}
} }
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPreviewWindowId(JNIEnv* env extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPreviewWindowId(JNIEnv* env
...@@ -1946,13 +1946,13 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPreviewWindowId(JNIEn ...@@ -1946,13 +1946,13 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPreviewWindowId(JNIEn
,jlong lc ,jlong lc
,jobject obj) { ,jobject obj) {
jobject oldWindow = (jobject) linphone_core_get_native_preview_window_id((LinphoneCore*)lc); jobject oldWindow = (jobject) linphone_core_get_native_preview_window_id((LinphoneCore*)lc);
if (oldWindow != NULL) {
env->DeleteGlobalRef(oldWindow);
}
if (obj != NULL) { if (obj != NULL) {
obj = env->NewGlobalRef(obj); obj = env->NewGlobalRef(obj);
} }
linphone_core_set_native_preview_window_id((LinphoneCore*)lc,(unsigned long)obj); linphone_core_set_native_preview_window_id((LinphoneCore*)lc,(unsigned long)obj);
if (oldWindow != NULL) {
env->DeleteGlobalRef(oldWindow);
}
} }
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDeviceRotation(JNIEnv* env extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDeviceRotation(JNIEnv* env
......
mediastreamer2 @ cab341d5
Subproject commit 0c0a3a36d2352d53053ab8b9255b48b6b05843ae Subproject commit cab341d59bc4d37f82ddccbfcf1ae2563f9c5028
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