Changeset 5513 for pjproject/branches/projects/uwp/pjsip-apps/src/swig/pjsua2.i

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip-apps/src/swig/pjsua2.i (modified) (3 diffs)

pjproject/branches/projects/uwp/pjsip-apps/src/swig/pjsua2.i

@@ -115 +115 @@
 %template(CodecFmtpVector)              std::vector<pj::CodecFmtp>;     
 
+%ignore pj::WindowHandle::display;
+%ignore pj::WindowHandle::window;
+
 /* pj::WindowHandle::setWindow() receives Surface object */
 #if defined(SWIGJAVA) && defined(__ANDROID__)
@@ -124 +127 @@
 #endif
 %}
-%ignore pj::WindowHandle::display;
-%ignore pj::WindowHandle::window;
 %typemap(in) jobject surface {
     $1 = ($input? (jobject)ANativeWindow_fromSurface(jenv, $input): NULL);
@@ -131 +132 @@
 %extend pj::WindowHandle {
     void setWindow(jobject surface) { $self->window = surface; }
+}
+#else
+%extend pj::WindowHandle {
+    void setWindow(long long hwnd) { $self->window = (void*)hwnd; }
 }
 #endif