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.




git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3726 74dad513-b988-da41-8d7b-12977e46ad98

1 files changed, 12 insertions, 6 deletions

diff --git a/pjsip-apps/src/vidgui/vidgui.h b/pjsip-apps/src/vidgui/vidgui.h
index 7d53e18a..a7c2a507 100644
--- a/pjsip-apps/src/vidgui/vidgui.h
+++ b/pjsip-apps/src/vidgui/vidgui.h
@@ -47,29 +47,36 @@ public:
 
     bool initStack();
     void showError(const char *title, pj_status_t status);
-    void showStatus(const char *);
+    void showStatus(const char *msg);
 
-public:
     void on_reg_state(pjsua_acc_id acc_id);
     void on_call_state(pjsua_call_id call_id, pjsip_event *e);
     void on_incoming_call(pjsua_acc_id acc_id, pjsua_call_id call_id, pjsip_rx_data *rdata);
     void on_call_media_state(pjsua_call_id call_id);
 
+signals:
+    void signalNewCall(int, bool);
+    void signalCallReleased();
+    void signalInitVideoWindow();
+    void signalShowStatus(const QString&);
+    
 public slots:
     void preview();
     void call();
     void hangup();
     void quit();
 
+    void onNewCall(int cid, bool incoming);
+    void onCallReleased();
+    void initVideoWindow();
+    void doShowStatus(const QString& msg);
+
 private:
     static MainWin *theInstance_;
     pjsua_acc_id accountId_;
     pjsua_call_id currentCall_;
     bool preview_on;
 
-    void onNewCall(pjsua_call_id cid, bool incoming);
-    void onCallReleased();
-
 private:
     QPushButton *callButton_,
 		*hangupButton_,
@@ -85,7 +92,6 @@ private:
     QVBoxLayout *vbox_left;
 
     void initLayout();
-    void init_video_window();
 };