Make mod_qsettings not a mod... LOL

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16156 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/fscomm/conf/freeswitch.xml b/fscomm/conf/freeswitch.xml
index 7f2912f061974ec269bc86054d1e83974865d985..b49804dfe502e0eabc94ed457875c9d5b006364f 100644 (file)
--- a/fscomm/conf/freeswitch.xml
+++ b/fscomm/conf/freeswitch.xml
@@ -96,6 +96,8 @@
        <load module="mod_sndfile"/>
        <load module="mod_tone_stream"/>
        <load module="mod_local_stream"/>
+        <load module="mod_portaudio"/>
+        <load module="mod_event_socket"/>
       </modules>
     </configuration>
 

diff --git a/fscomm/fshost.cpp b/fscomm/fshost.cpp
index 06db32c3215d41229baea579cfb8de9d3f140037..9cd0bd37961eb3d4904a9fec24dda81b51682e1d 100644 (file)
--- a/fscomm/fshost.cpp
+++ b/fscomm/fshost.cpp
@@ -112,7 +112,7 @@ void FSHost::run(void)
     /* If you need to override configuration directories, you need to change them in the SWITCH_GLOBAL_dirs global structure */
     printf("Initializing core...\n");
     /* Initialize the core and load modules, that will startup FS completely */
-    if (switch_core_init_and_modload(flags, console, &err) != SWITCH_STATUS_SUCCESS) {
+    if (switch_core_init(flags, console, &err) != SWITCH_STATUS_SUCCESS) {
         fprintf(stderr, "Failed to initialize FreeSWITCH's core: %s\n", err);
         emit coreLoadingError(err);
     }
@@ -124,13 +124,16 @@ void FSHost::run(void)
     }
 
     /* Load our QSettings module */
-    if (switch_loadable_module_build_dynamic("mod_qsettings",mod_qsettings_load,NULL,mod_qsettings_shutdown,SWITCH_FALSE) != SWITCH_STATUS_SUCCESS)
+    if (mod_qsettings_load() != SWITCH_STATUS_SUCCESS)
     {
         switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't load mod_qsettings\n");
     }
-    QString res;
-    sendCmd("load", "mod_event_socket", &res);
-    sendCmd("load", "mod_portaudio", &res);
+
+    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);
+    }
+
     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

diff --git a/fscomm/mod_qsettings/mod_qsettings.cpp b/fscomm/mod_qsettings/mod_qsettings.cpp
index b2cf8ee8437aacb743957b2d502c99b98ff6bcae..5ab20747105330446641166a8cdb6dd1382a0454 100644 (file)
--- a/fscomm/mod_qsettings/mod_qsettings.cpp
+++ b/fscomm/mod_qsettings/mod_qsettings.cpp
@@ -35,10 +35,6 @@
 #include <QDir>
 #include "mod_qsettings/mod_qsettings.h"
 
-static struct {
-    switch_memory_pool_t* pool;
-} globals;
-
 switch_xml_t XMLBinding::getConfigXML(QString tmpl)
 {
     switch_event_t *e;
@@ -129,30 +125,15 @@ static switch_status_t do_config(void)
     return SWITCH_STATUS_SUCCESS;
 }
 
-SWITCH_MODULE_LOAD_FUNCTION(mod_qsettings_load)
+switch_status_t mod_qsettings_load(void)
 {
-    /*switch_api_interface_t *qsettings_api_interface;*/
-
-    /* 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;
 
     if (do_config() == SWITCH_STATUS_SUCCESS) {
         switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sucessfully configured.\n");
     } else {
         return SWITCH_STATUS_FALSE;
     }
-
-
     switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "We loaded mod_qsettings.\n");
-    /* indicate that the module should continue to be loaded */
-    return SWITCH_STATUS_SUCCESS;
-}
 
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_qsettings_shutdown)
-{
-    switch_xml_unbind_search_function_ptr(xml_url_fetch);
     return SWITCH_STATUS_SUCCESS;
 }

diff --git a/fscomm/mod_qsettings/mod_qsettings.h b/fscomm/mod_qsettings/mod_qsettings.h
index 776e3cba02f4410ed8d8aa6d982008ed0f5d0cc0..91e1b401e2eca35c145abb1ee57cb5a18f5b24d4 100644 (file)
--- a/fscomm/mod_qsettings/mod_qsettings.h
+++ b/fscomm/mod_qsettings/mod_qsettings.h
@@ -34,8 +34,7 @@
 #include <QSettings>
 #include <switch.h>
 
-SWITCH_MODULE_LOAD_FUNCTION(mod_qsettings_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_qsettings_shutdown);
+switch_status_t mod_qsettings_load(void);
 
 class XMLBinding
 {