Modified: freeswitch/trunk/fscomm/conf/freeswitch.xml (16155 => 16156)
--- 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)
@@ -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>
Modified: freeswitch/trunk/fscomm/fshost.cpp (16155 => 16156)
--- 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)
@@ -112,7 +112,7 @@
/* 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 @@
}
/* 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
Modified: freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp (16155 => 16156)
--- 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)
@@ -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 @@
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;
}
Modified: freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.h (16155 => 16156)
--- 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)
@@ -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
{