<!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][16146] </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=16146">16146</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-04 22:57:25 -0600 (Mon, 04 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More work on qsettings. Still get problem when expanding a template with no variables.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommconfevent_socketconfxml">freeswitch/trunk/fscomm/conf/event_socket.conf.xml</a></li>
<li><a href="#freeswitchtrunkfscommconffreeswitchxml">freeswitch/trunk/fscomm/conf/freeswitch.xml</a></li>
<li><a href="#freeswitchtrunkfscommconfportaudioconfxml">freeswitch/trunk/fscomm/conf/portaudio.conf.xml</a></li>
<li><a href="#freeswitchtrunkfscommfshostcpp">freeswitch/trunk/fscomm/fshost.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowui">freeswitch/trunk/fscomm/mainwindow.ui</a></li>
<li><a href="#freeswitchtrunkfscommmod_qsettingsmod_qsettingscpp">freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp</a></li>
<li><a href="#freeswitchtrunkfscommresourcessplashpng">freeswitch/trunk/fscomm/resources/splash.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommconfevent_socketconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/conf/event_socket.conf.xml (16145 => 16146)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/conf/event_socket.conf.xml 2010-01-04 22:07:20 UTC (rev 16145)
+++ freeswitch/trunk/fscomm/conf/event_socket.conf.xml 2010-01-05 04:57:25 UTC (rev 16146)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><ins>+<document type="freeswitch/xml">
+ <section name="configuration">
</ins><span class="cx"> <configuration name="event_socket.conf" description="Socket Client">
</span><span class="cx"> <settings>
</span><span class="cx"> <param name="nat-map" value="false"/>
</span><span class="lines">@@ -5,4 +7,6 @@
</span><span class="cx"> <param name="listen-port" value="8021"/>
</span><span class="cx"> <param name="password" value="ClueCon"/>
</span><span class="cx"> </settings>
</span><del>-</configuration>
</del><ins>+ </configuration>
+ </section>
+</document>
</ins></span></pre></div>
<a id="freeswitchtrunkfscommconffreeswitchxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/conf/freeswitch.xml (16145 => 16146)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/conf/freeswitch.xml 2010-01-04 22:07:20 UTC (rev 16145)
+++ freeswitch/trunk/fscomm/conf/freeswitch.xml 2010-01-05 04:57:25 UTC (rev 16146)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> </configuration>
</span><span class="cx">
</span><span class="cx"> <configuration name="qsettings.conf" description="configures our mod_qsettings">
</span><del>- <bindings value="dialplan" />
</del><ins>+ <bindings value="configuration" />
</ins><span class="cx"> </configuration>
</span><span class="cx">
</span><span class="cx"> <configuration name="local_stream.conf" description="stream files from local dir">
</span><span class="lines">@@ -83,7 +83,6 @@
</span><span class="cx"> <load module="mod_logfile"/>
</span><span class="cx"> <load module="mod_enum"/>
</span><span class="cx"> <load module="mod_cdr_csv"/>
</span><del>- <load module="mod_portaudio"/>
</del><span class="cx"> <load module="mod_sofia"/>
</span><span class="cx"> <load module="mod_loopback"/>
</span><span class="cx"> <load module="mod_commands"/>
</span></span></pre></div>
<a id="freeswitchtrunkfscommconfportaudioconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/conf/portaudio.conf.xml (16145 => 16146)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/conf/portaudio.conf.xml 2010-01-04 22:07:20 UTC (rev 16145)
+++ freeswitch/trunk/fscomm/conf/portaudio.conf.xml 2010-01-05 04:57:25 UTC (rev 16146)
</span><span class="lines">@@ -1,17 +1,22 @@
</span><del>-<configuration name="portaudio.conf" description="Soundcard Endpoint">
- <settings>
- <param name="indev" value="${indev}"/>
- <!-- device to use for output -->
- <param name="outdev" value="${outdev}"/>
- <!--<param name="ringdev" value="${ringdev}"/>-->
- <param name="ring-file" value="${ring-file}"/>
- <param name="ring-interval" value="${ring-interval}"/>
- <param name="hold-file" value="$${hold_music}"/>
- <!--<param name="timer-name" value="soft"/>-->
- <param name="dialplan" value="XML"/>
- <param name="cid-name" value="$${outbound_caller_name}"/>
- <param name="cid-num" value="$${outbound_caller_number}"/>
- <param name="sample-rate" value="48000"/>
- <param name="codec-ms" value="10"/>
- </settings>
-</configuration>
</del><ins>+<document type="freeswitch/xml">
+ <section name="configuration">
+ <configuration name="portaudio.conf" description="Soundcard Endpoint">
+ <settings>
+ <param name="indev" value="${indev}"/>
+ <!-- device to use for output -->
+ <param name="outdev" value="${outdev}"/>
+ <!--<param name="ringdev" value="${ringdev}"/>-->
+ <param name="ring-file" value="${ring-file}"/>
+ <param name="ring-interval" value="${ring-interval}"/>
+ <param name="hold-file" value="$${hold_music}"/>
+ <!--<param name="timer-name" value="soft"/>-->
+ <param name="dialplan" value="XML"/>
+ <param name="cid-name" value="$${outbound_caller_name}"/>
+ <param name="cid-num" value="$${outbound_caller_number}"/>
+ <param name="sample-rate" value="48000"/>
+ <param name="codec-ms" value="10"/>
+ </settings>
+ </configuration>
+ </section>
+</document>
+
</ins></span></pre></div>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16145 => 16146)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-01-04 22:07:20 UTC (rev 16145)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-01-05 04:57:25 UTC (rev 16146)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> }
</span><span class="cx"> QString res;
</span><span class="cx"> sendCmd("load", "mod_event_socket", &res);
</span><ins>+ sendCmd("load", "mod_portaudio", &res);
</ins><span class="cx"> emit ready();
</span><span class="cx"> /* Go into the runtime loop. If the argument is true, this basically sets runtime.running = 1 and loops while that is set
</span><span class="cx"> * If its false, it initializes the libedit for the console, then does the same thing
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.ui (16145 => 16146)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.ui 2010-01-04 22:07:20 UTC (rev 16145)
+++ freeswitch/trunk/fscomm/mainwindow.ui 2010-01-05 04:57:25 UTC (rev 16146)
</span><span class="lines">@@ -6,8 +6,8 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>580</width>
- <height>563</height>
</del><ins>+ <width>670</width>
+ <height>541</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="windowTitle">
</span><span class="lines">@@ -310,8 +310,8 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>580</width>
- <height>22</height>
</del><ins>+ <width>670</width>
+ <height>24</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <widget class="QMenu" name="menu_File">
</span></span></pre></div>
<a id="freeswitchtrunkfscommmod_qsettingsmod_qsettingscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp (16145 => 16146)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp 2010-01-04 22:07:20 UTC (rev 16145)
+++ freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp 2010-01-05 04:57:25 UTC (rev 16146)
</span><span class="lines">@@ -45,19 +45,25 @@
</span><span class="cx"> switch_event_create_plain(&e, SWITCH_EVENT_REQUEST_PARAMS);
</span><span class="cx"> switch_assert(e);
</span><span class="cx">
</span><del>- QFile tmplFile(QString("%1/templates/%2.xml").arg(QApplication::applicationDirPath(),tmpl));
-
- if (!tmplFile.exists()) {
</del><ins>+ if (QFile::exists(QString("%1/.fscomm/templates/%2.xml").arg(QDir::homePath(),tmpl))) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
</span><del>- "Template %s.xml, doesn't exist on directory, falling back to embedded template.\n",
</del><ins>+ "Using template %s.xml on .fscomm/.\n",
</ins><span class="cx"> tmpl.toAscii().constData());
</span><del>- tmplFile.setFileName(QString(":/confs/%1.xml").arg(tmpl));
- return NULL;
</del><span class="cx"> }
</span><ins>+ else if(QFile::exists(QString(":/confs/%1.xml").arg(tmpl)))
+ {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
+ "Template %s.xml, doesn't exist on directory, copying embedded template.\n",
+ tmpl.toAscii().constData());
+ QString dest = QString("%1/.fscomm/templates/%2.xml").arg(QDir::homePath(),tmpl);
+ QString orig = QString(":/confs/%1.xml").arg(tmpl);
+ QFile::copy(orig, dest);
+ }
</ins><span class="cx">
</span><del>- if (tmplFile.open(QIODevice::ReadOnly | QIODevice::Text))
</del><ins>+ QFile tmplFile(QString("%1/.fscomm/templates/%2.xml").arg(QDir::homePath(),tmpl));
+ if (!tmplFile.open(QIODevice::ReadOnly | QIODevice::Text))
</ins><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Template %s could not be read.!\n", tmpl.toAscii().constData());
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Template %s could not be read!\n", tmpl.toAscii().constData());
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -72,6 +78,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> char *res = switch_event_expand_headers(e, tmplContents.toAscii().constData());
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Template %s as follows:\n%s", tmpl.toAscii().constData(), res);
</ins><span class="cx"> switch_safe_free(e);
</span><span class="cx"> return switch_xml_parse_str(res, strlen(res));
</span><span class="cx"> }
</span><span class="lines">@@ -81,6 +88,8 @@
</span><span class="cx"> {
</span><span class="cx"> XMLBinding *binding = (XMLBinding *) user_data;
</span><span class="cx">
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "We are being requested -> section: %s | tag_name: %s | key_name: %s | key_value: %s!\n",
+ section, tag_name, key_name, key_value);
</ins><span class="cx"> if (!binding) {
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommresourcessplashpng"></a>
<div class="binary"><h4>Modified: freeswitch/trunk/fscomm/resources/splash.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>