Diff
Modified: freeswitch/trunk/fscomm/conf/event_socket.conf.xml (16145 => 16146)
--- 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)
@@ -1,3 +1,5 @@
+<document type="freeswitch/xml">
+ <section name="configuration">
<configuration name="event_socket.conf" description="Socket Client">
<settings>
<param name="nat-map" value="false"/>
@@ -5,4 +7,6 @@
<param name="listen-port" value="8021"/>
<param name="password" value="ClueCon"/>
</settings>
-</configuration>
+ </configuration>
+ </section>
+</document>
Modified: freeswitch/trunk/fscomm/conf/freeswitch.xml (16145 => 16146)
--- 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)
@@ -49,7 +49,7 @@
</configuration>
<configuration name="qsettings.conf" description="configures our mod_qsettings">
- <bindings value="dialplan" />
+ <bindings value="configuration" />
</configuration>
<configuration name="local_stream.conf" description="stream files from local dir">
@@ -83,7 +83,6 @@
<load module="mod_logfile"/>
<load module="mod_enum"/>
<load module="mod_cdr_csv"/>
- <load module="mod_portaudio"/>
<load module="mod_sofia"/>
<load module="mod_loopback"/>
<load module="mod_commands"/>
Modified: freeswitch/trunk/fscomm/conf/portaudio.conf.xml (16145 => 16146)
--- 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)
@@ -1,17 +1,22 @@
-<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>
+<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>
+
Modified: freeswitch/trunk/fscomm/fshost.cpp (16145 => 16146)
--- 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)
@@ -130,6 +130,7 @@
}
QString res;
sendCmd("load", "mod_event_socket", &res);
+ sendCmd("load", "mod_portaudio", &res);
emit ready();
/* Go into the runtime loop. If the argument is true, this basically sets runtime.running = 1 and loops while that is set
* If its false, it initializes the libedit for the console, then does the same thing
Modified: freeswitch/trunk/fscomm/mainwindow.ui (16145 => 16146)
--- 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)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>580</width>
- <height>563</height>
+ <width>670</width>
+ <height>541</height>
</rect>
</property>
<property name="windowTitle">
@@ -310,8 +310,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>580</width>
- <height>22</height>
+ <width>670</width>
+ <height>24</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
Modified: freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp (16145 => 16146)
--- 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)
@@ -45,19 +45,25 @@
switch_event_create_plain(&e, SWITCH_EVENT_REQUEST_PARAMS);
switch_assert(e);
- QFile tmplFile(QString("%1/templates/%2.xml").arg(QApplication::applicationDirPath(),tmpl));
-
- if (!tmplFile.exists()) {
+ if (QFile::exists(QString("%1/.fscomm/templates/%2.xml").arg(QDir::homePath(),tmpl))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
- "Template %s.xml, doesn't exist on directory, falling back to embedded template.\n",
+ "Using template %s.xml on .fscomm/.\n",
tmpl.toAscii().constData());
- tmplFile.setFileName(QString(":/confs/%1.xml").arg(tmpl));
- return NULL;
}
+ 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);
+ }
- if (tmplFile.open(QIODevice::ReadOnly | QIODevice::Text))
+ QFile tmplFile(QString("%1/.fscomm/templates/%2.xml").arg(QDir::homePath(),tmpl));
+ if (!tmplFile.open(QIODevice::ReadOnly | QIODevice::Text))
{
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Template %s could not be read.!\n", tmpl.toAscii().constData());
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Template %s could not be read!\n", tmpl.toAscii().constData());
return NULL;
}
@@ -72,6 +78,7 @@
}
char *res = switch_event_expand_headers(e, tmplContents.toAscii().constData());
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Template %s as follows:\n%s", tmpl.toAscii().constData(), res);
switch_safe_free(e);
return switch_xml_parse_str(res, strlen(res));
}
@@ -81,6 +88,8 @@
{
XMLBinding *binding = (XMLBinding *) user_data;
+ 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);
if (!binding) {
return NULL;
}
Modified: freeswitch/trunk/fscomm/resources/splash.png
(Binary files differ)