<!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][16528] </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=16528">16528</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-27 19:12:34 -0600 (Wed, 27 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do the time properly.</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="#freeswitchtrunkfscommmainwindowcpp">freeswitch/trunk/fscomm/mainwindow.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommcallcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/call.cpp (16527 => 16528)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/call.cpp 2010-01-28 01:00:04 UTC (rev 16527)
+++ freeswitch/trunk/fscomm/call.cpp 2010-01-28 01:12:34 UTC (rev 16528)
</span><span class="lines">@@ -78,3 +78,9 @@
</span><span class="cx"> QMessageBox::critical(0, QWidget::tr("DTMF Error"), QWidget::tr("There was an error sending DTMF, please report this bug."), QMessageBox::Ok);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+QTime Call::getCurrentStateTime()
+{
+ int now = QDateTime::fromTime_t(_answered_epoch).secsTo(QDateTime::currentDateTime());
+ return QTime::fromString(QString::number(now), "s");
+}
</ins></span></pre></div>
<a id="freeswitchtrunkfscommcallh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/call.h (16527 => 16528)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/call.h 2010-01-28 01:00:04 UTC (rev 16527)
+++ freeswitch/trunk/fscomm/call.h 2010-01-28 01:12:34 UTC (rev 16528)
</span><span class="lines">@@ -63,6 +63,8 @@
</span><span class="cx"> bool isActive() { return _isActive == true; }
</span><span class="cx"> switch_status_t toggleRecord(bool);
</span><span class="cx"> void sendDTMF(QString digit);
</span><ins>+ void setAnsweredEpoch(qulonglong time) { _answered_epoch = time/1000000; }
+ QTime getCurrentStateTime();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> int _call_id;
</span><span class="lines">@@ -75,6 +77,7 @@
</span><span class="cx"> bool _isActive;
</span><span class="cx"> QString _recording_filename;
</span><span class="cx"> fscomm_call_state_t _state;
</span><ins>+ qulonglong _answered_epoch;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Q_DECLARE_METATYPE(Call)
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16527 => 16528)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-01-28 01:00:04 UTC (rev 16527)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-01-28 01:12:34 UTC (rev 16528)
</span><span class="lines">@@ -177,6 +177,8 @@
</span><span class="cx"> switch(event->event_id) {
</span><span class="cx"> case SWITCH_EVENT_CHANNEL_ANSWER:
</span><span class="cx"> {
</span><ins>+ QString answeredEpoch = switch_event_get_header_nil(event, "Caller-Channel-Answered-Time");
+ call.data()->setAnsweredEpoch(answeredEpoch.toLong());
</ins><span class="cx"> call.data()->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
</span><span class="cx"> _bleg_uuids.insert(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"), uuid);
</span><span class="cx"> call.data()->setState(FSCOMM_CALL_STATE_ANSWERED);
</span><span class="lines">@@ -257,6 +259,8 @@
</span><span class="cx"> case SWITCH_EVENT_CHANNEL_ANSWER:
</span><span class="cx"> {
</span><span class="cx"> /* When do we get here? */
</span><ins>+ QString answeredEpoch = switch_event_get_header_nil(event, "Caller-Channel-Answered-Time");
+ call.data()->setAnsweredEpoch(answeredEpoch.toULongLong());
</ins><span class="cx"> emit answered(call);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (16527 => 16528)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-28 01:00:04 UTC (rev 16527)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-28 01:12:34 UTC (rev 16528)
</span><span class="lines">@@ -130,9 +130,10 @@
</span><span class="cx"> for(int row=0; row<ui->tableCalls->rowCount(); row++)
</span><span class="cx"> {
</span><span class="cx"> QTableWidgetItem* item = ui->tableCalls->item(row, 2);
</span><del>- QTime time = QTime::fromString(item->text(),"hh:mm:ss");
- time = time.addSecs(1);
</del><ins>+ QSharedPointer<Call> call = g_FSHost.getCallByUUID(item->data(Qt::UserRole).toString());
+ QTime time = call.data()->getCurrentStateTime();
</ins><span class="cx"> item->setText(time.toString("hh:mm:ss"));
</span><ins>+ item->setTextAlignment(Qt::AlignRight);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>