<!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][16169] </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=16169">16169</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-05 22:31:20 -0600 (Tue, 05 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a test sound to test the ringdev.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommfshostcpp">freeswitch/trunk/fscomm/fshost.cpp</a></li>
<li><a href="#freeswitchtrunkfscommprefdialogui">freeswitch/trunk/fscomm/prefdialog.ui</a></li>
<li><a href="#freeswitchtrunkfscommprefportaudiocpp">freeswitch/trunk/fscomm/prefportaudio.cpp</a></li>
<li><a href="#freeswitchtrunkfscommprefportaudioh">freeswitch/trunk/fscomm/prefportaudio.h</a></li>
<li><a href="#freeswitchtrunkfscommresourcesqrc">freeswitch/trunk/fscomm/resources.qrc</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommresourcestestwav">freeswitch/trunk/fscomm/resources/test.wav</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16168 => 16169)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-01-06 03:45:00 UTC (rev 16168)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-01-06 04:31:20 UTC (rev 16169)
</span><span class="lines">@@ -59,6 +59,8 @@
</span><span class="cx"> if (!conf_dir.exists(".fscomm"))
</span><span class="cx"> {
</span><span class="cx"> conf_dir.mkpath(".fscomm/conf/accounts");
</span><ins>+ conf_dir.mkpath(".fscomm/sounds");
+ QFile::copy(":/sounds/test.wav", QString("%1/.fscomm/sounds/test.wav").arg(QDir::homePath()));
</ins><span class="cx"> conf_dir.mkpath(".fscomm/templates");
</span><span class="cx"> QFile rootXML(":/confs/freeswitch.xml");
</span><span class="cx"> QString dest = QString("%1/.fscomm/conf/freeswitch.xml").arg(conf_dir.absolutePath());
</span></span></pre></div>
<a id="freeswitchtrunkfscommprefdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/prefdialog.ui (16168 => 16169)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/prefdialog.ui 2010-01-06 03:45:00 UTC (rev 16168)
+++ freeswitch/trunk/fscomm/prefdialog.ui 2010-01-06 04:31:20 UTC (rev 16169)
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> <item>
</span><span class="cx"> <widget class="QPushButton" name="PaRingdevTestBtn">
</span><span class="cx"> <property name="enabled">
</span><del>- <bool>false</bool>
</del><ins>+ <bool>true</bool>
</ins><span class="cx"> </property>
</span><span class="cx"> <property name="maximumSize">
</span><span class="cx"> <size>
</span></span></pre></div>
<a id="freeswitchtrunkfscommprefportaudiocpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/prefportaudio.cpp (16168 => 16169)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/prefportaudio.cpp 2010-01-06 03:45:00 UTC (rev 16168)
+++ freeswitch/trunk/fscomm/prefportaudio.cpp 2010-01-06 04:31:20 UTC (rev 16169)
</span><span class="lines">@@ -11,8 +11,19 @@
</span><span class="cx"> connect(_ui->PaHoldFileBtn, SIGNAL(clicked()), this, SLOT(holdFileChoose()));
</span><span class="cx"> connect(_ui->PaOutdevCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(outdevChangeDev(int)));
</span><span class="cx"> connect(_ui->PaRingdevCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(ringdevChangeDev(int)));
</span><ins>+ connect(_ui->PaRingdevTestBtn, SIGNAL(clicked()), this, SLOT(ringdevTest()));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void PrefPortaudio::ringdevTest()
+{
+ QString result;
+ if (g_FSHost.sendCmd("pa", QString("play %1/.fscomm/sounds/test.wav").arg(QDir::homePath()).toAscii().constData(), &result) != SWITCH_STATUS_SUCCESS)
+ {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error testing ringdev on mod_portaudio! %s\n",
+ result.toAscii().constData());
+ }
+}
+
</ins><span class="cx"> void PrefPortaudio::ringdevChangeDev(int dev)
</span><span class="cx"> {
</span><span class="cx"> QString result;
</span></span></pre></div>
<a id="freeswitchtrunkfscommprefportaudioh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/prefportaudio.h (16168 => 16169)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/prefportaudio.h 2010-01-06 03:45:00 UTC (rev 16168)
+++ freeswitch/trunk/fscomm/prefportaudio.h 2010-01-06 04:31:20 UTC (rev 16169)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> void holdFileChoose();
</span><span class="cx"> void outdevChangeDev(int);
</span><span class="cx"> void ringdevChangeDev(int);
</span><ins>+ void ringdevTest();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void getPaDevlist(void);
</span></span></pre></div>
<a id="freeswitchtrunkfscommresourcestestwav"></a>
<div class="binary"><h4>Added: freeswitch/trunk/fscomm/resources/test.wav</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: freeswitch/trunk/fscomm/resources/test.wav
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:mime-type
</span><span class="cx"> + application/octet-stream
</span><a id="freeswitchtrunkfscommresourcesqrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/resources.qrc (16168 => 16169)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/resources.qrc 2010-01-06 03:45:00 UTC (rev 16168)
+++ freeswitch/trunk/fscomm/resources.qrc 2010-01-06 04:31:20 UTC (rev 16169)
</span><span class="lines">@@ -11,4 +11,7 @@
</span><span class="cx"> <file alias="event_socket.conf.xml">conf/event_socket.conf.xml</file>
</span><span class="cx"> <file alias="portaudio.conf.xml">conf/portaudio.conf.xml</file>
</span><span class="cx"> </qresource>
</span><ins>+ <qresource prefix="/sounds">
+ <file alias="test.wav">resources/test.wav</file>
+ </qresource>
</ins><span class="cx"> </RCC>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>