Changeset 3926

Timestamp:

Dec 27, 2011 12:50:17 PM (12 years ago)

Author:

bennylp

Message:

Re #1393: added checkbox to enable/disable video in vidgui sample app

Location:

pjproject/trunk/pjsip-apps/src/vidgui

Files:

• vidgui.cpp (modified) (7 diffs)
• vidgui.h (modified) (3 diffs)

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

@@ -43 +43 @@
 #define SIP_USERNAME            "vidgui"
 #define SIP_PASSWORD            "secret"
-#define SIP_PORT                5084
+#define SIP_PORT                5080
 #define SIP_TCP                 1
 
@@ -109 +109 @@
     /* Right pane */
     vbox_right->addWidget((localUri_ = new QLabel));
+    vbox_right->addWidget((vidEnabled_ = new QCheckBox(tr("Enable &video"))));
     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"))));
     vbox_right->addWidget((quitButton_=new QPushButton(tr("Quit"))));
+
+#if PJMEDIA_HAS_VIDEO
+    vidEnabled_->setCheckState(Qt::Checked);
+#else
+    vidEnabled_->setCheckState(Qt::Unchecked);
+    vidEnabled_->setEnabled(false);
+#endif
 
     /* Outest layout */
@@ -126 +134 @@
     connect(quitButton_, SIGNAL(clicked()), this, SLOT(quit()));
     //connect(this, SIGNAL(close()), this, SLOT(quit()));
+    connect(vidEnabled_, SIGNAL(stateChanged(int)), this, SLOT(onVidEnabledChanged(int)));
 
     // UI updates must be done in the UI thread!
@@ -173 +182 @@
 }
 
+void MainWin::onVidEnabledChanged(int state)
+{
+    pjsua_call_setting call_setting;
+
+    if (currentCall_ == -1)
+        return;
+
+    pjsua_call_setting_default(&call_setting);
+    call_setting.vid_cnt = (state == Qt::Checked);
+
+    pjsua_call_reinvite2(currentCall_, &call_setting, NULL);
+}
+
 void MainWin::onNewCall(int cid, bool incoming)
 {
@@ -257 +279 @@
 {
     if (callButton_->text() == "Answer") {
+        pjsua_call_setting call_setting;
+
         pj_assert(currentCall_ != -1);
-        pjsua_call_answer(currentCall_, 200, NULL, NULL);
+
+        pjsua_call_setting_default(&call_setting);
+        call_setting.vid_cnt = (vidEnabled_->checkState()==Qt::Checked);
+
+        pjsua_call_answer2(currentCall_, &call_setting, 200, NULL, NULL);
         callButton_->setEnabled(false);
     } else {
@@ -264 +292 @@
         QString dst = url_->text();
         char uri[256];
+        pjsua_call_setting call_setting;
 
         pj_ansi_strncpy(uri, dst.toAscii().data(), sizeof(uri));
@@ -270 +299 @@
         pj_assert(currentCall_ == -1);
 
-        status = pjsua_call_make_call(accountId_, &uri2, 0,
+        pjsua_call_setting_default(&call_setting);
+        call_setting.vid_cnt = (vidEnabled_->checkState()==Qt::Checked);
+
+        status = pjsua_call_make_call(accountId_, &uri2, &call_setting,
                                       NULL, NULL, &currentCall_);
         if (status != PJ_SUCCESS) {

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

@@ -21 +21 @@
 
 #include <QApplication>
+#include <QCheckBox>
 #include <QFont>
 #include <QLabel>
@@ -66 +67 @@
     void hangup();
     void quit();
+    void onVidEnabledChanged(int state);
 
     void onNewCall(int cid, bool incoming);
@@ -83 +85 @@
                 *quitButton_,
                 *previewButton_;
+    QCheckBox   *vidEnabled_;
     QLineEdit *url_;
     VidWin *video_;