<!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][16316] </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=16316">16316</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-14 21:30:11 -0600 (Thu, 14 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change to start messing with QSharedPointer instead of regular pointers to deal with events correctly. Thanks Math.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommcallcpp">freeswitch/trunk/fscomm/call.cpp</a></li>
<li><a href="#freeswitchtrunkfscommcallh">freeswitch/trunk/fscomm/call.h</a></li>
<li><a href="#freeswitchtrunkfscommfshostcpp">freeswitch/trunk/fscomm/fshost.cpp</a></li>
<li><a href="#freeswitchtrunkfscommfshosth">freeswitch/trunk/fscomm/fshost.h</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowcpp">freeswitch/trunk/fscomm/mainwindow.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowh">freeswitch/trunk/fscomm/mainwindow.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommcallcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/call.cpp (16315 => 16316)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/call.cpp 2010-01-15 00:31:43 UTC (rev 16315)
+++ freeswitch/trunk/fscomm/call.cpp 2010-01-15 03:30:11 UTC (rev 16316)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "call.h"
</span><ins>+#include <fshost.h>
</ins><span class="cx">
</span><span class="cx"> Call::Call()
</span><span class="cx"> {
</span></span></pre></div>
<a id="freeswitchtrunkfscommcallh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/call.h (16315 => 16316)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/call.h 2010-01-15 00:31:43 UTC (rev 16315)
+++ freeswitch/trunk/fscomm/call.h 2010-01-15 03:30:11 UTC (rev 16316)
</span><span class="lines">@@ -31,12 +31,12 @@
</span><span class="cx">
</span><span class="cx"> #include <QtCore>
</span><span class="cx"> #include <QString>
</span><del>-#include <fshost.h>
</del><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> FSCOMM_CALL_STATE_RINGING = 0,
</span><span class="cx"> FSCOMM_CALL_STATE_TRYING = 1,
</span><del>- FSCOMM_CALL_STATE_ANSWERED = 2
</del><ins>+ FSCOMM_CALL_STATE_ANSWERED = 2,
+ FSCOMM_CALL_STATE_FAILED = 3
</ins><span class="cx"> } fscomm_call_state_t;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="lines">@@ -57,11 +57,14 @@
</span><span class="cx"> fscomm_call_direction_t getDirection() { return _direction; }
</span><span class="cx"> fscomm_call_state_t getState() { return _state; }
</span><span class="cx"> void setState(fscomm_call_state_t state) { _state = state; }
</span><ins>+ void setCause(QString cause) { _cause = cause; }
+ QString getCause() { return _cause; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> int _call_id;
</span><span class="cx"> QString _cid_name;
</span><span class="cx"> QString _cid_number;
</span><ins>+ QString _cause;
</ins><span class="cx"> fscomm_call_direction_t _direction;
</span><span class="cx"> QString _uuid;
</span><span class="cx"> QString _buuid;
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16315 => 16316)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-01-15 00:31:43 UTC (rev 16315)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-01-15 03:30:11 UTC (rev 16316)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #include <QtGui>
</span><span class="cx"> #include "fshost.h"
</span><del>-#include "call.h"
</del><span class="cx"> #include "mod_qsettings/mod_qsettings.h"
</span><span class="cx">
</span><span class="cx"> /* Declare it globally */
</span><span class="lines">@@ -43,7 +42,7 @@
</span><span class="cx"> switch_core_setrlimits();
</span><span class="cx"> switch_core_set_globals();
</span><span class="cx">
</span><del>- qRegisterMetaType<Call>("Call");
</del><ins>+ qRegisterMetaType<QSharedPointer<Call> >("QSharedPointer<Call>");
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -160,17 +159,17 @@
</span><span class="cx"> switch_status_t FSHost::processAlegEvent(switch_event_t * event, QString uuid)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><del>- Call * call = _active_calls.value(uuid);
</del><ins>+ QSharedPointer<Call> call = _active_calls.value(uuid);
</ins><span class="cx"> /* Inbound call */
</span><del>- if (call->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
</del><ins>+ if (call.data()->getDirection() == FSCOMM_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><span class="cx"> {
</span><del>- call->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
</del><ins>+ call.data()->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
</ins><span class="cx"> _bleg_uuids.insert(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"), uuid);
</span><del>- call->setState(FSCOMM_CALL_STATE_ANSWERED);
- emit answered(uuid);
</del><ins>+ call.data()->setState(FSCOMM_CALL_STATE_ANSWERED);
+ emit answered(call);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE:
</span><span class="lines">@@ -180,7 +179,7 @@
</span><span class="cx"> }
</span><span class="cx"> case SWITCH_EVENT_CHANNEL_STATE:
</span><span class="cx"> {
</span><del>- 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"));
</del><ins>+ qDebug() << QString("CHANNEL_STATE Answer-State: %1 | Channel-State: %2 | %3 | %4\n").arg(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"));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span><span class="lines">@@ -196,21 +195,24 @@
</span><span class="cx"> {
</span><span class="cx"> case SWITCH_EVENT_CHANNEL_BRIDGE:
</span><span class="cx"> {
</span><del>- _active_calls.value(uuid)->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
</del><ins>+ _active_calls.value(uuid).data()->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
</ins><span class="cx"> _bleg_uuids.insert(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"), uuid);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE:
</span><span class="cx"> {
</span><del>- if (call->getState() == FSCOMM_CALL_STATE_TRYING)
</del><ins>+ if (call.data()->getState() == FSCOMM_CALL_STATE_TRYING)
</ins><span class="cx"> {
</span><del>- emit callFailed(uuid);
</del><ins>+ QString cause = switch_event_get_header_nil(event, "Hangup-Cause");
+ call.data()->setState(FSCOMM_CALL_STATE_FAILED);
+ call.data()->setCause(cause);
+ emit callFailed(call);
</ins><span class="cx"> _active_calls.take(uuid);
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span><del>- printf("A leg: %s(%s)\n",switch_event_name(event->event_id), switch_event_get_header_nil(event, "Event-Subclass"));
</del><ins>+ qDebug() << QString("A leg: %1(%2)\n").arg(switch_event_name(event->event_id), switch_event_get_header_nil(event, "Event-Subclass"));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -221,9 +223,9 @@
</span><span class="cx"> {
</span><span class="cx"> QString uuid = _bleg_uuids.value(buuid);
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><del>- Call * call = _active_calls.value(uuid);
</del><ins>+ QSharedPointer<Call> call = _active_calls.value(uuid);
</ins><span class="cx"> /* Inbound call */
</span><del>- if (call->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
</del><ins>+ if (call.data()->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
</ins><span class="cx"> {
</span><span class="cx"> qDebug() << " Inbound call";
</span><span class="cx"> }
</span><span class="lines">@@ -234,12 +236,13 @@
</span><span class="cx"> {
</span><span class="cx"> case SWITCH_EVENT_CHANNEL_ANSWER:
</span><span class="cx"> {
</span><del>- emit answered(uuid);
</del><ins>+ emit answered(call);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE:
</span><span class="cx"> {
</span><del>- emit hungup(_active_calls.take(uuid));
</del><ins>+ _active_calls.take(uuid);
+ emit hungup(call);
</ins><span class="cx"> _bleg_uuids.take(buuid);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -247,15 +250,15 @@
</span><span class="cx"> {
</span><span class="cx"> if (QString(switch_event_get_header_nil(event, "Answer-State")) == "early")
</span><span class="cx"> {
</span><del>- call->setState(FSCOMM_CALL_STATE_RINGING);
- emit ringing(uuid);
</del><ins>+ call.data()->setState(FSCOMM_CALL_STATE_RINGING);
+ emit ringing(call);
</ins><span class="cx"> }
</span><span class="cx"> //printEventHeaders(event);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- printf("B leg: %s(%s)\n",switch_event_name(event->event_id), switch_event_get_header_nil(event, "Event-Subclass"));
</del><ins>+ qDebug() << QString("B leg: %1(%2)\n").arg(switch_event_name(event->event_id), switch_event_get_header_nil(event, "Event-Subclass"));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -264,6 +267,7 @@
</span><span class="cx">
</span><span class="cx"> void FSHost::generalEventHandler(switch_event_t *event)
</span><span class="cx"> {
</span><ins>+ /*printEventHeaders(event);*/
</ins><span class="cx"> QString uuid = switch_event_get_header_nil(event, "Unique-ID");
</span><span class="cx">
</span><span class="cx"> if (_bleg_uuids.contains(uuid))
</span><span class="lines">@@ -287,24 +291,26 @@
</span><span class="cx"> {
</span><span class="cx"> if (strcmp(event->subclass_name, "portaudio::ringing") == 0 && !_active_calls.contains(uuid))
</span><span class="cx"> {
</span><del>- Call *call = new Call(atoi(switch_event_get_header_nil(event, "call_id")),
</del><ins>+ Call *callPtr = new Call(atoi(switch_event_get_header_nil(event, "call_id")),
</ins><span class="cx"> switch_event_get_header_nil(event, "Caller-Caller-ID-Name"),
</span><span class="cx"> switch_event_get_header_nil(event, "Caller-Caller-ID-Number"),
</span><span class="cx"> FSCOMM_CALL_DIRECTION_INBOUND,
</span><span class="cx"> uuid);
</span><ins>+ QSharedPointer<Call> call(callPtr);
</ins><span class="cx"> _active_calls.insert(uuid, call);
</span><del>- call->setState(FSCOMM_CALL_STATE_RINGING);
- emit ringing(uuid);
</del><ins>+ call.data()->setState(FSCOMM_CALL_STATE_RINGING);
+ emit ringing(call);
</ins><span class="cx"> }
</span><span class="cx"> else if (strcmp(event->subclass_name, "portaudio::makecall") == 0)
</span><span class="cx"> {
</span><del>- Call *call = new Call(atoi(switch_event_get_header_nil(event, "call_id")),NULL,
</del><ins>+ Call *callPtr = new Call(atoi(switch_event_get_header_nil(event, "call_id")),NULL,
</ins><span class="cx"> switch_event_get_header_nil(event, "Caller-Destination-Number"),
</span><span class="cx"> FSCOMM_CALL_DIRECTION_OUTBOUND,
</span><span class="cx"> uuid);
</span><ins>+ QSharedPointer<Call> call(callPtr);
</ins><span class="cx"> _active_calls.insert(uuid, call);
</span><del>- call->setState(FSCOMM_CALL_STATE_TRYING);
- emit newOutgoingCall(uuid);
</del><ins>+ call.data()->setState(FSCOMM_CALL_STATE_TRYING);
+ emit newOutgoingCall(call);
</ins><span class="cx"> }
</span><span class="cx"> else if (strcmp(event->subclass_name, "sofia::gateway_state") == 0)
</span><span class="cx"> {
</span><span class="lines">@@ -331,7 +337,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>+ //qDebug() << QString("We got a not treated custom event: %1\n").arg(!zstr(event->subclass_name) ? event->subclass_name : "NULL"));
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -347,6 +353,7 @@
</span><span class="cx"> SWITCH_STANDARD_STREAM(stream);
</span><span class="cx"> status = switch_api_execute(cmd, args, NULL, &stream);
</span><span class="cx"> *res = switch_str_nil((char *) stream.data);
</span><ins>+ switch_safe_free(stream.data);
</ins><span class="cx">
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="lines">@@ -354,9 +361,9 @@
</span><span class="cx"> void FSHost::printEventHeaders(switch_event_t *event)
</span><span class="cx"> {
</span><span class="cx"> switch_event_header_t *hp;
</span><del>- printf("Received event: %s(%s)\n", switch_event_name(event->event_id), switch_event_get_header_nil(event, "Event-Subclass"));
</del><ins>+ qDebug() << QString("Received event: %1(%2)\n").arg(switch_event_name(event->event_id), switch_event_get_header_nil(event, "Event-Subclass"));
</ins><span class="cx"> for (hp = event->headers; hp; hp = hp->next) {
</span><del>- printf("%s=%s\n", hp->name, hp->value);
</del><ins>+ qDebug() << hp->name << "=" << hp->value;
</ins><span class="cx"> }
</span><del>- printf("\n\n");
</del><ins>+ qDebug() << "\n\n";
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshosth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.h (16315 => 16316)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.h 2010-01-15 00:31:43 UTC (rev 16315)
+++ freeswitch/trunk/fscomm/fshost.h 2010-01-15 03:30:11 UTC (rev 16316)
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx">
</span><span class="cx"> #include <QThread>
</span><span class="cx"> #include <QHash>
</span><ins>+#include <QSharedPointer>
</ins><span class="cx"> #include <switch.h>
</span><ins>+#include "call.h"
</ins><span class="cx">
</span><del>-class Call;
-
</del><span class="cx"> #define FSCOMM_GW_STATE_TRYING 0
</span><span class="cx"> #define FSCOMM_GW_STATE_REGISTER 1
</span><span class="cx"> #define FSCOMM_GW_STATE_REGED 2
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> explicit FSHost(QObject *parent = 0);
</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><del>- Call * getCallByUUID(QString uuid) { return _active_calls.value(uuid, NULL); }
</del><ins>+ QSharedPointer<Call> getCallByUUID(QString uuid) { return _active_calls.value(uuid); }
</ins><span class="cx"> QString getGwStateName(int id) { return fscomm_gw_state_names[id]; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -74,11 +74,11 @@
</span><span class="cx"> signals:
</span><span class="cx"> void coreLoadingError(QString);
</span><span class="cx"> void ready(void);
</span><del>- void ringing(QString);
- void answered(QString);
- void newOutgoingCall(QString);
- void callFailed(QString);
- void hungup(Call*);
</del><ins>+ void ringing(QSharedPointer<Call>);
+ void answered(QSharedPointer<Call>);
+ void newOutgoingCall(QSharedPointer<Call>);
+ void callFailed(QSharedPointer<Call>);
+ void hungup(QSharedPointer<Call>);
</ins><span class="cx"> void gwStateChange(QString, int);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> switch_status_t processAlegEvent(switch_event_t *, QString);
</span><span class="cx"> void createFolders();
</span><span class="cx"> void printEventHeaders(switch_event_t *event);
</span><del>- QHash<QString, Call*> _active_calls;
</del><ins>+ QHash<QString, QSharedPointer<Call> > _active_calls;
</ins><span class="cx"> QHash<QString, QString> _bleg_uuids;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (16315 => 16316)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-15 00:31:43 UTC (rev 16315)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-15 03:30:11 UTC (rev 16316)
</span><span class="lines">@@ -76,10 +76,10 @@
</span><span class="cx"> connect(dialpadMapper, SIGNAL(mapped(QString)), this, SLOT(dialDTMF(QString)));
</span><span class="cx">
</span><span class="cx"> connect(&g_FSHost, SIGNAL(ready()),this, SLOT(fshostReady()));
</span><del>- connect(&g_FSHost, SIGNAL(ringing(QString)), this, SLOT(ringing(QString)));
- connect(&g_FSHost, SIGNAL(answered(QString)), this, SLOT(answered(QString)));
- connect(&g_FSHost, SIGNAL(hungup(Call*)), this, SLOT(hungup(Call*)));
- connect(&g_FSHost, SIGNAL(newOutgoingCall(QString)), this, SLOT(newOutgoingCall(QString)));
</del><ins>+ connect(&g_FSHost, SIGNAL(ringing(QSharedPointer<Call>)), this, SLOT(ringing(QSharedPointer<Call>)));
+ connect(&g_FSHost, SIGNAL(answered(QSharedPointer<Call>)), this, SLOT(answered(QSharedPointer<Call>)));
+ connect(&g_FSHost, SIGNAL(hungup(QSharedPointer<Call>)), this, SLOT(hungup(QSharedPointer<Call>)));
+ connect(&g_FSHost, SIGNAL(newOutgoingCall(QSharedPointer<Call>)), this, SLOT(newOutgoingCall(QSharedPointer<Call>)));
</ins><span class="cx"> connect(&g_FSHost, SIGNAL(gwStateChange(QString,int)), this, SLOT(gwStateChanged(QString,int)));
</span><span class="cx"> /*connect(&g_FSHost, SIGNAL(coreLoadingError(QString)), this, SLOT(coreLoadingError(QString)));*/
</span><span class="cx">
</span><span class="lines">@@ -152,11 +152,11 @@
</span><span class="cx">
</span><span class="cx"> void MainWindow::callListDoubleClick(QListWidgetItem *item)
</span><span class="cx"> {
</span><del>- Call *call = g_FSHost.getCallByUUID(item->data(Qt::UserRole).toString());
- QString switch_str = QString("switch %1").arg(call->getCallID());
</del><ins>+ QSharedPointer<Call> call = g_FSHost.getCallByUUID(item->data(Qt::UserRole).toString());
+ QString switch_str = QString("switch %1").arg(call.data()->getCallID());
</ins><span class="cx"> QString result;
</span><span class="cx"> if (g_FSHost.sendCmd("pa", switch_str.toAscii(), &result) == SWITCH_STATUS_FALSE) {
</span><del>- ui->textEdit->setText(QString("Error switching to call %1").arg(call->getCallID()));
</del><ins>+ ui->textEdit->setText(QString("Error switching to call %1").arg(call.data()->getCallID()));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> ui->hangupBtn->setEnabled(true);
</span><span class="lines">@@ -219,54 +219,51 @@
</span><span class="cx"> ui->hangupBtn->setEnabled(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MainWindow::newOutgoingCall(QString uuid)
</del><ins>+void MainWindow::newOutgoingCall(QSharedPointer<Call> call)
</ins><span class="cx"> {
</span><del>- Call *call = g_FSHost.getCallByUUID(uuid);
- ui->textEdit->setText(QString("Calling %1 (%2)").arg(call->getCidName(), call->getCidNumber()));
- QListWidgetItem *item = new QListWidgetItem(tr("%1 (%2) - Calling").arg(call->getCidName(), call->getCidNumber()));
- item->setData(Qt::UserRole, uuid);
</del><ins>+ ui->textEdit->setText(QString("Calling %1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
+ QListWidgetItem *item = new QListWidgetItem(tr("%1 (%2) - Calling").arg(call.data()->getCidName(), call.data()->getCidNumber()));
+ item->setData(Qt::UserRole, call.data()->getUUID());
</ins><span class="cx"> ui->listCalls->addItem(item);
</span><span class="cx"> ui->hangupBtn->setEnabled(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MainWindow::ringing(QString uuid)
</del><ins>+void MainWindow::ringing(QSharedPointer<Call> call)
</ins><span class="cx"> {
</span><span class="cx">
</span><del>- Call *call = g_FSHost.getCallByUUID(uuid);
</del><span class="cx"> for (int i=0; i<ui->listCalls->count(); i++)
</span><span class="cx"> {
</span><span class="cx"> QListWidgetItem *item = ui->listCalls->item(i);
</span><del>- if (item->data(Qt::UserRole).toString() == uuid)
</del><ins>+ if (item->data(Qt::UserRole).toString() == call.data()->getUUID())
</ins><span class="cx"> {
</span><del>- item->setText(tr("%1 - Ringing").arg(call->getCidNumber()));
- ui->textEdit->setText(QString("Call from %1 (%2)").arg(call->getCidName(), call->getCidNumber()));
</del><ins>+ item->setText(tr("%1 - Ringing").arg(call.data()->getCidNumber()));
+ ui->textEdit->setText(QString("Call from %1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ui->textEdit->setText(QString("Call from %1 (%2)").arg(call->getCidName(), call->getCidNumber()));
- QListWidgetItem *item = new QListWidgetItem(tr("%1 (%2) - Ringing").arg(call->getCidName(), call->getCidNumber()));
- item->setData(Qt::UserRole, uuid);
</del><ins>+ ui->textEdit->setText(QString("Call from %1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
+ QListWidgetItem *item = new QListWidgetItem(tr("%1 (%2) - Ringing").arg(call.data()->getCidName(), call.data()->getCidNumber()));
+ item->setData(Qt::UserRole, call.data()->getUUID());
</ins><span class="cx"> ui->listCalls->addItem(item);
</span><span class="cx"> ui->answerBtn->setEnabled(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MainWindow::answered(QString uuid)
</del><ins>+void MainWindow::answered(QSharedPointer<Call> call)
</ins><span class="cx"> {
</span><del>- Call *call = g_FSHost.getCallByUUID(uuid);
</del><span class="cx"> for (int i=0; i<ui->listCalls->count(); i++)
</span><span class="cx"> {
</span><span class="cx"> QListWidgetItem *item = ui->listCalls->item(i);
</span><del>- if (item->data(Qt::UserRole).toString() == uuid)
</del><ins>+ if (item->data(Qt::UserRole).toString() == call.data()->getUUID())
</ins><span class="cx"> {
</span><del>- if (call->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
</del><ins>+ if (call.data()->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
</ins><span class="cx"> {
</span><del>- item->setText(tr("%1 (%2) - Active").arg(call->getCidName(), call->getCidNumber()));
</del><ins>+ item->setText(tr("%1 (%2) - Active").arg(call.data()->getCidName(), call.data()->getCidNumber()));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- item->setText(tr("%1 - Active").arg(call->getCidNumber()));
</del><ins>+ item->setText(tr("%1 - Active").arg(call.data()->getCidNumber()));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -289,18 +286,18 @@
</span><span class="cx"> ui->dtmfPoundBtn->setEnabled(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MainWindow::hungup(Call* call)
</del><ins>+void MainWindow::hungup(QSharedPointer<Call> call)
</ins><span class="cx"> {
</span><span class="cx"> for (int i=0; i<ui->listCalls->count(); i++)
</span><span class="cx"> {
</span><span class="cx"> QListWidgetItem *item = ui->listCalls->item(i);
</span><del>- if (item->data(Qt::UserRole).toString() == call->getUUID())
</del><ins>+ if (item->data(Qt::UserRole).toString() == call.data()->getUUID())
</ins><span class="cx"> {
</span><span class="cx"> delete ui->listCalls->takeItem(i);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- ui->textEdit->setText(tr("Call with %1 (%2) hungup.").arg(call->getCidName(), call->getCidNumber()));
</del><ins>+ ui->textEdit->setText(tr("Call with %1 (%2) hungup.").arg(call.data()->getCidName(), call.data()->getCidNumber()));
</ins><span class="cx"> /* TODO: Will cause problems if 2 calls are received at the same time */
</span><span class="cx"> ui->answerBtn->setEnabled(false);
</span><span class="cx"> ui->hangupBtn->setEnabled(false);
</span><span class="lines">@@ -320,7 +317,6 @@
</span><span class="cx"> ui->dtmfDBtn->setEnabled(false);
</span><span class="cx"> ui->dtmfAstBtn->setEnabled(false);
</span><span class="cx"> ui->dtmfPoundBtn->setEnabled(false);
</span><del>- delete call;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MainWindow::changeEvent(QEvent *e)
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.h (16315 => 16316)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.h 2010-01-15 00:31:43 UTC (rev 16315)
+++ freeswitch/trunk/fscomm/mainwindow.h 2010-01-15 03:30:11 UTC (rev 16316)
</span><span class="lines">@@ -68,10 +68,10 @@
</span><span class="cx"> void paAnswer();
</span><span class="cx"> void paCall(QString);
</span><span class="cx"> void paHangup();
</span><del>- void newOutgoingCall(QString);
- void ringing(QString);
- void answered(QString);
- void hungup(Call*);
</del><ins>+ void newOutgoingCall(QSharedPointer<Call>);
+ void ringing(QSharedPointer<Call>);
+ void answered(QSharedPointer<Call>);
+ void hungup(QSharedPointer<Call>);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::MainWindow *ui;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>