<!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][16156] </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=16156">16156</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-05 12:49:08 -0600 (Tue, 05 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make mod_qsettings not a mod... LOL</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommconffreeswitchxml">freeswitch/trunk/fscomm/conf/freeswitch.xml</a></li>
<li><a href="#freeswitchtrunkfscommfshostcpp">freeswitch/trunk/fscomm/fshost.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmod_qsettingsmod_qsettingscpp">freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmod_qsettingsmod_qsettingsh">freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommconffreeswitchxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/conf/freeswitch.xml (16155 => 16156)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/conf/freeswitch.xml 2010-01-05 18:22:58 UTC (rev 16155)
+++ freeswitch/trunk/fscomm/conf/freeswitch.xml 2010-01-05 18:49:08 UTC (rev 16156)
</span><span class="lines">@@ -96,6 +96,8 @@
</span><span class="cx"> <load module="mod_sndfile"/>
</span><span class="cx"> <load module="mod_tone_stream"/>
</span><span class="cx"> <load module="mod_local_stream"/>
</span><ins>+ <load module="mod_portaudio"/>
+ <load module="mod_event_socket"/>
</ins><span class="cx"> </modules>
</span><span class="cx"> </configuration>
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16155 => 16156)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-01-05 18:22:58 UTC (rev 16155)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-01-05 18:49:08 UTC (rev 16156)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> /* If you need to override configuration directories, you need to change them in the SWITCH_GLOBAL_dirs global structure */
</span><span class="cx"> printf("Initializing core...\n");
</span><span class="cx"> /* Initialize the core and load modules, that will startup FS completely */
</span><del>- if (switch_core_init_and_modload(flags, console, &err) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_core_init(flags, console, &err) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> fprintf(stderr, "Failed to initialize FreeSWITCH's core: %s\n", err);
</span><span class="cx"> emit coreLoadingError(err);
</span><span class="cx"> }
</span><span class="lines">@@ -124,13 +124,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Load our QSettings module */
</span><del>- if (switch_loadable_module_build_dynamic("mod_qsettings",mod_qsettings_load,NULL,mod_qsettings_shutdown,SWITCH_FALSE) != SWITCH_STATUS_SUCCESS)
</del><ins>+ if (mod_qsettings_load() != SWITCH_STATUS_SUCCESS)
</ins><span class="cx"> {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't load mod_qsettings\n");
</span><span class="cx"> }
</span><del>- QString res;
- sendCmd("load", "mod_event_socket", &res);
- sendCmd("load", "mod_portaudio", &res);
</del><ins>+
+ if (switch_core_init_and_modload(flags, console, &err) != SWITCH_STATUS_SUCCESS) {
+ fprintf(stderr, "Failed to initialize FreeSWITCH's core: %s\n", err);
+ emit coreLoadingError(err);
+ }
+
</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="freeswitchtrunkfscommmod_qsettingsmod_qsettingscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp (16155 => 16156)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp 2010-01-05 18:22:58 UTC (rev 16155)
+++ freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp 2010-01-05 18:49:08 UTC (rev 16156)
</span><span class="lines">@@ -35,10 +35,6 @@
</span><span class="cx"> #include <QDir>
</span><span class="cx"> #include "mod_qsettings/mod_qsettings.h"
</span><span class="cx">
</span><del>-static struct {
- switch_memory_pool_t* pool;
-} globals;
-
</del><span class="cx"> switch_xml_t XMLBinding::getConfigXML(QString tmpl)
</span><span class="cx"> {
</span><span class="cx"> switch_event_t *e;
</span><span class="lines">@@ -129,30 +125,15 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SWITCH_MODULE_LOAD_FUNCTION(mod_qsettings_load)
</del><ins>+switch_status_t mod_qsettings_load(void)
</ins><span class="cx"> {
</span><del>- /*switch_api_interface_t *qsettings_api_interface;*/
</del><span class="cx">
</span><del>- /* connect my internal structure to the blank pointer passed to me */
- *module_interface = switch_loadable_module_create_module_interface(pool, "mod_qsettings");
-
- memset(&globals,0,sizeof(globals));
- globals.pool = pool;
-
</del><span class="cx"> if (do_config() == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sucessfully configured.\n");
</span><span class="cx"> } else {
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><del>-
-
</del><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "We loaded mod_qsettings.\n");
</span><del>- /* indicate that the module should continue to be loaded */
- return SWITCH_STATUS_SUCCESS;
-}
</del><span class="cx">
</span><del>-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_qsettings_shutdown)
-{
- switch_xml_unbind_search_function_ptr(xml_url_fetch);
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommmod_qsettingsmod_qsettingsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.h (16155 => 16156)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.h 2010-01-05 18:22:58 UTC (rev 16155)
+++ freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.h 2010-01-05 18:49:08 UTC (rev 16156)
</span><span class="lines">@@ -34,8 +34,7 @@
</span><span class="cx"> #include <QSettings>
</span><span class="cx"> #include <switch.h>
</span><span class="cx">
</span><del>-SWITCH_MODULE_LOAD_FUNCTION(mod_qsettings_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_qsettings_shutdown);
</del><ins>+switch_status_t mod_qsettings_load(void);
</ins><span class="cx">
</span><span class="cx"> class XMLBinding
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>