<!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][16129] </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=16129">16129</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-03 14:17:38 -0600 (Sun, 03 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Treat events for inbound and outbound calls separatly and start to treat them right.</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="#freeswitchtrunkcontribjmesquitaFSPhonemainwindowui">freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui</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 (16128 => 16129)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/call.h 2010-01-03 14:58:50 UTC (rev 16128)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/call.h 2010-01-03 20:17:38 UTC (rev 16129)
</span><span class="lines">@@ -47,6 +47,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>+ void setbUUID(QString uuid) { _buuid = uuid; }
</ins><span class="cx"> fsphone_call_direction_t getDirection() { return _direction; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -55,6 +56,7 @@
</span><span class="cx"> QString _cid_number;
</span><span class="cx"> fsphone_call_direction_t _direction;
</span><span class="cx"> QString _uuid;
</span><ins>+ QString _buuid;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Q_DECLARE_METATYPE(Call)
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonefshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.cpp (16128 => 16129)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.cpp 2010-01-03 14:58:50 UTC (rev 16128)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.cpp 2010-01-03 20:17:38 UTC (rev 16129)
</span><span class="lines">@@ -145,16 +145,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FSHost::generalEventHandler(switch_event_t *event)
</del><ins>+switch_status_t FSHost::processAlegEvent(switch_event_t * event, QString uuid)
</ins><span class="cx"> {
</span><del>- QString uuid = switch_event_get_header_nil(event, "Unique-ID");
-
- if (_active_calls.contains(uuid))
</del><ins>+ if (_active_calls.value(uuid)->getDirection() == FSPHONE_CALL_DIRECTION_INBOUND)
</ins><span class="cx"> {
</span><span class="cx"> switch(event->event_id) {
</span><span class="cx"> case SWITCH_EVENT_CHANNEL_ANSWER:
</span><del>- case SWITCH_EVENT_CHANNEL_BRIDGE:
</del><span class="cx"> {
</span><ins>+ _active_calls.value(uuid)->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
+ _bleg_uuids.insert(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"), uuid);
</ins><span class="cx"> emit answered(uuid);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -163,26 +162,85 @@
</span><span class="cx"> emit hungup(uuid);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case SWITCH_EVENT_CUSTOM:
</del><ins>+ case SWITCH_EVENT_CHANNEL_STATE:
</ins><span class="cx"> {
</span><del>- /* We dont want to treat this anymore */
- if (strcmp(event->subclass_name, "portaudio::ringing") == 0)
- {
- return;
- }
</del><ins>+ printf("CHANNEL_STATE Answer-State: %s | Channel-State: %s | %s | %s\n", switch_event_get_header_nil(event, "Answer-State"),switch_event_get_header_nil(event, "Channel-State"), uuid.toAscii().constData(), switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
+ break;
</ins><span class="cx"> }
</span><span class="cx"> default:
</span><span class="cx"> {
</span><del>- 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());
</del><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ /* Outbound call */
+ else
+ {
+ switch(event->event_id)
+ {
+ case SWITCH_EVENT_CHANNEL_BRIDGE:
+ {
+ _active_calls.value(uuid)->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
+ _bleg_uuids.insert(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"), uuid);
+ break;
+ }
+ default:
+ break;
+ }
+ }
+ return SWITCH_STATUS_SUCCESS;
+}
</ins><span class="cx">
</span><ins>+switch_status_t FSHost::processBlegEvent(switch_event_t * event, QString buuid)
+{
+ QString uuid = _bleg_uuids.value(buuid);
+ printf("We know this is an uuid related to our call: %s | Event: %s\n", buuid.toAscii().constData(),
+ switch_event_name(event->event_id));
+ /* Inbound call */
+ if (_active_calls.value(uuid)->getDirection() == FSPHONE_CALL_DIRECTION_INBOUND)
+ {
+ qDebug() << " Inbound call";
+ }
+ /* Outbound call */
+ else
+ {
+ switch(event->event_id)
+ {
+ case SWITCH_EVENT_CHANNEL_ANSWER:
+ {
+ emit answered(uuid);
+ }
+ default:
+ break;
+ }
+ }
+ return SWITCH_STATUS_SUCCESS;
+}
+
+void FSHost::generalEventHandler(switch_event_t *event)
+{
+ QString uuid = switch_event_get_header_nil(event, "Unique-ID");
+
+ if (_bleg_uuids.contains(uuid))
+ {
+ if (processBlegEvent(event, uuid) == SWITCH_STATUS_SUCCESS)
+ {
+ return;
+ }
+ }
+ if (_active_calls.contains(uuid))
+ {
+ if (processAlegEvent(event, uuid) == SWITCH_STATUS_SUCCESS)
+ {
+ return;
+ }
+ }
+
</ins><span class="cx"> /* This is how we identify new calls, inbound and outbound */
</span><span class="cx"> switch(event->event_id) {
</span><span class="cx"> case SWITCH_EVENT_CUSTOM:
</span><span class="cx"> {
</span><del>- if (strcmp(event->subclass_name, "portaudio::ringing") == 0)
</del><ins>+ if (strcmp(event->subclass_name, "portaudio::ringing") == 0 && !_active_calls.contains(uuid))
</ins><span class="cx"> {
</span><span class="cx"> Call *call = new Call(atoi(switch_event_get_header_nil(event, "call_id")),
</span><span class="cx"> switch_event_get_header_nil(event, "Caller-Caller-ID-Name"),
</span><span class="lines">@@ -196,7 +254,7 @@
</span><span class="cx"> {
</span><span class="cx"> Call *call = new Call(atoi(switch_event_get_header_nil(event, "call_id")),NULL,
</span><span class="cx"> switch_event_get_header_nil(event, "Caller-Destination-Number"),
</span><del>- FSPHONE_CALL_DIRECTION_INBOUND,
</del><ins>+ FSPHONE_CALL_DIRECTION_OUTBOUND,
</ins><span class="cx"> uuid);
</span><span class="cx"> _active_calls.insert(uuid, call);
</span><span class="cx"> emit newOutgoingCall(uuid);
</span><span class="lines">@@ -226,7 +284,7 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- printf("We got a not treated custom event: %s\n", (!zstr(event->subclass_name) ? event->subclass_name : "NULL"));
</del><ins>+ //printf("We got a not treated custom event: %s\n", (!zstr(event->subclass_name) ? event->subclass_name : "NULL"));
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonefshosth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.h (16128 => 16129)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.h 2010-01-03 14:58:50 UTC (rev 16128)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/fshost.h 2010-01-03 20:17:38 UTC (rev 16129)
</span><span class="lines">@@ -80,7 +80,10 @@
</span><span class="cx"> void gwStateChange(QString, int);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ switch_status_t processBlegEvent(switch_event_t *, QString);
+ switch_status_t processAlegEvent(switch_event_t *, QString);
</ins><span class="cx"> QHash<QString, Call*> _active_calls;
</span><ins>+ QHash<QString, QString> _bleg_uuids;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> extern FSHost g_FSHost;
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui (16128 => 16129)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui 2010-01-03 14:58:50 UTC (rev 16128)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui 2010-01-03 20:17:38 UTC (rev 16129)
</span><span class="lines">@@ -213,6 +213,9 @@
</span><span class="cx"> <layout class="QHBoxLayout" name="horizontalLayout_2">
</span><span class="cx"> <item>
</span><span class="cx"> <widget class="QTableWidget" name="tableAccounts">
</span><ins>+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
</ins><span class="cx"> <property name="alternatingRowColors">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </property>
</span><span class="lines">@@ -243,18 +246,6 @@
</span><span class="cx"> <attribute name="verticalHeaderHighlightSections">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </attribute>
</span><del>- <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>
</del><span class="cx"> <column>
</span><span class="cx"> <property name="text">
</span><span class="cx"> <string>Account</string>
</span><span class="lines">@@ -280,7 +271,7 @@
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><span class="cx"> <width>579</width>
</span><del>- <height>24</height>
</del><ins>+ <height>22</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> </widget>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>