Changeset 5032


Ignore:
Timestamp:
Mar 26, 2015 10:57:05 AM (5 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:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/src/pjsua/android/jni/pjsua.i

    r5030 r5032  
    44#include "pjsua_app_callback.h" 
    55#include "../../pjsua_app.h" 
    6 #include <android/native_window_jni.h> 
     6 
     7#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO!=0 
     8#  include <android/native_window_jni.h> 
     9#else 
     10#  define ANativeWindow_fromSurface(a,b) NULL 
     11#endif 
    712%} 
    813 
  • pjproject/trunk/pjsip-apps/src/swig/pjsua2.i

    r5016 r5032  
    104104/* pj::WindowHandle::setWindow() receives Surface object */ 
    105105#if defined(SWIGJAVA) && defined(__ANDROID__) 
    106 %{#include <android/native_window_jni.h>%} 
     106%{ 
     107#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO!=0 
     108#  include <android/native_window_jni.h> 
     109#else 
     110#  define ANativeWindow_fromSurface(a,b) NULL 
     111#endif 
     112%} 
    107113%ignore pj::WindowHandle::display; 
    108114%ignore pj::WindowHandle::window; 
Note: See TracChangeset for help on using the changeset viewer.