Changeset 3724 for pjproject/trunk/pjsip-apps/src/vidgui/vidgui.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/vidgui.cpp (modified) (6 diffs)

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

@@ -29 +29 @@
 
 #define LOG_FILE                "vidgui.log"
+#define THIS_FILE               "vidgui.cpp"
 
 // These configure SIP registration
@@ -84 +85 @@
     /* Right pane */
     vbox_right->addWidget((localUri_ = new QLabel));
-    vbox_right->addWidget((previewButton_=new QPushButton(tr("Start Preview"))));
+    vbox_right->addWidget((previewButton_=new QPushButton(tr("Start &Preview"))));
     vbox_right->addWidget((callButton_=new QPushButton(tr("Call"))));
     vbox_right->addWidget((hangupButton_=new QPushButton(tr("Hangup"))));
@@ -121 +122 @@
     //statusBar_->showMessage(msg);
     statusBar_->setText(msg);
-    PJ_LOG(3,("vidgui.cpp", "%s", msg));
+    PJ_LOG(3,(THIS_FILE, "%s", msg));
 }
 
@@ -177 +178 @@
         pjsua_vid_preview_stop(DEFAULT_CAP_DEV);
 
-        previewButton_->setText(tr("Start Preview"));
+        showStatus("Preview stopped");
+        previewButton_->setText(tr("Start &Preview"));
     } else {
         pjsua_vid_win_id wid;
@@ -184 +186 @@
         pj_status_t status;
 
-        pj_bzero(&pre_param, sizeof(pre_param));
+        pjsua_vid_preview_param_default(&pre_param);
         pre_param.rend_id = DEFAULT_REND_DEV;
+        pre_param.show = PJ_FALSE;
 
         status = pjsua_vid_preview_start(DEFAULT_CAP_DEV, &pre_param);
@@ -199 +202 @@
         video_prev_ = new VidWin(&wi.hwnd);
         vbox_left->addWidget(video_prev_, 1);
-
-        previewButton_->setText(tr("Stop Preview"));
+        //Using this will cause SDL window to display blank
+        //screen sometimes, probably because it's using different
+        //X11 Display
+        //status = pjsua_vid_win_set_show(wid, PJ_TRUE);
+        video_prev_->show();
+        showStatus("Preview started");
+
+        previewButton_->setText(tr("Stop &Preview"));
     }
     preview_on = !preview_on;