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

Timestamp:

Aug 26, 2011 4:30:18 AM (13 years ago)

Author:

nanang

Message:

Re #1327:

• Vidgui UI updates on Qt must be done in the UI thread, implemented this with Qt signal-slot mechanism.
• VidWin::show() better be called internally by VidWin? class instead of MainWin?.
• Fix QString to const char* issue, keeping the pointer returned by "QString::to*()::data()" won't work, the pointer actually points to a temporary data (lifetime issue).
• Minor: cleaning up unused lines in vidgui.

File:

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

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

@@ -51 +51 @@
 
     initLayout();
-    onCallReleased();
+    emit signalCallReleased();
 }
 
@@ -102 +102 @@
     connect(quitButton_, SIGNAL(clicked()), this, SLOT(quit()));
     //connect(this, SIGNAL(close()), this, SLOT(quit()));
+
+    // UI updates must be done in the UI thread!
+    connect(this, SIGNAL(signalNewCall(int, bool)),
+            this, SLOT(onNewCall(int, bool)));
+    connect(this, SIGNAL(signalCallReleased()),
+            this, SLOT(onCallReleased()));
+    connect(this, SIGNAL(signalInitVideoWindow()),
+            this, SLOT(initVideoWindow()));
+    connect(this, SIGNAL(signalShowStatus(const QString&)),
+            this, SLOT(doShowStatus(const QString&)));
 }
 
 void MainWin::quit()
 {
-    //if (preview_on)
-        //preview();
-
     delete video_prev_;
     video_prev_ = NULL;
@@ -120 +127 @@
 void MainWin::showStatus(const char *msg)
 {
+    PJ_LOG(3,(THIS_FILE, "%s", msg));
+
+    QString msg_ = QString::fromUtf8(msg);
+    emit signalShowStatus(msg_);
+}
+
+void MainWin::doShowStatus(const QString& msg)
+{
     //statusBar_->showMessage(msg);
     statusBar_->setText(msg);
-    PJ_LOG(3,(THIS_FILE, "%s", msg));
 }
 
@@ -135 +149 @@
 }
 
-void MainWin::onNewCall(pjsua_call_id cid, bool incoming)
+void MainWin::onNewCall(int cid, bool incoming)
 {
     pjsua_call_info ci;
@@ -206 +220 @@
         //X11 Display
         //status = pjsua_vid_win_set_show(wid, PJ_TRUE);
-        video_prev_->show();
+        //This is handled by VidWin now
+        //video_prev_->show();
         showStatus("Preview started");
 
@@ -224 +239 @@
         pj_status_t status;
         QString dst = url_->text();
-        const char *uri = dst.toAscii().data();
+        char uri[256];
+
+        pj_ansi_strncpy(uri, dst.toAscii().data(), sizeof(uri));
         pj_str_t uri2 = pj_str((char*)uri);
 
@@ -243 +260 @@
     //pjsua_call_hangup(currentCall_, PJSIP_SC_BUSY_HERE, NULL, NULL);
     pjsua_call_hangup_all();
-    onCallReleased();
-}
-
-
-void MainWin::init_video_window()
+    emit signalCallReleased();
+}
+
+
+void MainWin::initVideoWindow()
 {
     pjsua_call_info ci;
@@ -311 +328 @@
 
     if (currentCall_ == -1 && ci.state < PJSIP_INV_STATE_DISCONNECTED) {
-        onNewCall(call_id, false);
+        emit signalNewCall(call_id, false);
     }
 
@@ -320 +337 @@
                  ci.last_status_text.ptr);
         showStatus(status);
-        onCallReleased();
+        emit signalCallReleased();
     } else {
         snprintf(status, sizeof(status), "Call is %s", pjsip_inv_state_name(ci.state));
@@ -338 +355 @@
     }
 
-    onNewCall(call_id, true);
+    emit signalNewCall(call_id, true);
 
     pjsua_call_info ci;
@@ -366 +383 @@
             }
         } else if (ci.media[i].type == PJMEDIA_TYPE_VIDEO) {
-            init_video_window();
+            emit signalInitVideoWindow();
         }
     }