Changeset 5032 for pjproject

Timestamp:

Mar 26, 2015 10:57:05 AM (10 years ago)

Author:

nanang

Message:

Re #1790: Fixed error build of undefined "ANativeWindow_fromSurface()" when video is disabled.

Location:

pjproject/trunk/pjsip-apps/src

Files:

• pjsua/android/jni/pjsua.i (modified) (1 diff)
• swig/pjsua2.i (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/pjsua/android/jni/pjsua.i

@@ -4 +4 @@
 #include "pjsua_app_callback.h"
 #include "../../pjsua_app.h"
-#include <android/native_window_jni.h>
+
+#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO!=0
+#  include <android/native_window_jni.h>
+#else
+#  define ANativeWindow_fromSurface(a,b) NULL
+#endif
 %}
 

pjproject/trunk/pjsip-apps/src/swig/pjsua2.i

@@ -104 +104 @@
 /* pj::WindowHandle::setWindow() receives Surface object */
 #if defined(SWIGJAVA) && defined(__ANDROID__)
-%{#include <android/native_window_jni.h>%}
+%{
+#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO!=0
+#  include <android/native_window_jni.h>
+#else
+#  define ANativeWindow_fromSurface(a,b) NULL
+#endif
+%}
 %ignore pj::WindowHandle::display;
 %ignore pj::WindowHandle::window;