<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16116] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16116">16116</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-01 21:59:01 -0600 (Fri, 01 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>DTMF supposed to work but I see weird things on CLI. Will test more...</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhoneFSPhonepro">freeswitch/trunk/contrib/jmesquita/FSPhone/FSPhone.pro</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhonemainwindowcpp">freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhonemainwindowh">freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhonemainwindowui">freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitaFSPhoneFSPhonepro"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/FSPhone.pro (16115 => 16116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -14,15 +14,12 @@
</span><span class="cx"> LIBS = -L../../../.libs \
</span><span class="cx"> -lfreeswitch \
</span><span class="cx"> -lm
</span><del>-
-!win32 {
- !macx {
- # This is here to comply with the default freeswitch installation
- QMAKE_LFLAGS += -Wl,-rpath,/usr/local/freeswitch/lib
- LIBS+= -lcrypt -lrt
- }
</del><ins>+!win32:!macx {
+ # This is here to comply with the default freeswitch installation
+ QMAKE_LFLAGS += -Wl,-rpath,/usr/local/freeswitch/lib
+ LIBS += -lcrypt \
+ -lrt
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> SOURCES += main.cpp \
</span><span class="cx"> mainwindow.cpp \
</span><span class="cx"> fshost.cpp \
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp (16115 => 16116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -8,6 +8,33 @@
</span><span class="cx"> {
</span><span class="cx"> ui->setupUi(this);
</span><span class="cx">
</span><ins>+ 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)));
+
</ins><span class="cx"> connect(&g_FSHost, SIGNAL(ready()),this, SLOT(fshostReady()));
</span><span class="cx"> connect(&g_FSHost, SIGNAL(ringing(QString)), this, SLOT(ringing(QString)));
</span><span class="cx"> connect(&g_FSHost, SIGNAL(answered(QString)), this, SLOT(answered(QString)));
</span><span class="lines">@@ -30,6 +57,15 @@
</span><span class="cx"> g_FSHost.wait();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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");
+ }
+}
+
</ins><span class="cx"> void MainWindow::callListDoubleClick(QListWidgetItem *item)
</span><span class="cx"> {
</span><span class="cx"> Call *call = g_FSHost.getCallByUUID(item->data(Qt::UserRole).toString());
</span><span class="lines">@@ -59,7 +95,7 @@
</span><span class="cx"> ui->statusBar->showMessage("Ready", 0);
</span><span class="cx"> ui->newCallBtn->setEnabled(true);
</span><span class="cx"> ui->textEdit->setEnabled(true);
</span><del>- ui->textEdit->setText("Click on line to dial number...");
</del><ins>+ ui->textEdit->setText("Ready to dial and receive calls!");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MainWindow::paAnswer()
</span><span class="lines">@@ -132,6 +168,18 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ 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);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MainWindow::hungup(QString uuid)
</span><span class="lines">@@ -150,6 +198,18 @@
</span><span class="cx"> /* TODO: Will cause problems if 2 calls are received at the same time */
</span><span class="cx"> ui->answerBtn->setEnabled(false);
</span><span class="cx"> ui->hangupBtn->setEnabled(false);
</span><ins>+ 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);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MainWindow::changeEvent(QEvent *e)
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h (16115 => 16116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> #include <QMainWindow>
</span><span class="cx"> #include <QListWidgetItem>
</span><ins>+#include <QSignalMapper>
</ins><span class="cx"> #include <switch.h>
</span><span class="cx"> #include <fshost.h>
</span><span class="cx"> #include <call.h>
</span><span class="lines">@@ -52,7 +53,11 @@
</span><span class="cx"> protected:
</span><span class="cx"> void changeEvent(QEvent *e);
</span><span class="cx">
</span><ins>+signals:
+ void dtmfDialed(QString);
+
</ins><span class="cx"> private slots:
</span><ins>+ void dialDTMF(QString);
</ins><span class="cx"> void callListDoubleClick(QListWidgetItem *);
</span><span class="cx"> void makeCall();
</span><span class="cx"> void fshostReady();
</span><span class="lines">@@ -66,6 +71,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::MainWindow *ui;
</span><ins>+ QSignalMapper *dialpadMapper;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // MAINWINDOW_H
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui (16115 => 16116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="windowTitle">
</span><del>- <string>MainWindow</string>
</del><ins>+ <string>FSPhone - A FreeSWITCH softphone</string>
</ins><span class="cx"> </property>
</span><span class="cx"> <widget class="QWidget" name="centralWidget">
</span><span class="cx"> <layout class="QHBoxLayout" name="horizontalLayout_3">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>