<!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][14207] </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=14207">14207</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-12 21:48:08 -0500 (Sun, 12 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>We are at the right place now, but ... Why cant we bind to those signals?!</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguifs_guicpp">freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguifs_guih">freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguifsguipro">freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiserver_managercpp">freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiserver_managerh">freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiserver_managerui">freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.ui</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiesl_connectioncpp">freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiesl_connectionh">freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguiesl_connectioncpp"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp (0 => 14207)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp 2009-07-13 02:48:08 UTC (rev 14207)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+#include "esl_oop.h"
+#include "esl_connection.h"
+#include <iostream>
+
+eslConnectionManager::eslConnectionManager() {}
+eslConnectionManager::eslConnectionManager(QString host, QString pass, QString port)
+ : _host(host), _pass(pass), _port(port)
+{
+ doConnect(host, pass, port);
+ start();
+}
+
+eslConnectionManager::~eslConnectionManager()
+{
+ doDisconnect();
+}
+
+void eslConnectionManager::doConnect(QString host, QString pass, QString port)
+{
+ connection = new ESLconnection(host.toAscii(), port.toAscii(), pass.toAscii());
+ eslSetLogLevel(0);
+ isConnected = false;
+}
+
+void eslConnectionManager::doDisconnect()
+{
+ delete connection;
+}
+
+void eslConnectionManager::run()
+{
+ forever
+ {
+ if (connection->connected() && isConnected)
+ {
+ /* We should process our event queue here */
+ ESLevent * event = connection->recvEventTimed(10);
+ if (event)
+ {
+ std::cout << "We received and event!" << std::endl;
+ emit gotEvent(event);
+ }
+ }
+ else if (!connection->connected() && isConnected)
+ {
+ std::cout << "We just got disconnected." << std::endl;
+ isConnected = false;
+ emit gotDisconnected();
+ }
+ else if (connection->connected() && !isConnected)
+ {
+ std::cout << "We just got connected." << std::endl;
+ isConnected = true;
+ connection->sendRecv("log 7");
+ emit gotConnected();
+ }
+ else
+ {
+ std::cout << "We are disconnected and should stop this." << std::endl;
+ doDisconnect();
+ break;
+ }
+ }
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguiesl_connectionh"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.h (0 => 14207)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.h (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.h 2009-07-13 02:48:08 UTC (rev 14207)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+#ifndef ESL_CONNECTION_H
+#define ESL_CONNECTION_H
+
+#include <QThread>
+
+/* Forward declaration of ESLConnection */
+class ESLconnection;
+class ESLevent;
+
+class eslConnectionManager : public QThread
+{
+ Q_OBJECT
+ Q_DISABLE_COPY(eslConnectionManager)
+public:
+ eslConnectionManager();
+ virtual ~eslConnectionManager();
+ eslConnectionManager(QString,QString,QString);
+ void doConnect(QString, QString, QString);
+ void doDisconnect();
+signals:
+ void gotDisconnected();
+ void gotConnected();
+ void gotEvent(ESLevent *);
+private:
+ ESLconnection* connection;
+ QString _host;
+ QString _pass;
+ QString _port;
+ bool isConnected;
+
+protected:
+ void run();
+};
+
+#endif // ESL_CONNECTION_H
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguifs_guicpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp (14206 => 14207)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp 2009-07-12 18:58:21 UTC (rev 14206)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp 2009-07-13 02:48:08 UTC (rev 14207)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> #include "fs_gui.h"
</span><span class="cx"> #include "ui_fs_gui.h"
</span><ins>+#include <iostream>
</ins><span class="cx">
</span><span class="cx"> Cfsgui::Cfsgui(QWidget *parent) :
</span><span class="cx"> QMainWindow(parent),
</span><span class="lines">@@ -7,14 +8,32 @@
</span><span class="cx"> serverDialog(new CserverManager)
</span><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><ins>+ connect(m_ui->actionConnect, SIGNAL(triggered())
+ , serverDialog, SLOT(show()));
+ connect(serverDialog, SIGNAL(doConnect(QString,QString,QString)),
+ this, SLOT(newConnectionFromDialog(QString,QString,QString)));
+
+ /*connect(eslConnection, SIGNAL(gotConnected(void)),
+ this, SLOT(gotConnectedSlot(void)));
+ connect(eslConnection, SIGNAL(gotDisconnected(void)),
+ this, SLOT(gotDisconnectedSlot(void)));*/
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> Cfsgui::~Cfsgui()
</span><span class="cx"> {
</span><span class="cx"> delete m_ui;
</span><span class="cx"> delete serverDialog;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Cfsgui::gotConnectedSlot()
+{
+ m_ui->textConsole->append("Conneted!");
+ m_ui->statusBar->showMessage("Connected");
+}
+void Cfsgui::gotDisconnectedSlot()
+{
+ m_ui->statusBar->showMessage("Disconnected");
+ m_ui->textConsole->append("Conneted!");
+}
</ins><span class="cx"> void Cfsgui::changeEvent(QEvent *e)
</span><span class="cx"> {
</span><span class="cx"> QMainWindow::changeEvent(e);
</span><span class="lines">@@ -30,5 +49,12 @@
</span><span class="cx"> void Cfsgui::closeEvent(QCloseEvent *e)
</span><span class="cx"> {
</span><span class="cx"> /* TODO: We have to stop threads and do cleanup */
</span><ins>+ delete eslConnection;
</ins><span class="cx"> e->accept();
</span><span class="cx"> }
</span><ins>+
+void Cfsgui::newConnectionFromDialog(QString host, QString pass, QString port)
+{
+ m_ui->statusBar->showMessage("Connecting...");
+ eslConnection = new eslConnectionManager(host, pass, port);
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguifs_guih"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h (14206 => 14207)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h 2009-07-12 18:58:21 UTC (rev 14206)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h 2009-07-13 02:48:08 UTC (rev 14207)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx">
</span><span class="cx"> #include <QtGui>
</span><span class="cx"> #include "server_manager.h"
</span><ins>+#include "esl_connection.h"
</ins><span class="cx">
</span><span class="cx"> namespace Ui {
</span><span class="cx"> class Cfsgui;
</span><span class="lines">@@ -19,9 +20,15 @@
</span><span class="cx"> virtual void changeEvent(QEvent *e);
</span><span class="cx"> void closeEvent(QCloseEvent *e);
</span><span class="cx">
</span><ins>+private slots:
+ void newConnectionFromDialog(QString,QString,QString);
+ void gotConnectedSlot();
+ void gotDisconnectedSlot();
+
</ins><span class="cx"> private:
</span><span class="cx"> Ui::Cfsgui *m_ui;
</span><span class="cx"> CserverManager *serverDialog;
</span><ins>+ eslConnectionManager *eslConnection;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // FS_GUI_H
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguifsguipro"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro (14206 => 14207)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro 2009-07-12 18:58:21 UTC (rev 14206)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro 2009-07-13 02:48:08 UTC (rev 14207)
</span><span class="lines">@@ -5,10 +5,12 @@
</span><span class="cx"> TEMPLATE = app
</span><span class="cx"> SOURCES += main.cpp \
</span><span class="cx"> fs_gui.cpp \
</span><del>- server_manager.cpp
-INCLUDEPATH += ../../../libs/esl/src/include/
</del><ins>+ server_manager.cpp \
+ esl_connection.cpp
+INCLUDEPATH += ../../../libs/esl/src/include
</ins><span class="cx"> HEADERS += fs_gui.h \
</span><del>- server_manager.h
</del><ins>+ server_manager.h \
+ esl_connection.h
</ins><span class="cx"> FORMS += fs_gui.ui \
</span><span class="cx"> server_manager.ui
</span><span class="cx"> LIBS += -L../../../libs/esl \
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguiserver_managercpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.cpp (14206 => 14207)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.cpp 2009-07-12 18:58:21 UTC (rev 14206)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.cpp 2009-07-13 02:48:08 UTC (rev 14207)
</span><span class="lines">@@ -6,6 +6,8 @@
</span><span class="cx"> m_ui(new Ui::CserverManager)
</span><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><ins>+ connect(this, SIGNAL(accepted()),
+ this, SLOT(newConnection()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CserverManager::~CserverManager()
</span><span class="lines">@@ -24,3 +26,11 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+void CserverManager::newConnection()
+{
+ //TODO: Sanity checking needed.
+ emit doConnect(m_ui->host->text(),
+ m_ui->pass->text(),
+ m_ui->port->text());
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguiserver_managerh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.h (14206 => 14207)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.h 2009-07-12 18:58:21 UTC (rev 14206)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.h 2009-07-13 02:48:08 UTC (rev 14207)
</span><span class="lines">@@ -13,10 +13,12 @@
</span><span class="cx"> public:
</span><span class="cx"> explicit CserverManager(QWidget *parent = 0);
</span><span class="cx"> virtual ~CserverManager();
</span><del>-
</del><ins>+signals:
+ void doConnect(QString, QString, QString);
</ins><span class="cx"> protected:
</span><span class="cx"> virtual void changeEvent(QEvent *e);
</span><del>-
</del><ins>+private slots:
+ void newConnection();
</ins><span class="cx"> private:
</span><span class="cx"> Ui::CserverManager *m_ui;
</span><span class="cx"> };
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguiserver_managerui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.ui (14206 => 14207)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.ui 2009-07-12 18:58:21 UTC (rev 14206)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.ui 2009-07-13 02:48:08 UTC (rev 14207)
</span><span class="lines">@@ -39,7 +39,11 @@
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="0" column="1">
</span><del>- <widget class="QLineEdit" name="lineEdit"/>
</del><ins>+ <widget class="QLineEdit" name="host">
+ <property name="text">
+ <string>localhost</string>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> <item row="1" column="0">
</span><span class="cx"> <widget class="QLabel" name="label_2">
</span><span class="lines">@@ -49,7 +53,11 @@
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="1" column="1">
</span><del>- <widget class="QLineEdit" name="lineEdit_2"/>
</del><ins>+ <widget class="QLineEdit" name="pass">
+ <property name="text">
+ <string>ClueCon</string>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> <item row="2" column="0">
</span><span class="cx"> <widget class="QLabel" name="label_3">
</span><span class="lines">@@ -59,7 +67,11 @@
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="2" column="1">
</span><del>- <widget class="QLineEdit" name="lineEdit_3"/>
</del><ins>+ <widget class="QLineEdit" name="port">
+ <property name="text">
+ <string>8021</string>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> <item row="3" column="0">
</span><span class="cx"> <widget class="QPushButton" name="pushButton">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>