Skip to content
Snippets Groups Projects
Commit 52ade675 authored by Lyubomir Marinov's avatar Lyubomir Marinov
Browse files

Provides compatibility with r [dx] UNEXPECTED TOP-LEVEL EXCEPTION:

parent 55e9514a
No related branches found
No related tags found
No related merge requests found
...@@ -8,12 +8,20 @@ ...@@ -8,12 +8,20 @@
#ifndef _JAWTRENDERER_H_ #ifndef _JAWTRENDERER_H_
#define _JAWTRENDERER_H_ #define _JAWTRENDERER_H_
#include <jawt.h> #ifndef __ANDROID__
#include <jawt.h>
#else /* #ifndef __ANDROID__ */
typedef void JAWT_DrawingSurfaceInfo;
#endif /* #ifndef __ANDROID__ */
#include <jni.h> #include <jni.h>
#ifndef NULL
#define NULL 0
#endif /* #ifndef NULL */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif /* #ifdef __cplusplus */
void JAWTRenderer_close void JAWTRenderer_close
(JNIEnv *env, jclass clazz, jlong handle, jobject component); (JNIEnv *env, jclass clazz, jlong handle, jobject component);
...@@ -31,6 +39,6 @@ jstring JAWTRenderer_sysctlbyname(JNIEnv *env, jstring name); ...@@ -31,6 +39,6 @@ jstring JAWTRenderer_sysctlbyname(JNIEnv *env, jstring name);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" { */ } /* extern "C" { */
#endif #endif /* #ifdef __cplusplus */
#endif /* _JAWTRENDERER_H_ */ #endif /* _JAWTRENDERER_H_ */
...@@ -27,6 +27,9 @@ Java_org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer_paint ...@@ -27,6 +27,9 @@ Java_org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer_paint
(JNIEnv *env, jclass clazz, jlong handle, jobject component, jobject g, (JNIEnv *env, jclass clazz, jlong handle, jobject component, jobject g,
jint zOrder) jint zOrder)
{ {
#ifdef __ANDROID__
return JAWTRenderer_paint(0, NULL, clazz, handle, g, zOrder);
#else /* #ifdef __ANDROID__ */
JAWT awt; JAWT awt;
jboolean awtIsAvailable; jboolean awtIsAvailable;
jboolean wantsPaint; jboolean wantsPaint;
...@@ -93,6 +96,7 @@ Java_org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer_paint ...@@ -93,6 +96,7 @@ Java_org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer_paint
} }
} }
return wantsPaint; return wantsPaint;
#endif /* #ifdef __ANDROID__ */
} }
JNIEXPORT jboolean JNICALL JNIEXPORT jboolean JNICALL
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment