<!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][14293] </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=14293">14293</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-17 23:13:36 -0500 (Fri, 17 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make fsgui less blocking. More then that can only be done when event hashing is complete.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcesl_connectioncpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcfs_guicpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludeesl_connectionh">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/esl_connection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp (14292 => 14293)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-18 00:43:53 UTC (rev 14292)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-18 04:13:36 UTC (rev 14293)
</span><span class="lines">@@ -116,8 +116,6 @@
</span><span class="cx"> this, SLOT(gotEventSlot(ESLevent*)));
</span><span class="cx"> connect(eslConnection, SIGNAL(gotConsoleEvent(ESLeventLog*)),
</span><span class="cx"> this, SLOT(gotConsoleEventSlot(ESLeventLog*)));
</span><del>-
- eslConnection->doConnect();
</del><span class="cx"> }
</span><span class="cx"> void consolePage::changeEvent(QEvent *e)
</span><span class="cx"> {
</span><span class="lines">@@ -220,8 +218,7 @@
</span><span class="cx"> appendConsoleText(QString("Cannot change loglevel if not connected."));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- ESLevent *event = eslConnection->sendRecv(QString("log %1").arg(loglevel).toAscii());
- if (event)
</del><ins>+ if (eslConnection->setConsoleLogLevel(loglevel))
</ins><span class="cx"> {
</span><span class="cx"> appendConsoleText(QString("Changed loglevel to %1").arg(m_ui->comboLogLevel->currentText()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcesl_connectioncpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp (14292 => 14293)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp 2009-07-18 00:43:53 UTC (rev 14292)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp 2009-07-18 04:13:36 UTC (rev 14293)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #include <esl_connection.h>
</span><span class="cx"> #include "global_defines.h"
</span><span class="cx">
</span><del>-#define connection_construct_common() memset(&handle, 0, sizeof(handle)); last_event_obj = NULL
</del><span class="cx"> #define event_construct_common() event = NULL; serialized_string = NULL; mine = 0; hp = NULL
</span><span class="cx">
</span><span class="cx"> void eslSetLogLevel(int level)
</span><span class="lines">@@ -50,54 +49,60 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ESLconnection::ESLconnection(const char *host, const char *port, const char *password)
</span><del>- : _host(new QString(host)), _port(new QString(port)), _pass(new QString(password))
-{
- connection_construct_common();
-}
-
</del><ins>+ : handle(NULL),_host(new QString(host)), _port(new QString(port)),
+ _pass(new QString(password)){}
</ins><span class="cx"> ESLconnection::~ESLconnection()
</span><span class="cx"> {
</span><del>- if (handle.connected) {
- esl_disconnect(&handle);
</del><ins>+ if (connected()) {
+ esl_disconnect(handle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int ESLconnection::disconnect()
</span><span class="cx"> {
</span><del>- if (handle.connected) {
- return esl_disconnect(&handle);
</del><ins>+ if (handle)
+ {
+ if (handle->connected)
+ {
+ return esl_disconnect(handle);
+ }
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ESLconnection::doConnect()
</del><ins>+bool ESLconnection::setConsoleLogLevel(int level)
</ins><span class="cx"> {
</span><del>- int x_port = _port->toInt();
-
- if (esl_connect(&handle, _host->toAscii(), x_port, _pass->toAscii()) == ESL_SUCCESS)
</del><ins>+ ESLevent *event = sendRecv(QString("log %1").arg(level).toAscii());
+ if (event)
</ins><span class="cx"> {
</span><del>- emit gotConnected();
</del><ins>+ return true;
</ins><span class="cx"> }
</span><ins>+ return false;
+}
+
+void ESLconnection::doConnect()
+{
</ins><span class="cx"> start();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int ESLconnection::connected()
</span><span class="cx"> {
</span><del>- return handle.connected;
</del><ins>+ if (handle)
+ return handle->connected;
+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int ESLconnection::send(const char *cmd)
</span><span class="cx"> {
</span><del>- return esl_send(&handle, cmd);
</del><ins>+ return esl_send(handle, cmd);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ESLevent *ESLconnection::sendRecv(const char *cmd)
</span><span class="cx"> {
</span><del>- if (esl_send_recv(&handle, cmd) == ESL_SUCCESS) {
</del><ins>+ if (esl_send_recv(handle, cmd) == ESL_SUCCESS) {
</ins><span class="cx"> esl_event_t *event;
</span><del>- esl_event_dup(&event, handle.last_sr_event);
</del><ins>+ esl_event_dup(&event, handle->last_sr_event);
</ins><span class="cx"> return new ESLevent(event, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -122,9 +127,9 @@
</span><span class="cx"> *(cmd_buf + (len)) = '\0';
</span><span class="cx">
</span><span class="cx">
</span><del>- if (esl_send_recv(&handle, cmd_buf) == ESL_SUCCESS) {
</del><ins>+ if (esl_send_recv(handle, cmd_buf) == ESL_SUCCESS) {
</ins><span class="cx"> esl_event_t *event;
</span><del>- esl_event_dup(&event, handle.last_sr_event);
</del><ins>+ esl_event_dup(&event, handle->last_sr_event);
</ins><span class="cx"> return new ESLevent(event, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -150,9 +155,9 @@
</span><span class="cx"> snprintf(cmd_buf, len, "bgapi %s %s", cmd, arg ? arg : "");
</span><span class="cx"> *(cmd_buf + (len)) = '\0';
</span><span class="cx">
</span><del>- if (esl_send_recv(&handle, cmd_buf) == ESL_SUCCESS) {
</del><ins>+ if (esl_send_recv(handle, cmd_buf) == ESL_SUCCESS) {
</ins><span class="cx"> esl_event_t *event;
</span><del>- esl_event_dup(&event, handle.last_sr_event);
</del><ins>+ esl_event_dup(&event, handle->last_sr_event);
</ins><span class="cx"> return new ESLevent(event, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -163,9 +168,9 @@
</span><span class="cx">
</span><span class="cx"> ESLevent *ESLconnection::getInfo()
</span><span class="cx"> {
</span><del>- if (handle.connected && handle.info_event) {
</del><ins>+ if (handle->connected && handle->info_event) {
</ins><span class="cx"> esl_event_t *event;
</span><del>- esl_event_dup(&event, handle.info_event);
</del><ins>+ esl_event_dup(&event, handle->info_event);
</ins><span class="cx"> return new ESLevent(event, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -175,40 +180,40 @@
</span><span class="cx"> int ESLconnection::setAsyncExecute(const char *val)
</span><span class="cx"> {
</span><span class="cx"> if (val) {
</span><del>- handle.async_execute = esl_true(val);
</del><ins>+ handle->async_execute = esl_true(val);
</ins><span class="cx"> }
</span><del>- return handle.async_execute;
</del><ins>+ return handle->async_execute;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int ESLconnection::setEventLock(const char *val)
</span><span class="cx"> {
</span><span class="cx"> if (val) {
</span><del>- handle.event_lock = esl_true(val);
</del><ins>+ handle->event_lock = esl_true(val);
</ins><span class="cx"> }
</span><del>- return handle.event_lock;
</del><ins>+ return handle->event_lock;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int ESLconnection::execute(const char *app, const char *arg, const char *uuid)
</span><span class="cx"> {
</span><del>- return esl_execute(&handle, app, arg, uuid);
</del><ins>+ return esl_execute(handle, app, arg, uuid);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> int ESLconnection::executeAsync(const char *app, const char *arg, const char *uuid)
</span><span class="cx"> {
</span><del>- int async = handle.async_execute;
</del><ins>+ int async = handle->async_execute;
</ins><span class="cx"> int r;
</span><span class="cx">
</span><del>- handle.async_execute = 1;
- r = esl_execute(&handle, app, arg, uuid);
- handle.async_execute = async;
</del><ins>+ handle->async_execute = 1;
+ r = esl_execute(handle, app, arg, uuid);
+ handle->async_execute = async;
</ins><span class="cx">
</span><span class="cx"> return r;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int ESLconnection::sendEvent(ESLevent *send_me)
</span><span class="cx"> {
</span><del>- return esl_sendevent(&handle, send_me->event);
</del><ins>+ return esl_sendevent(handle, send_me->event);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ESLevent *ESLconnection::recvEvent()
</span><span class="lines">@@ -217,8 +222,8 @@
</span><span class="cx"> delete last_event_obj;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (esl_recv_event(&handle, 1, NULL) == ESL_SUCCESS) {
- esl_event_t *e = handle.last_ievent ? handle.last_ievent : handle.last_event;
</del><ins>+ if (esl_recv_event(handle, 1, NULL) == ESL_SUCCESS) {
+ esl_event_t *e = handle->last_ievent ? handle->last_ievent : handle->last_event;
</ins><span class="cx"> if (e) {
</span><span class="cx"> esl_event_t *event;
</span><span class="cx"> esl_event_dup(&event, e);
</span><span class="lines">@@ -239,8 +244,8 @@
</span><span class="cx"> last_event_obj = NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (esl_recv_event_timed(&handle, ms, 1, NULL) == ESL_SUCCESS) {
- esl_event_t *e = handle.last_ievent ? handle.last_ievent : handle.last_event;
</del><ins>+ if (esl_recv_event_timed(handle, ms, 1, NULL) == ESL_SUCCESS) {
+ esl_event_t *e = handle->last_ievent ? handle->last_ievent : handle->last_event;
</ins><span class="cx"> if (e) {
</span><span class="cx"> esl_event_t *event;
</span><span class="cx"> esl_event_dup(&event, e);
</span><span class="lines">@@ -254,11 +259,11 @@
</span><span class="cx">
</span><span class="cx"> ESLevent *ESLconnection::filter(const char *header, const char *value)
</span><span class="cx"> {
</span><del>- esl_status_t status = esl_filter(&handle, header, value);
</del><ins>+ esl_status_t status = esl_filter(handle, header, value);
</ins><span class="cx">
</span><del>- if (status == ESL_SUCCESS && handle.last_sr_event) {
</del><ins>+ if (status == ESL_SUCCESS && handle->last_sr_event) {
</ins><span class="cx"> esl_event_t *event;
</span><del>- esl_event_dup(&event, handle.last_sr_event);
</del><ins>+ esl_event_dup(&event, handle->last_sr_event);
</ins><span class="cx"> return new ESLevent(event, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -274,12 +279,19 @@
</span><span class="cx"> type_id = ESL_EVENT_TYPE_XML;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return esl_events(&handle, type_id, value);
</del><ins>+ return esl_events(handle, type_id, value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ESLconnection::run(void)
</span><span class="cx"> {
</span><span class="cx">
</span><ins>+ handle = new esl_handle_t;
+ memset(handle, 0, sizeof(esl_handle_t));
+ last_event_obj = NULL;
+ if (esl_connect(handle, _host->toAscii(), _port->toInt(), _pass->toAscii()) == ESL_SUCCESS)
+ {
+ emit gotConnected();
+ }
</ins><span class="cx"> while(connected())
</span><span class="cx"> {
</span><span class="cx"> ESLevent * event = recvEventTimed(10);
</span><span class="lines">@@ -299,9 +311,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (!QString(handle.err).isEmpty())
</del><ins>+ if (!QString(handle->err).isEmpty())
</ins><span class="cx"> {
</span><del>- emit connectionFailed(handle.err);
</del><ins>+ emit connectionFailed(handle->err);
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcfs_guicpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp (14292 => 14293)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp 2009-07-18 00:43:53 UTC (rev 14292)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp 2009-07-18 04:13:36 UTC (rev 14293)
</span><span class="lines">@@ -47,7 +47,8 @@
</span><span class="cx"> prefDialog(NULL)
</span><span class="cx"> {
</span><span class="cx">
</span><del>- m_ui->setupUi(this);
</del><ins>+ m_ui->setupUi(this);
+ m_ui->tabWidget->clear();
</ins><span class="cx">
</span><span class="cx"> // Set the default status bar message
</span><span class="cx"> m_ui->statusBar->showMessage(tr("Ready"));
</span><span class="lines">@@ -69,7 +70,6 @@
</span><span class="cx"> connect(m_ui->actionPreferences, SIGNAL(triggered()),
</span><span class="cx"> this, SLOT(showPreferences()));
</span><span class="cx">
</span><del>- m_ui->tabWidget->clear();
</del><span class="cx"> }
</span><span class="cx"> Cfsgui::~Cfsgui()
</span><span class="cx"> {
</span><span class="lines">@@ -131,6 +131,7 @@
</span><span class="cx"> m_ui->tabWidget->addTab(page, serverDialog->getHost());
</span><span class="cx"> page->init(serverDialog->getHost());
</span><span class="cx"> m_ui->tabWidget->setCurrentWidget(page);
</span><ins>+ page->doConnect();
</ins><span class="cx"> }
</span><span class="cx"> this->activateWindow();
</span><span class="cx"> }
</span><span class="lines">@@ -180,10 +181,12 @@
</span><span class="cx"> void Cfsgui::doDisconnect()
</span><span class="cx"> {
</span><span class="cx"> consolePage *tab = static_cast<consolePage *>(m_ui->tabWidget->widget(m_ui->tabWidget->currentIndex()));
</span><del>- tab->doDisconnect();
</del><ins>+ if (tab)
+ tab->doDisconnect();
</ins><span class="cx"> }
</span><span class="cx"> void Cfsgui::doConnect()
</span><span class="cx"> {
</span><span class="cx"> consolePage *tab = static_cast<consolePage *>(m_ui->tabWidget->widget(m_ui->tabWidget->currentIndex()));
</span><del>- tab->doConnect();
</del><ins>+ if (tab)
+ tab->doConnect();
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludeesl_connectionh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/esl_connection.h (14292 => 14293)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/esl_connection.h 2009-07-18 00:43:53 UTC (rev 14292)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/esl_connection.h 2009-07-18 04:13:36 UTC (rev 14293)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> {
</span><span class="cx"> Q_OBJECT
</span><span class="cx"> private:
</span><del>- esl_handle_t handle;
</del><ins>+ esl_handle_t *handle;
</ins><span class="cx"> ESLevent *last_event_obj;
</span><span class="cx"> QString *_host;
</span><span class="cx"> QString *_port;
</span><span class="lines">@@ -113,6 +113,7 @@
</span><span class="cx"> int setAsyncExecute(const char *val);
</span><span class="cx"> int setEventLock(const char *val);
</span><span class="cx"> int disconnect(void);
</span><ins>+ bool setConsoleLogLevel(int);
</ins><span class="cx"> signals:
</span><span class="cx"> void gotConnected(void);
</span><span class="cx"> void gotDisconnected(void);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>