<!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][16114] </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=16114">16114</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-01 20:29:00 -0600 (Fri, 01 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Receive and make several calls. Double-click to switch between them. Needs mod_portaudio patch on <a href="http://jira.freeswitch.org/browse/MODENDP-277">MODENDP-277</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhonecallh">freeswitch/trunk/contrib/jmesquita/FSPhone/call.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhonefshostcpp">freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhonefshosth">freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitaFSPhonecallh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/call.h (16113 => 16114)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/call.h 2010-01-01 20:00:18 UTC (rev 16113)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/call.h 2010-01-02 02:29:00 UTC (rev 16114)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> QString getCidNumber(void) { return _cid_number; }
</span><span class="cx"> int getCallID(void) { return _call_id; }
</span><span class="cx"> QString getUUID(void) { return _uuid; }
</span><ins>+ fsphone_call_direction_t getDirection() { return _direction; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> int _call_id;
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonefshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.cpp (16113 => 16114)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.cpp 2010-01-01 20:00:18 UTC (rev 16113)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.cpp 2010-01-02 02:29:00 UTC (rev 16114)
</span><span class="lines">@@ -58,6 +58,38 @@
</span><span class="cx">
</span><span class="cx"> void FSHost::generalEventHandler(switch_event_t *event)
</span><span class="cx"> {
</span><ins>+ QString uuid = switch_event_get_header_nil(event, "Unique-ID");
+
+ if (_active_calls.contains(uuid))
+ {
+ switch(event->event_id) {
+ case SWITCH_EVENT_CHANNEL_ANSWER:
+ case SWITCH_EVENT_CHANNEL_BRIDGE:
+ {
+ emit answered(uuid);
+ break;
+ }
+ case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE:
+ {
+ emit hungup(uuid);
+ break;
+ }
+ case SWITCH_EVENT_CUSTOM:
+ {
+ /* We dont want to treat this anymore */
+ if (strcmp(event->subclass_name, "portaudio::ringing") == 0)
+ {
+ return;
+ }
+ }
+ default:
+ {
+ printf("Untreated event from an UUID we have: %s -> %s | %s\n", switch_event_name(event->event_id), (!zstr(event->subclass_name) ? event->subclass_name : "NULL"), uuid.toAscii().constData());
+ }
+ }
+ }
+
+ /* This is how we identify new calls, inbound and outbound */
</ins><span class="cx"> switch(event->event_id) {
</span><span class="cx"> case SWITCH_EVENT_CUSTOM:
</span><span class="cx"> {
</span><span class="lines">@@ -67,19 +99,25 @@
</span><span class="cx"> switch_event_get_header_nil(event, "Caller-Caller-ID-Name"),
</span><span class="cx"> switch_event_get_header_nil(event, "Caller-Caller-ID-Number"),
</span><span class="cx"> FSPHONE_CALL_DIRECTION_INBOUND,
</span><del>- switch_event_get_header_nil(event, "Unique-ID"));
- emit ringing(call);
</del><ins>+ uuid);
+ _active_calls.insert(uuid, call);
+ emit ringing(uuid);
</ins><span class="cx"> }
</span><ins>+ else if (strcmp(event->subclass_name, "portaudio::makecall") == 0)
+ {
+ Call *call = new Call(atoi(switch_event_get_header_nil(event, "call_id")),NULL,
+ switch_event_get_header_nil(event, "Caller-Destination-Number"),
+ FSPHONE_CALL_DIRECTION_INBOUND,
+ uuid);
+ _active_calls.insert(uuid, call);
+ emit newOutgoingCall(uuid);
+ }
</ins><span class="cx"> else
</span><span class="cx"> {
</span><span class="cx"> printf("We got a not treated custom event: %s\n", (!zstr(event->subclass_name) ? event->subclass_name : "NULL"));
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- default:
- {
- printf("Untreated event: %s -> %s\n", switch_event_name(event->event_id), (!zstr(event->subclass_name) ? event->subclass_name : "NULL"));
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonefshosth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.h (16113 => 16114)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.h 2010-01-01 20:00:18 UTC (rev 16113)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.h 2010-01-02 02:29:00 UTC (rev 16114)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> #define FSHOST_H
</span><span class="cx">
</span><span class="cx"> #include <QThread>
</span><ins>+#include <QHash>
</ins><span class="cx"> #include <switch.h>
</span><span class="cx">
</span><span class="cx"> class Call;
</span><span class="lines">@@ -13,14 +14,20 @@
</span><span class="cx"> explicit FSHost(QObject *parent = 0);
</span><span class="cx"> switch_status_t sendCmd(const char *cmd, const char *args, QString *res);
</span><span class="cx"> void generalEventHandler(switch_event_t *event);
</span><ins>+ Call * getCallByUUID(QString uuid) { return _active_calls.value(uuid, NULL); }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void run(void);
</span><span class="cx">
</span><span class="cx"> signals:
</span><span class="cx"> void ready(void);
</span><del>- void ringing(Call *call);
</del><ins>+ void ringing(QString);
+ void answered(QString);
+ void newOutgoingCall(QString);
+ void hungup(QString);
</ins><span class="cx">
</span><ins>+private:
+ QHash<QString, Call*> _active_calls;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> extern FSHost g_FSHost;
</span><span class="lines">@@ -35,7 +42,7 @@
</span><span class="cx"> if (switch_event_dup(&clone, event) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> g_FSHost.generalEventHandler(clone);
</span><span class="cx"> }
</span><del>- /*switch_safe_free(event);*/
</del><ins>+ switch_safe_free(clone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // FSHOST_H
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp (16113 => 16114)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp 2010-01-01 20:00:18 UTC (rev 16113)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp 2010-01-02 02:29:00 UTC (rev 16114)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+#include <QInputDialog>
</ins><span class="cx"> #include "mainwindow.h"
</span><span class="cx"> #include "ui_mainwindow.h"
</span><span class="cx">
</span><span class="lines">@@ -8,7 +9,12 @@
</span><span class="cx"> ui->setupUi(this);
</span><span class="cx">
</span><span class="cx"> connect(&g_FSHost, SIGNAL(ready()),this, SLOT(fshostReady()));
</span><del>- connect(&g_FSHost, SIGNAL(ringing(Call *)), this, SLOT(ringing(Call *)));
</del><ins>+ connect(&g_FSHost, SIGNAL(ringing(QString)), this, SLOT(ringing(QString)));
+ connect(&g_FSHost, SIGNAL(answered(QString)), this, SLOT(answered(QString)));
+ connect(&g_FSHost, SIGNAL(hungup(QString)), this, SLOT(hungup(QString)));
+ connect(&g_FSHost, SIGNAL(newOutgoingCall(QString)), this, SLOT(newOutgoingCall(QString)));
+
+ connect(ui->newCallBtn, SIGNAL(clicked()), this, SLOT(makeCall()));
</ins><span class="cx"> connect(ui->answerBtn, SIGNAL(clicked()), this, SLOT(paAnswer()));
</span><span class="cx"> connect(ui->hangupBtn, SIGNAL(clicked()), this, SLOT(paHangup()));
</span><span class="cx"> connect(ui->listCalls, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(callListDoubleClick(QListWidgetItem*)));
</span><span class="lines">@@ -26,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> void MainWindow::callListDoubleClick(QListWidgetItem *item)
</span><span class="cx"> {
</span><del>- Call *call = _lines.value(item->data(Qt::UserRole).toString());
</del><ins>+ Call *call = g_FSHost.getCallByUUID(item->data(Qt::UserRole).toString());
</ins><span class="cx"> QString switch_str = QString("switch %1").arg(call->getCallID());
</span><span class="cx"> QString result;
</span><span class="cx"> if (g_FSHost.sendCmd("pa", switch_str.toAscii(), &result) == SWITCH_STATUS_FALSE) {
</span><span class="lines">@@ -36,9 +42,22 @@
</span><span class="cx"> ui->hangupBtn->setEnabled(true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MainWindow::makeCall()
+{
+ bool ok;
+ QString dialstring = QInputDialog::getText(this, tr("Make new call"),
+ tr("Number to dial:"), QLineEdit::Normal, NULL,&ok);
+
+ if (ok && !dialstring.isEmpty())
+ {
+ paCall(dialstring);
+ }
+}
+
</ins><span class="cx"> void MainWindow::fshostReady()
</span><span class="cx"> {
</span><span class="cx"> ui->statusBar->showMessage("Ready", 0);
</span><ins>+ ui->newCallBtn->setEnabled(true);
</ins><span class="cx"> ui->textEdit->setEnabled(true);
</span><span class="cx"> ui->textEdit->setText("Click on line to dial number...");
</span><span class="cx"> }
</span><span class="lines">@@ -55,11 +74,11 @@
</span><span class="cx"> ui->answerBtn->setEnabled(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MainWindow::paCall()
</del><ins>+void MainWindow::paCall(QString dialstring)
</ins><span class="cx"> {
</span><span class="cx"> QString result;
</span><span class="cx">
</span><del>- QString callstring = QString("call %1").arg(ui->textEdit->toPlainText());
</del><ins>+ QString callstring = QString("call %1").arg(dialstring);
</ins><span class="cx">
</span><span class="cx"> if (g_FSHost.sendCmd("pa", callstring.toAscii(), &result) == SWITCH_STATUS_FALSE) {
</span><span class="cx"> ui->textEdit->setText("Error sending that command");
</span><span class="lines">@@ -80,20 +99,57 @@
</span><span class="cx"> ui->hangupBtn->setEnabled(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MainWindow::ringing(Call *call)
</del><ins>+void MainWindow::newOutgoingCall(QString uuid)
</ins><span class="cx"> {
</span><del>- if (_lines.contains(call->getUUID()))
</del><ins>+ Call *call = g_FSHost.getCallByUUID(uuid);
+ ui->textEdit->setText(QString("Calling %1 (%2)").arg(call->getCidName(), call->getCidNumber()));
+ QListWidgetItem *item = new QListWidgetItem(tr("%1 (%2) - Calling").arg(call->getCidName(), call->getCidNumber()));
+ item->setData(Qt::UserRole, uuid);
+ ui->listCalls->addItem(item);
+ ui->hangupBtn->setEnabled(true);
+}
+
+void MainWindow::ringing(QString uuid)
+{
+
+ Call *call = g_FSHost.getCallByUUID(uuid);
+ ui->textEdit->setText(QString("Call from %1 (%2)").arg(call->getCidName(), call->getCidNumber()));
+ QListWidgetItem *item = new QListWidgetItem(tr("%1 (%2) - Ringing").arg(call->getCidName(), call->getCidNumber()));
+ item->setData(Qt::UserRole, uuid);
+ ui->listCalls->addItem(item);
+ ui->answerBtn->setEnabled(true);
+}
+
+void MainWindow::answered(QString uuid)
+{
+ Call *call = g_FSHost.getCallByUUID(uuid);
+ for (int i=0; i<ui->listCalls->count(); i++)
</ins><span class="cx"> {
</span><del>- delete call;
</del><ins>+ QListWidgetItem *item = ui->listCalls->item(i);
+ if (item->data(Qt::UserRole).toString() == uuid)
+ {
+ item->setText(tr("%1 (%2) - Active").arg(call->getCidName(), call->getCidNumber()));
+ break;
+ }
</ins><span class="cx"> }
</span><del>- else
</del><ins>+}
+
+void MainWindow::hungup(QString uuid)
+{
+ Call *call = g_FSHost.getCallByUUID(uuid);
+ for (int i=0; i<ui->listCalls->count(); i++)
</ins><span class="cx"> {
</span><del>- _lines.insert(call->getUUID(), call);
- ui->textEdit->setText(QString("Number: %1\nName: %3").arg(call->getCidNumber(), call->getCidName()));
- QListWidgetItem *item = new QListWidgetItem(tr("%1 - %2 (Ringing)").arg(call->getCidName(), call->getCidNumber()), ui->listCalls);
- item->setData(Qt::UserRole, call->getUUID());
</del><ins>+ QListWidgetItem *item = ui->listCalls->item(i);
+ if (item->data(Qt::UserRole).toString() == uuid)
+ {
+ delete ui->listCalls->takeItem(i);
+ break;
+ }
</ins><span class="cx"> }
</span><del>- ui->answerBtn->setEnabled(true);
</del><ins>+ ui->textEdit->setText(tr("Call with %1 (%2) hungup.").arg(call->getCidName(), call->getCidNumber()));
+ /* TODO: Will cause problems if 2 calls are received at the same time */
+ ui->answerBtn->setEnabled(false);
+ ui->hangupBtn->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 (16113 => 16114)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h 2010-01-01 20:00:18 UTC (rev 16113)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h 2010-01-02 02:29:00 UTC (rev 16114)
</span><span class="lines">@@ -54,15 +54,18 @@
</span><span class="cx">
</span><span class="cx"> private slots:
</span><span class="cx"> void callListDoubleClick(QListWidgetItem *);
</span><ins>+ void makeCall();
</ins><span class="cx"> void fshostReady();
</span><span class="cx"> void paAnswer();
</span><del>- void paCall();
</del><ins>+ void paCall(QString);
</ins><span class="cx"> void paHangup();
</span><del>- void ringing(Call *);
</del><ins>+ void newOutgoingCall(QString);
+ void ringing(QString);
+ void answered(QString);
+ void hungup(QString);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::MainWindow *ui;
</span><del>- QHash<QString, Call *> _lines;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // MAINWINDOW_H
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>