diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2015-03-26 10:06:45 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2015-03-26 10:06:45 +0000 |
commit | 678aa9a6901443b92f20ddcea98d98bf90148e92 (patch) | |
tree | 1d0996e6358f1a3fba10c0a2404a8e812ca40af4 /pjsip-apps/src/pjsua/android/jni/pjsua.i | |
parent | c184c50e62e65131b1546b0aa622b20aa64f62a5 (diff) |
Re #1790: Misc fixes on renderer viewing in pjsua CLI app sample, e.g: handle NULL surface, handle video disabled, cleanup unused codes.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5030 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src/pjsua/android/jni/pjsua.i')
-rwxr-xr-x | pjsip-apps/src/pjsua/android/jni/pjsua.i | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/pjsip-apps/src/pjsua/android/jni/pjsua.i b/pjsip-apps/src/pjsua/android/jni/pjsua.i index d54bfc3c..a2c7ee38 100755 --- a/pjsip-apps/src/pjsua/android/jni/pjsua.i +++ b/pjsip-apps/src/pjsua/android/jni/pjsua.i @@ -4,17 +4,6 @@ #include "pjsua_app_callback.h" #include "../../pjsua_app.h" #include <android/native_window_jni.h> - -#ifdef __cplusplus -extern "C" { -#endif - int pjsuaStart(); - void pjsuaDestroy(); - int pjsuaRestart(); - void setCallbackObject(PjsuaAppCallback* callback); -#ifdef __cplusplus -} -#endif %} /* Turn on director wrapping PjsuaAppCallback */ @@ -22,7 +11,7 @@ extern "C" { /* Convert Surface object to ANativeWindow for setIncomingVideoRenderer() */ %typemap(in) jobject surface { - $1 = (jobject)ANativeWindow_fromSurface(jenv, $input); + $1 = $input? (jobject)ANativeWindow_fromSurface(jenv, $input) : NULL; } %include "pjsua_app_callback.h" |