Changeset 3728

Timestamp:

Aug 29, 2011 2:33:50 AM (13 years ago)

Author:

ming

Message:

Fixed #1354: stopping preview may hide parent window.

Location:

pjproject/trunk/pjsip-apps/src/vidgui

Files:

• vidgui.cpp (modified) (2 diffs)
• vidwin.cpp (modified) (7 diffs)
• vidwin.h (modified) (1 diff)

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

@@ -221 +221 @@
         //status = pjsua_vid_win_set_show(wid, PJ_TRUE);
         //This is handled by VidWin now
-        //video_prev_->show();
+        //video_prev_->show_sdl();
         showStatus("Preview started");
 
@@ -624 +624 @@
 
 };
+static int main_func(int argc, char *argv[])
+{
+    return 0;
+}
 
 int main(int argc, char *argv[])
 {
+    pj_run_app(&main_func, argc, argv, 0);
+    
     /* At least on Linux, we have to initialize SDL video subsystem prior to
      * creating/initializing QApplication, otherwise we'll segfault miserably

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

@@ -47 +47 @@
 VidWin::~VidWin()
 {
-    show(false);
+    show_sdl(false);
     detach();
 }
@@ -73 +73 @@
 
     case QEvent::Show:
-        show(true);
+        show_sdl(true);
         // revert to default size hint, make it resizable
         setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
@@ -79 +79 @@
 
     case QEvent::Hide:
-        show(false);
+        show_sdl(false);
         break;
 
@@ -139 +139 @@
 }
 
-void VidWin::show(bool visible)
+void VidWin::show_sdl(bool visible)
 {
     if (!hwnd.info.win.hwnd) return;
@@ -210 +210 @@
 }
 
-void VidWin::show(bool visible)
+void VidWin::show_sdl(bool visible)
 {
     if (!hwnd.info.cocoa.window) return;
@@ -217 +217 @@
 
     if (visible) {
-        if (![w isMiniaturized]) {
-            [w makeKeyAndOrderFront:nil];
-        }
+        [[w contentView]setHidden:NO];
     } else {
-        [w orderOut:nil];
+        [[w contentView]setHidden:YES];
     }
 }
@@ -285 +283 @@
 }
 
-void VidWin::show(bool visible)
+void VidWin::show_sdl(bool visible)
 {
     if (!hwnd.info.x11.window) return;

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

@@ -46 +46 @@
     void set_size();
     void get_size();
-    void show(bool visible=true);
+    void show_sdl(bool visible=true);
 };