<!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][14564] </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=14564">14564</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-19 00:46:49 -0500 (Wed, 19 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adjustments to the event handlers. We should rename this class since we are not a state machine...</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachinecpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachineh">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachinecpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.cpp (14563 => 14564)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.cpp 2009-08-19 03:37:19 UTC (rev 14563)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.cpp 2009-08-19 05:46:49 UTC (rev 14564)
</span><span class="lines">@@ -2,10 +2,21 @@
</span><span class="cx"> #include "eslconnection.h"
</span><span class="cx"> #include "esl.h"
</span><span class="cx">
</span><del>-Call::Call(QString orig_uuid, Channel *orig_channel, QString caller_uuid, Channel *caller_channel) :
- _orig_uuid(orig_uuid),
</del><ins>+State::State(int state_id, QString state_name, QHash<QString, QString> variables)
+ : _state_id(state_id),
+ _state_name(state_name),
+ _variables(variables)
+{}
+
+Channel::Channel(QString uuid, State *state)
+ : _uuid(new QString(uuid))
+{
+ _states.append(state);
+ _currentConfig = state;
+}
+
+Call::Call(Channel *orig_channel, Channel *caller_channel) :
</ins><span class="cx"> _orig_channel(orig_channel),
</span><del>- _caller_uuid(caller_uuid),
</del><span class="cx"> _caller_channel(caller_channel)
</span><span class="cx"> {}
</span><span class="cx">
</span><span class="lines">@@ -39,11 +50,34 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- _channels[e._headers.value("Unique-ID")] = new Channel(e._headers.value("Unique-ID"), e._headers);
</del><ins>+ State *state = new State(e._headers.value("Channel-State-Number").toInt(), e._headers.value("Channel-State"), e._headers);
+ _channels[e._headers.value("Unique-ID")] = new Channel(e._headers.value("Unique-ID"), state);
</ins><span class="cx"> emit channelCreated(_channels.value(e._headers.value("Unique-ID")));
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ case (ESL_EVENT_CHANNEL_UUID):
+ {
+ QString uuid = e._headers.value("Old-Unique-ID");
+ QString new_uuid = e._headers.value("Unique-ID");
+ Channel * chan = _channels.value(uuid, NULL);
+ if (chan)
+ {
+ chan->setUUID(new_uuid);
+ if(_calls.contains(uuid))
+ {
+ Call *call = _calls.take(uuid);
+ _calls.insert(new_uuid, call);
+ }
+ else if (_inactive_calls.contains(uuid))
+ {
+ /* This is quite impossible anyway ... */
+ Call *call = _inactive_calls.take(uuid);
+ _inactive_calls.insert(new_uuid, call);
+ }
+ }
+ break;
+ }
</ins><span class="cx"> case (ESL_EVENT_CHANNEL_BRIDGE) :
</span><span class="cx"> {
</span><span class="cx"> QString orig_uuid = e._headers.value("Other-Leg-Unique-ID");
</span><span class="lines">@@ -56,9 +90,10 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- Call * new_call = new Call(orig_uuid, orig_chan, caller_uuid, caller_chan);
</del><ins>+ State *state = new State(e._headers.value("Channel-State-Number").toInt(), e._headers.value("Channel-State"), e._headers);
+ Call * new_call = new Call(orig_chan, caller_chan);
</ins><span class="cx"> _calls.insert(caller_uuid,new_call);
</span><del>- caller_chan->stateChanged(e._headers);
</del><ins>+ caller_chan->stateChanged(state);
</ins><span class="cx"> emit callCreated(new_call);
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -75,9 +110,10 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><ins>+ State *state = new State(e._headers.value("Channel-State-Number").toInt(), e._headers.value("Channel-State"), e._headers);
</ins><span class="cx"> Call *ecall = _calls.take(caller_uuid);
</span><span class="cx"> _inactive_calls.insert(caller_uuid, ecall);
</span><del>- caller_chan->stateChanged(e._headers);
</del><ins>+ caller_chan->stateChanged(state);
</ins><span class="cx"> emit callDestroyed(ecall);
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -90,7 +126,8 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- _channels[e._headers.value("Unique-ID")]->stateChanged(e._headers);
</del><ins>+ State *state = new State(e._headers.value("Channel-State-Number").toInt(), e._headers.value("Channel-State"), e._headers);
+ _channels[e._headers.value("Unique-ID")]->stateChanged(state);
</ins><span class="cx"> emit channelStateChanged(_channels.value(e._headers.value("Unique-ID")));
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -103,8 +140,11 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><ins>+ State *state = new State(e._headers.value("Channel-State-Number").toInt(), e._headers.value("Channel-State"), e._headers);
</ins><span class="cx"> Channel * chan = _channels.take(e._headers.value("Unique-ID"));
</span><span class="cx"> _inactive_channels.insert(e._headers.value("Unique-ID"), chan);
</span><ins>+ chan->stateChanged(state);
+ qDebug() << chan->getStates();
</ins><span class="cx"> emit channelDestroyed(chan);
</span><span class="cx"> }
</span><span class="cx"> break;
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachineh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h (14563 => 14564)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h 2009-08-19 03:37:19 UTC (rev 14563)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h 2009-08-19 05:46:49 UTC (rev 14564)
</span><span class="lines">@@ -7,33 +7,45 @@
</span><span class="cx">
</span><span class="cx"> class ESLconnection;
</span><span class="cx">
</span><del>-class Channel
</del><ins>+class State
</ins><span class="cx"> {
</span><span class="cx"> private:
</span><del>- QString _uuid;
</del><ins>+ int _state_id;
+ QString _state_name;
</ins><span class="cx"> QHash<QString, QString> _variables;
</span><span class="cx"> public:
</span><del>- Channel() {}
- Channel(QString uuid, QHash<QString, QString> variables) : _uuid(uuid), _variables(variables) {}
- QHash<QString, QString> getVariables() { return _variables; }
- QString getUUID() { return _uuid; }
- QString getHeader(QString header) { return _variables.value(header, ""); }
</del><ins>+ State(int state_id, QString state_name, QHash<QString, QString> variables);
</ins><span class="cx"> QHash<QString, QString> getHeaders() { return _variables; }
</span><del>- void stateChanged(QHash<QString, QString> variables) { _variables = variables; }
</del><ins>+ QString getHeader(QString header) { return _variables.value(header, NULL); }
+ QString getStateName() { return _state_name; }
+ int getStateId() { return _state_id; }
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+class Channel
+{
+private:
+ QString *_uuid;
+ QList <State *> _states;
+ State *_currentConfig;
+public:
+ Channel(QString uuid, State *state);
+ QHash<QString, QString> getCurrentStateVariables() { return _currentConfig->getHeaders(); }
+ QString getUUID() { return *_uuid; }
+ void setUUID(QString uuid) { delete _uuid; _uuid = new QString(uuid); }
+ QString getCurrentStateHeader(QString header) { return _currentConfig->getHeader(header); }
+ void stateChanged(State *state) { _states.append(state); _currentConfig = state; }
+ QList <State *> getStates() { return _states; }
+};
+
</ins><span class="cx"> class Call
</span><span class="cx"> {
</span><span class="cx"> private:
</span><del>- QString _orig_uuid;
</del><span class="cx"> Channel *_orig_channel;
</span><del>- QString _caller_uuid;
</del><span class="cx"> Channel *_caller_channel;
</span><span class="cx"> public:
</span><del>- Call(QString orig_uuid, Channel *orig_channel,
- QString caller_uuid, Channel *caller_channel);
- QString getCallerUUID() { return _caller_uuid; }
- QString getOriginateeUUID() { return _orig_uuid; }
</del><ins>+ Call(Channel *orig_channel, Channel *caller_channel);
+ QString getCallerUUID() { return _caller_channel->getUUID(); }
+ QString getOriginateeUUID() { return _orig_channel->getUUID(); }
</ins><span class="cx"> Channel *getCallerChannel() { return _caller_channel; }
</span><span class="cx"> Channel *getOriginateeChannel() { return _orig_channel; }
</span><span class="cx"> };
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp (14563 => 14564)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-08-19 03:37:19 UTC (rev 14563)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-08-19 05:46:49 UTC (rev 14564)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> if (!ch)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- QStandardItem *item = new QStandardItem(QString("%1 - %2").arg(ch->getUUID(), ch->getHeader("Channel-State")));
</del><ins>+ QStandardItem *item = new QStandardItem(QString("%1 - %2").arg(ch->getUUID(), ch->getCurrentStateHeader("Channel-State")));
</ins><span class="cx"> item->setData(ch->getUUID(), Qt::UserRole);
</span><span class="cx"> _channel_model->insertRow(0, item);
</span><span class="cx"> }
</span><span class="lines">@@ -107,8 +107,18 @@
</span><span class="cx"> {
</span><span class="cx"> activeChannelSelected(_channel_model->indexFromItem(item));
</span><span class="cx"> }
</span><del>- item->setText(QString("%1 - %2").arg(ch->getUUID(), ch->getHeader("Channel-State")));
</del><ins>+ item->setText(QString("%1 - %2").arg(ch->getUUID(), ch->getCurrentStateHeader("Channel-State")));
</ins><span class="cx"> }
</span><ins>+
+ foreach (QStandardItem *item, _inactive_channel_model->findItems("*", Qt::MatchWildcard | Qt::MatchRecursive))
+ {
+ if (item->data(Qt::UserRole) == ch->getUUID())
+ if (_inactive_channel_model->itemFromIndex(m_ui->listInactiveChannels->currentIndex()) == item)
+ {
+ inactiveChannelSelected(_inactive_channel_model->indexFromItem(item));
+ }
+ item->setText(QString("%1 - %2").arg(ch->getUUID(), ch->getCurrentStateHeader("Channel-State")));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RealtimeStatisticsDialog::activeChannelSelected(QModelIndex index)
</span><span class="lines">@@ -119,9 +129,9 @@
</span><span class="cx"> if (!ch)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- foreach (QString key, ch->getVariables().keys())
</del><ins>+ foreach (QString key, ch->getCurrentStateVariables().keys())
</ins><span class="cx"> {
</span><del>- m_ui->listActiveVariables->addItem(QString("%1 = %2").arg(key, ch->getVariables().value(key)));
</del><ins>+ m_ui->listActiveVariables->addItem(QString("%1 = %2").arg(key, ch->getCurrentStateVariables().value(key)));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -133,9 +143,9 @@
</span><span class="cx"> if (!ch)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- foreach (QString key, ch->getVariables().keys())
</del><ins>+ foreach (QString key, ch->getCurrentStateVariables().keys())
</ins><span class="cx"> {
</span><del>- m_ui->listInactiveVariables->addItem(QString("%1 = %2").arg(key, ch->getVariables().value(key)));
</del><ins>+ m_ui->listInactiveVariables->addItem(QString("%1 = %2").arg(key, ch->getCurrentStateVariables().value(key)));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -178,9 +188,9 @@
</span><span class="cx"> /* Sanity checking */
</span><span class="cx"> if (!c)
</span><span class="cx"> return;
</span><del>- QString caller_cidnum = c->getCallerChannel()->getHeader("Caller-Caller-ID-Number");
- QString caller_cidname = c->getCallerChannel()->getHeader("variable_effective_caller_id_name");
- QString orig_cidnum = c->getCallerChannel()->getHeader("Caller-Destination-Number");
</del><ins>+ QString caller_cidnum = c->getCallerChannel()->getCurrentStateHeader("Caller-Caller-ID-Number");
+ QString caller_cidname = c->getCallerChannel()->getCurrentStateHeader("variable_effective_caller_id_name");
+ QString orig_cidnum = c->getCallerChannel()->getCurrentStateHeader("Caller-Destination-Number");
</ins><span class="cx"> QString caller_uuid = c->getCallerUUID();
</span><span class="cx"> QString callTitle = QString("%1(%2) <-> %3 (Caller UUID: %4)").arg(caller_cidnum, caller_cidname, orig_cidnum, caller_uuid);
</span><span class="cx"> QListWidgetItem *item = new QListWidgetItem(callTitle, m_ui->listActiveCalls);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>