<!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][16117] </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=16117">16117</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-02 00:37:46 -0600 (Sat, 02 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Display account information</pre>
<h3>Modified Paths</h3>
<ul>
<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>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhonemainwindowui">freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitaFSPhonefshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.cpp (16116 => 16117)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.cpp 2010-01-02 03:59:01 UTC (rev 16116)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.cpp 2010-01-02 06:37:46 UTC (rev 16117)
</span><span class="lines">@@ -112,6 +112,29 @@
</span><span class="cx"> _active_calls.insert(uuid, call);
</span><span class="cx"> emit newOutgoingCall(uuid);
</span><span class="cx"> }
</span><ins>+ else if (strcmp(event->subclass_name, "sofia::gateway_state") == 0)
+ {
+ QString state = switch_event_get_header_nil(event, "State");
+ QString gw = switch_event_get_header_nil(event, "Gateway");
+ if (state == "TRYING")
+ emit gwStateChange(gw, FSPHONE_GW_STATE_TRYING);
+ else if (state == "REGISTER")
+ emit gwStateChange(gw, FSPHONE_GW_STATE_REGISTER);
+ else if (state == "REGED")
+ emit gwStateChange(gw, FSPHONE_GW_STATE_REGED);
+ else if (state == "UNREGED")
+ emit gwStateChange(gw, FSPHONE_GW_STATE_UNREGED);
+ else if (state == "UNREGISTER")
+ emit gwStateChange(gw, FSPHONE_GW_STATE_UNREGISTER);
+ else if (state =="FAILED")
+ emit gwStateChange(gw, FSPHONE_GW_STATE_FAILED);
+ else if (state == "FAIL_WAIT")
+ emit gwStateChange(gw, FSPHONE_GW_STATE_FAIL_WAIT);
+ else if (state == "EXPIRED")
+ emit gwStateChange(gw, FSPHONE_GW_STATE_EXPIRED);
+ else if (state == "NOREG")
+ emit gwStateChange(gw, FSPHONE_GW_STATE_NOREG);
+ }
</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></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonefshosth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.h (16116 => 16117)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.h 2010-01-02 03:59:01 UTC (rev 16116)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.h 2010-01-02 06:37:46 UTC (rev 16117)
</span><span class="lines">@@ -7,6 +7,28 @@
</span><span class="cx">
</span><span class="cx"> class Call;
</span><span class="cx">
</span><ins>+#define FSPHONE_GW_STATE_TRYING 0
+#define FSPHONE_GW_STATE_REGISTER 1
+#define FSPHONE_GW_STATE_REGED 2
+#define FSPHONE_GW_STATE_UNREGED 3
+#define FSPHONE_GW_STATE_UNREGISTER 4
+#define FSPHONE_GW_STATE_FAILED 5
+#define FSPHONE_GW_STATE_FAIL_WAIT 6
+#define FSPHONE_GW_STATE_EXPIRED 7
+#define FSPHONE_GW_STATE_NOREG 8
+
+static const char *fsphone_gw_state_names[] = {
+ "TRYING",
+ "REGISTER",
+ "REGED",
+ "UNREGED",
+ "UNREGISTER",
+ "FAILED",
+ "FAIL_WAIT",
+ "EXPIRED",
+ "NOREG"
+};
+
</ins><span class="cx"> class FSHost : public QThread
</span><span class="cx"> {
</span><span class="cx"> Q_OBJECT
</span><span class="lines">@@ -15,6 +37,7 @@
</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><span class="cx"> Call * getCallByUUID(QString uuid) { return _active_calls.value(uuid, NULL); }
</span><ins>+ QString getGwStateName(int id) { return fsphone_gw_state_names[id]; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void run(void);
</span><span class="lines">@@ -25,6 +48,7 @@
</span><span class="cx"> void answered(QString);
</span><span class="cx"> void newOutgoingCall(QString);
</span><span class="cx"> void hungup(QString);
</span><ins>+ void gwStateChange(QString, int);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> QHash<QString, Call*> _active_calls;
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp (16116 => 16117)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp 2010-01-02 03:59:01 UTC (rev 16116)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp 2010-01-02 06:37:46 UTC (rev 16117)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> connect(&g_FSHost, SIGNAL(answered(QString)), this, SLOT(answered(QString)));
</span><span class="cx"> connect(&g_FSHost, SIGNAL(hungup(QString)), this, SLOT(hungup(QString)));
</span><span class="cx"> connect(&g_FSHost, SIGNAL(newOutgoingCall(QString)), this, SLOT(newOutgoingCall(QString)));
</span><ins>+ connect(&g_FSHost, SIGNAL(gwStateChange(QString,int)), this, SLOT(gwStateChanged(QString,int)));
</ins><span class="cx">
</span><span class="cx"> connect(ui->newCallBtn, SIGNAL(clicked()), this, SLOT(makeCall()));
</span><span class="cx"> connect(ui->answerBtn, SIGNAL(clicked()), this, SLOT(paAnswer()));
</span><span class="lines">@@ -57,6 +58,31 @@
</span><span class="cx"> g_FSHost.wait();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MainWindow::gwStateChanged(QString gw, int state)
+{
+ ui->statusBar->showMessage(tr("Account %1 is %2").arg(gw, g_FSHost.getGwStateName(state)));
+
+ /* TODO: This should be placed somewhere else when the config handler is here... */
+ QList<QTableWidgetItem *> match = ui->tableAccounts->findItems(gw, Qt::MatchExactly);
+ if (match.isEmpty())
+ {
+ /* Create the damn thing */
+ ui->tableAccounts->setRowCount(ui->tableAccounts->rowCount()+1);
+ QTableWidgetItem *gwField = new QTableWidgetItem(gw);
+ QTableWidgetItem *stField = new QTableWidgetItem(g_FSHost.getGwStateName(state));
+ ui->tableAccounts->setItem(0,0,gwField);
+ ui->tableAccounts->setItem(0,1,stField);
+ ui->tableAccounts->resizeColumnsToContents();
+ return;
+ }
+
+ QTableWidgetItem *gwField = match.at(0);
+ QTableWidgetItem *stField = ui->tableAccounts->item(gwField->row(),1);
+ stField->setText(g_FSHost.getGwStateName(state));
+ ui->tableAccounts->resizeColumnsToContents();
+
+}
+
</ins><span class="cx"> void MainWindow::dialDTMF(QString dtmf)
</span><span class="cx"> {
</span><span class="cx"> QString result;
</span><span class="lines">@@ -92,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> void MainWindow::fshostReady()
</span><span class="cx"> {
</span><del>- ui->statusBar->showMessage("Ready", 0);
</del><ins>+ ui->statusBar->showMessage("Ready");
</ins><span class="cx"> ui->newCallBtn->setEnabled(true);
</span><span class="cx"> ui->textEdit->setEnabled(true);
</span><span class="cx"> ui->textEdit->setText("Ready to dial and receive calls!");
</span><span class="lines">@@ -131,7 +157,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ui->textEdit->setText("Click to dial number...");
</span><del>- ui->statusBar->showMessage("Call hungup", 10);
</del><ins>+ ui->statusBar->showMessage("Call hungup");
</ins><span class="cx"> ui->hangupBtn->setEnabled(false);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h (16116 => 16117)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h 2010-01-02 03:59:01 UTC (rev 16116)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h 2010-01-02 06:37:46 UTC (rev 16117)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> void dtmfDialed(QString);
</span><span class="cx">
</span><span class="cx"> private slots:
</span><ins>+ void gwStateChanged(QString, int);
</ins><span class="cx"> void dialDTMF(QString);
</span><span class="cx"> void callListDoubleClick(QListWidgetItem *);
</span><span class="cx"> void makeCall();
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui (16116 => 16117)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui 2010-01-02 03:59:01 UTC (rev 16116)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui 2010-01-02 06:37:46 UTC (rev 16117)
</span><span class="lines">@@ -6,15 +6,15 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>805</width>
- <height>500</height>
</del><ins>+ <width>579</width>
+ <height>541</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="windowTitle">
</span><span class="cx"> <string>FSPhone - A FreeSWITCH softphone</string>
</span><span class="cx"> </property>
</span><span class="cx"> <widget class="QWidget" name="centralWidget">
</span><del>- <layout class="QHBoxLayout" name="horizontalLayout_3">
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout_4">
</ins><span class="cx"> <item>
</span><span class="cx"> <layout class="QVBoxLayout" name="verticalLayout_2">
</span><span class="cx"> <item>
</span><span class="lines">@@ -198,13 +198,78 @@
</span><span class="cx"> <property name="title">
</span><span class="cx"> <string>Active Calls</string>
</span><span class="cx"> </property>
</span><del>- <layout class="QVBoxLayout" name="verticalLayout_3">
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout_3">
</ins><span class="cx"> <item>
</span><span class="cx"> <widget class="QListWidget" name="listCalls"/>
</span><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><ins>+ <item>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Active Accounts</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QTableWidget" name="tableAccounts">
+ <property name="alternatingRowColors">
+ <bool>false</bool>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::NoSelection</enum>
+ </property>
+ <property name="selectionBehavior">
+ <enum>QAbstractItemView::SelectRows</enum>
+ </property>
+ <property name="showGrid">
+ <bool>false</bool>
+ </property>
+ <property name="cornerButtonEnabled">
+ <bool>true</bool>
+ </property>
+ <property name="rowCount">
+ <number>0</number>
+ </property>
+ <attribute name="horizontalHeaderVisible">
+ <bool>true</bool>
+ </attribute>
+ <attribute name="horizontalHeaderCascadingSectionResizes">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="verticalHeaderVisible">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="verticalHeaderHighlightSections">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="verticalHeaderVisible">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="horizontalHeaderCascadingSectionResizes">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="horizontalHeaderVisible">
+ <bool>true</bool>
+ </attribute>
+ <attribute name="verticalHeaderHighlightSections">
+ <bool>false</bool>
+ </attribute>
+ <column>
+ <property name="text">
+ <string>Account</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Status</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
</ins><span class="cx"> </layout>
</span><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="lines">@@ -214,7 +279,7 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>805</width>
</del><ins>+ <width>579</width>
</ins><span class="cx"> <height>24</height>
</span><span class="cx"> </rect>
</span><span class="cx"> </property>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>