Changeset 3724 for pjproject/trunk/pjsip-apps/src/vidgui/vidwin.cpp

Timestamp:

Aug 25, 2011 11:59:39 AM (13 years ago)

Author:

bennylp

Message:

Re #1351: option to initially hide video preview window to avoid floating window. Also added pjsua_vid_preview_param_default()

File:

• pjproject/trunk/pjsip-apps/src/vidgui/vidwin.cpp (modified) (7 diffs)

pjproject/trunk/pjsip-apps/src/vidgui/vidwin.cpp

@@ -141 +141 @@
 }
 
+void VidWin::show(bool visible)
+{
+    if (!hwnd.info.win.hwnd) return;
+
+    ShowWindow(hwnd.info.win.hwnd, visible ? SW_SHOW : SW_HIDE);
+}
+
 #elif defined(__APPLE__)
 
@@ -204 +211 @@
 }
 
+void VidWin::show(bool visible)
+{
+    if (!hwnd.info.cocoa.window) return;
+
+    NSWindow *w = (NSWindow*)hwnd.info.cocoa.window;
+
+    if (visible) {
+        if (![w isMiniaturized]) {
+            [w makeKeyAndOrderFront:nil];
+        }
+    } else {
+        [w orderOut:nil];
+    }
+}
 
 #elif defined(linux) || defined(__linux)
@@ -212 +233 @@
 #include <stdio.h>
 
+#define GET_DISPLAY()   QX11Info::display()
+//#define GET_DISPLAY() (Display*)hwnd.info.x11.display
+
 void VidWin::attach()
 {
@@ -221 +245 @@
     // the window failing to embed to this QWidget.
     //Display *d = (Display*)hwnd.info.x11.display;
-    Display *d = QX11Info::display();
+    Display *d = GET_DISPLAY();
     Window w = (Window)hwnd.info.x11.window;
     Window parent = (Window)this->winId();
@@ -240 +264 @@
 
     /* Update position and size */
-    Display *d = QX11Info::display();
+    Display *d = GET_DISPLAY();
     Window w = (Window)hwnd.info.x11.window;
     QRect qr = rect();
@@ -253 +277 @@
     if (!hwnd.info.x11.window) return;
 
-    Display *d = QX11Info::display();
+    Display *d = GET_DISPLAY();
     Window w = (Window)hwnd.info.x11.window;
 
@@ -262 +286 @@
 }
 
+void VidWin::show(bool visible)
+{
+    if (!hwnd.info.x11.window) return;
+
+    Display *d = GET_DISPLAY();
+    Window w = (Window)hwnd.info.x11.window;
+
+    if (visible) {
+        XMapRaised(d, w);
+    } else {
+        XUnmapWindow(d, w);
+    }
+
+    XFlush(d);
+}
+
 #endif