Revision

16116

Author

jmesquita

Date

2010-01-01 21:59:01 -0600 (Fri, 01 Jan 2010)

Log Message

DTMF supposed to work but I see weird things on CLI. Will test more...

Modified Paths

• freeswitch/trunk/contrib/jmesquita/FSPhone/FSPhone.pro
• freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp
• freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h
• freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui

Diff

--- freeswitch/trunk/contrib/jmesquita/FSPhone/FSPhone.pro	2010-01-02 02:33:46 UTC (rev 16115)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/FSPhone.pro	2010-01-02 03:59:01 UTC (rev 16116)
@@ -14,15 +14,12 @@
 LIBS = -L../../../.libs \
     -lfreeswitch \
     -lm
-
-!win32 {
-    !macx {
-        # This is here to comply with the default freeswitch installation
-        QMAKE_LFLAGS += -Wl,-rpath,/usr/local/freeswitch/lib
-        LIBS+= -lcrypt -lrt
-    }
+!win32:!macx { 
+    # This is here to comply with the default freeswitch installation
+    QMAKE_LFLAGS += -Wl,-rpath,/usr/local/freeswitch/lib
+    LIBS += -lcrypt \
+        -lrt
 }
-
 SOURCES += main.cpp \
     mainwindow.cpp \
     fshost.cpp \

--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp	2010-01-02 02:33:46 UTC (rev 16115)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp	2010-01-02 03:59:01 UTC (rev 16116)
@@ -8,6 +8,33 @@
 {
     ui->setupUi(this);
 
+    dialpadMapper = new QSignalMapper(this);
+    connect(ui->dtmf0Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf1Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf2Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf3Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf4Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf5Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf6Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf7Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf8Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmf9Btn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfAstBtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    connect(ui->dtmfPoundBtn, SIGNAL(clicked()), dialpadMapper, SLOT(map()));
+    dialpadMapper->setMapping(ui->dtmf0Btn, QString("0"));
+    dialpadMapper->setMapping(ui->dtmf1Btn, QString("1"));
+    dialpadMapper->setMapping(ui->dtmf2Btn, QString("2"));
+    dialpadMapper->setMapping(ui->dtmf3Btn, QString("3"));
+    dialpadMapper->setMapping(ui->dtmf4Btn, QString("4"));
+    dialpadMapper->setMapping(ui->dtmf5Btn, QString("5"));
+    dialpadMapper->setMapping(ui->dtmf6Btn, QString("6"));
+    dialpadMapper->setMapping(ui->dtmf7Btn, QString("7"));
+    dialpadMapper->setMapping(ui->dtmf8Btn, QString("8"));
+    dialpadMapper->setMapping(ui->dtmf9Btn, QString("9"));
+    dialpadMapper->setMapping(ui->dtmfAstBtn, QString("*"));
+    dialpadMapper->setMapping(ui->dtmfPoundBtn, QString("#"));
+    connect(dialpadMapper, SIGNAL(mapped(QString)), this, SLOT(dialDTMF(QString)));
+
     connect(&g_FSHost, SIGNAL(ready()),this, SLOT(fshostReady()));
     connect(&g_FSHost, SIGNAL(ringing(QString)), this, SLOT(ringing(QString)));
     connect(&g_FSHost, SIGNAL(answered(QString)), this, SLOT(answered(QString)));
@@ -30,6 +57,15 @@
     g_FSHost.wait();
 }
 
+void MainWindow::dialDTMF(QString dtmf)
+{
+    QString result;
+    QString dtmf_string = QString("dtmf %1").arg(dtmf);
+    if (g_FSHost.sendCmd("pa", dtmf_string.toAscii(), &result) == SWITCH_STATUS_FALSE) {
+        ui->textEdit->setText("Error sending that command");
+    }
+}
+
 void MainWindow::callListDoubleClick(QListWidgetItem *item)
 {
     Call *call = g_FSHost.getCallByUUID(item->data(Qt::UserRole).toString());
@@ -59,7 +95,7 @@
     ui->statusBar->showMessage("Ready", 0);
     ui->newCallBtn->setEnabled(true);
     ui->textEdit->setEnabled(true);
-    ui->textEdit->setText("Click on line to dial number...");
+    ui->textEdit->setText("Ready to dial and receive calls!");
 }
 
 void MainWindow::paAnswer()
@@ -132,6 +168,18 @@
             break;
         }
     }
+    ui->dtmf0Btn->setEnabled(true);
+    ui->dtmf1Btn->setEnabled(true);
+    ui->dtmf2Btn->setEnabled(true);
+    ui->dtmf3Btn->setEnabled(true);
+    ui->dtmf4Btn->setEnabled(true);
+    ui->dtmf5Btn->setEnabled(true);
+    ui->dtmf6Btn->setEnabled(true);
+    ui->dtmf7Btn->setEnabled(true);
+    ui->dtmf8Btn->setEnabled(true);
+    ui->dtmf9Btn->setEnabled(true);
+    ui->dtmfAstBtn->setEnabled(true);
+    ui->dtmfPoundBtn->setEnabled(true);
 }
 
 void MainWindow::hungup(QString uuid)
@@ -150,6 +198,18 @@
     /* TODO: Will cause problems if 2 calls are received at the same time */
     ui->answerBtn->setEnabled(false);
     ui->hangupBtn->setEnabled(false);
+    ui->dtmf0Btn->setEnabled(false);
+    ui->dtmf1Btn->setEnabled(false);
+    ui->dtmf2Btn->setEnabled(false);
+    ui->dtmf3Btn->setEnabled(false);
+    ui->dtmf4Btn->setEnabled(false);
+    ui->dtmf5Btn->setEnabled(false);
+    ui->dtmf6Btn->setEnabled(false);
+    ui->dtmf7Btn->setEnabled(false);
+    ui->dtmf8Btn->setEnabled(false);
+    ui->dtmf9Btn->setEnabled(false);
+    ui->dtmfAstBtn->setEnabled(false);
+    ui->dtmfPoundBtn->setEnabled(false);
 }
 
 void MainWindow::changeEvent(QEvent *e)

--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h	2010-01-02 02:33:46 UTC (rev 16115)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h	2010-01-02 03:59:01 UTC (rev 16116)
@@ -35,6 +35,7 @@
 
 #include <QMainWindow>
 #include <QListWidgetItem>
+#include <QSignalMapper>
 #include <switch.h>
 #include <fshost.h>
 #include <call.h>
@@ -52,7 +53,11 @@
 protected:
     void changeEvent(QEvent *e);
 
+signals:
+    void dtmfDialed(QString);
+
 private slots:
+    void dialDTMF(QString);
     void callListDoubleClick(QListWidgetItem *);
     void makeCall();
     void fshostReady();
@@ -66,6 +71,7 @@
 
 private:
     Ui::MainWindow *ui;
+    QSignalMapper *dialpadMapper;
 };
 
 #endif // MAINWINDOW_H

--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui	2010-01-02 02:33:46 UTC (rev 16115)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui	2010-01-02 03:59:01 UTC (rev 16116)
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>FSPhone - A FreeSWITCH softphone</string>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QHBoxLayout" name="horizontalLayout_3">