<!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][17298] </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=17298">17298</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-04-14 21:54:59 -0500 (Wed, 14 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix some things on the console and start implementing the transfer.</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="#freeswitchtrunkfscommdebugtoolsconsolewindowcpp">freeswitch/trunk/fscomm/debugtools/consolewindow.cpp</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 (17297 => 17298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/call.cpp 2010-04-15 01:36:41 UTC (rev 17297)
+++ freeswitch/trunk/fscomm/call.cpp 2010-04-15 02:54:59 UTC (rev 17298)
</span><span class="lines">@@ -112,3 +112,9 @@
</span><span class="cx"> int now = QDateTime::fromTime_t(time).secsTo(QDateTime::currentDateTime());
</span><span class="cx"> return QTime::fromString(QString::number(now), "s");
</span><span class="cx"> }
</span><ins>+
+/*bool Call::transfer()
+{
+
+ g_FSHost.sendCmd("uuid_bridge", "")
+}*/
</ins></span></pre></div>
<a id="freeswitchtrunkfscommcallh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/call.h (17297 => 17298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/call.h 2010-04-15 01:36:41 UTC (rev 17297)
+++ freeswitch/trunk/fscomm/call.h 2010-04-15 02:54:59 UTC (rev 17298)
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx"> FSCOMM_CALL_STATE_RINGING = 0,
</span><span class="cx"> FSCOMM_CALL_STATE_TRYING = 1,
</span><span class="cx"> FSCOMM_CALL_STATE_ANSWERED = 2,
</span><del>- FSCOMM_CALL_STATE_FAILED = 3
</del><ins>+ FSCOMM_CALL_STATE_FAILED = 3,
+ FSCOMM_CALL_STATE_TRANSFER = 4
</ins><span class="cx"> } fscomm_call_state_t;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="lines">@@ -76,6 +77,8 @@
</span><span class="cx"> void setAnsweredEpoch(qulonglong time) { _answeredEpoch = time/1000000; }
</span><span class="cx"> QTime getCurrentStateTime();
</span><span class="cx">
</span><ins>+ /*bool transfer();*/
+
</ins><span class="cx"> private:
</span><span class="cx"> QSharedPointer<Channel> _channel; /* This should be our portaudio channel */
</span><span class="cx"> QSharedPointer<Channel> _otherLegChannel;
</span></span></pre></div>
<a id="freeswitchtrunkfscommdebugtoolsconsolewindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/debugtools/consolewindow.cpp (17297 => 17298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/debugtools/consolewindow.cpp 2010-04-15 01:36:41 UTC (rev 17297)
+++ freeswitch/trunk/fscomm/debugtools/consolewindow.cpp 2010-04-15 02:54:59 UTC (rev 17298)
</span><span class="lines">@@ -105,9 +105,23 @@
</span><span class="cx">
</span><span class="cx"> QString res;
</span><span class="cx"> g_FSHost.sendCmd(cmd.toAscii().data(), args.toAscii().data(), &res);
</span><del>- QStandardItem *item = new QStandardItem(res);
- item->setData(SWITCH_LOG_CONSOLE, ConsoleModel::LogLevelRole);
- addNewConsoleItem(item);
</del><ins>+ if (!res.isEmpty())
+ {
+ /* Remove \r\n */
+ QStringList textList = res.split(QRegExp("(\r+)"), QString::SkipEmptyParts);
+ QString final_str;
+ for (int line = 0; line<textList.size(); line++)
+ {
+ final_str += textList[line];
+ }
+ QStringList lines = final_str.split(QRegExp("(\n+)"), QString::SkipEmptyParts);
+ for (int line = 0; line < lines.size(); ++line)
+ {
+ QStandardItem *item = new QStandardItem(lines[line]);
+ item->setData(SWITCH_LOG_CONSOLE, ConsoleModel::LogLevelRole);
+ addNewConsoleItem(item);
+ }
+ }
</ins><span class="cx"> ui->lineCmd->clear();
</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 (17297 => 17298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-04-15 01:36:41 UTC (rev 17297)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-04-15 02:54:59 UTC (rev 17298)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> connect(ui->hangupBtn, SIGNAL(clicked()), this, SLOT(paHangup()));
</span><span class="cx"> connect(ui->recoredCallBtn, SIGNAL(toggled(bool)), SLOT(recordCall(bool)));
</span><span class="cx"> connect(ui->btnHold, SIGNAL(toggled(bool)), this, SLOT(holdCall(bool)));
</span><ins>+ /*connect(ui->btnTransfer, SIGNAL(clicked()), this, SLOT(transferCall()));*/
</ins><span class="cx"> connect(ui->tableCalls, SIGNAL(itemDoubleClicked(QTableWidgetItem*)), this, SLOT(callTableDoubleClick(QTableWidgetItem*)));
</span><span class="cx"> connect(ui->action_Preferences, SIGNAL(triggered()), this, SLOT(prefTriggered()));
</span><span class="cx"> connect(ui->action_Exit, SIGNAL(triggered()), this, SLOT(close()));
</span><span class="lines">@@ -280,9 +281,9 @@
</span><span class="cx">
</span><span class="cx"> void MainWindow::makeCall()
</span><span class="cx"> {
</span><del>- bool ok;
</del><ins>+ bool ok = true;
</ins><span class="cx"> QString dialstring = QInputDialog::getText(this, tr("Make new call"),
</span><del>- tr("Number to dial:"), QLineEdit::Normal, NULL,&ok);
</del><ins>+ tr("Number to dial:"), QLineEdit::Normal, NULL,&ok);
</ins><span class="cx">
</span><span class="cx"> QSharedPointer<Account> acc = g_FSHost.getCurrentDefaultAccount();
</span><span class="cx"> if (!acc.isNull()) {
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.h (17297 => 17298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.h 2010-04-15 01:36:41 UTC (rev 17297)
+++ freeswitch/trunk/fscomm/mainwindow.h 2010-04-15 02:54:59 UTC (rev 17298)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> void callFailed(QSharedPointer<Call>);
</span><span class="cx"> void recordCall(bool);
</span><span class="cx"> void holdCall(bool);
</span><ins>+ /*void transferCall();*/
</ins><span class="cx"> void setDefaultAccount();
</span><span class="cx"> void accountAdd(QSharedPointer<Account>);
</span><span class="cx"> void accountDel(QSharedPointer<Account>);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>