Author: mikej Date: Wed Jun 13 13:48:49 2007 New Revision: 5344 Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/mod_lumenvox.cpp freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c freeswitch/trunk/src/mod/languages/mod_python/mod_python.c freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Log: move some modules to use the new module interface macros. Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Wed Jun 13 13:48:49 2007 @@ -31,9 +31,8 @@ */ #include <switch.h> - -static const char modname[] = "mod_ivrtest"; - +SWITCH_MODULE_LOAD_FUNCTION(mod_ivrtest_load); +SWITCH_MODULE_DEFINITION(mod_ivrtest, mod_ivrtest_load, NULL, NULL); /* dtmf handler function you can hook up to be executed when a digit is dialed during playback @@ -499,7 +498,7 @@ /*.next */ &ivrtest_application_interface }; -static const switch_loadable_module_interface_t mod_ivrtest_module_interface = { +static const switch_loadable_module_interface_t ivrtest_module_interface = { /*.module_name = */ modname, /*.endpoint_interface = */ NULL, /*.timer_interface = */ NULL, @@ -508,11 +507,11 @@ /*.application_interface */ &asrtest_application_interface }; -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_ivrtest_load) { /* connect my internal structure to the blank pointer passed to me */ - *module_interface = &mod_ivrtest_module_interface; + *module_interface = &ivrtest_module_interface; /* test global state handlers */ switch_core_add_state_handler(&state_handlers); @@ -521,12 +520,6 @@ return SWITCH_STATUS_SUCCESS; } -/* 'switch_module_runtime' will start up in a thread by itself just by having it exist - if it returns anything but SWITCH_STATUS_TERM it will be called again automaticly -*/ - - -//switch_status_t switch_module_runtime(void) /* For Emacs: * Local Variables: Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Wed Jun 13 13:48:49 2007 @@ -32,7 +32,11 @@ */ #include <switch.h> -static const char modname[] = "mod_skel"; +//SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown); +//SWITCH_MODULE_RUNTIME_FUNCTION(mod_skel_runtime); + +SWITCH_MODULE_LOAD_FUNCTION(mod_skel_load); +SWITCH_MODULE_DEFINITION(mod_skel, mod_skel_load, NULL, NULL); static switch_loadable_module_interface_t skel_module_interface = { /*.module_name */ modname, @@ -47,7 +51,7 @@ /*.directory_interface */ NULL }; -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_skel_load) { /* connect my internal structure to the blank pointer passed to me */ *module_interface = &skel_module_interface; @@ -60,7 +64,7 @@ /* Called when the system shuts down -SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown); { return SWITCH_STATUS_SUCCESS; } @@ -69,7 +73,7 @@ /* If it exists, this is called in it's own thread when the module-load completes If it returns anything but SWITCH_STATUS_TERM it will be called again automaticly -SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void) +SWITCH_MODULE_RUNTIME_FUNCTION(mod_skel_runtime); { while(looping) { Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp (original) +++ freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp Wed Jun 13 13:48:49 2007 @@ -35,12 +35,12 @@ using namespace soundtouch; using namespace std; - #include <switch.h> #define STSTART 1024 * 2 #define STBLOCK 1024 -static const char modname[] = "mod_soundtouch"; +SWITCH_MODULE_LOAD_FUNCTION(mod_soundtouch_load); +SWITCH_MODULE_DEFINITION(mod_soundtouch, mod_soundtouch_load, NULL, NULL); struct soundtouch_helper { SoundTouch *st; @@ -331,7 +331,7 @@ }; -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_soundtouch_load) { /* connect my internal structure to the blank pointer passed to me */ *module_interface = &soundtouch_module_interface; Modified: freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/mod_lumenvox.cpp ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/mod_lumenvox.cpp (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/mod_lumenvox.cpp Wed Jun 13 13:48:49 2007 @@ -38,7 +38,9 @@ #include <switch.h> #include <sstream> -static const char modname[] = "mod_lumenvox"; +SWITCH_MODULE_LOAD_FUNCTION(mod_lumenvox_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lumenvox_shutdown); +SWITCH_MODULE_DEFINITION(mod_lumenvox, mod_lumenvox_load, mod_lumenvox_shutdown, NULL); typedef enum { LVFLAG_HAS_TEXT = (1 << 0), @@ -441,7 +443,7 @@ /*.asr_interface */ &lumenvox_asr_interface }; -switch_status_t switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_lumenvox_load) { LVSpeechPort::RegisterAppLogMsg(log_callback, NULL, 5); //LVSpeechPort::SetClientPropertyEx(PROP_EX_SRE_SERVERS, PROP_EX_VALUE_TYPE_STRING, (void *)"127.0.0.1"); @@ -453,7 +455,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lumenvox_shutdown) { return SWITCH_STATUS_UNLOAD; } Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Wed Jun 13 13:48:49 2007 @@ -39,7 +39,9 @@ #define MY_EVENT_RINGING "alsa::ringing" -static const char modname[] = "mod_alsa"; +SWITCH_MODULE_LOAD_FUNCTION(mod_alsa_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_alsa_shutdown); +SWITCH_MODULE_DEFINITION(mod_alsa, mod_alsa_load, mod_alsa_shutdown, NULL); static switch_memory_pool_t *module_pool = NULL; //static int running = 1; @@ -825,7 +827,7 @@ } -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_alsa_load); { switch_status_t status; @@ -943,7 +945,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_alsa_shutdown) { deactivate_audio_device(); Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Wed Jun 13 13:48:49 2007 @@ -41,7 +41,9 @@ #endif //#define DOTRACE -static const char modname[] = "mod_wanpipe"; +SWITCH_MODULE_LOAD_FUNCTION(mod_wanpipe_load); +SWITCH_MODULE_DEFINITION(mod_wanpipe, mod_wanpipe_load, NULL, NULL); + #define STRLEN 15 static switch_memory_pool_t *module_pool = NULL; @@ -1308,7 +1310,7 @@ } #endif -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_wanpipe_load) { switch_status_t status = SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Wed Jun 13 13:48:49 2007 @@ -37,14 +37,13 @@ #include <lame.h> #include <curl/curl.h> - #define OUTSCALE 8192 #define MP3_SCACHE 16384 #define MP3_DCACHE 8192 -static const char modname[] = "mod_shout"; - - +SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown); +SWITCH_MODULE_DEFINITION(mod_shout, mod_shout_load, mod_shout_shutdown, NULL); static char *supported_formats[SWITCH_MAX_CODECS] = { 0 }; @@ -890,7 +889,7 @@ /*.directory_interface */ NULL }; -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load) { supported_formats[0] = "shout"; supported_formats[1] = "mp3"; @@ -909,7 +908,7 @@ } -SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown) { curl_global_cleanup(); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c Wed Jun 13 13:48:49 2007 @@ -50,7 +50,10 @@ /* Managed functions */ void mod_mono_switch_console_printf(switch_text_channel_t channel, char *file, const char *func, int line, char *fmt, char *msg); -static const char modname[] = "mod_mono"; +SWITCH_MODULE_LOAD_FUNCTION(mod_mono_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_mono_shutdown); +SWITCH_MODULE_DEFINITION(mod_mono, mod_mono_load, mod_mono_shutdown, NULL); + static switch_memory_pool_t *mono_pool = NULL; static struct { @@ -74,9 +77,9 @@ * This function will initialise the memory pool and plugin hash for this module, * it will then initialise a new mono domain. */ -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_mono_load) { - *interface = &mono_module_interface; + *module_interface = &mono_module_interface; /* Initialise memory pool */ if (switch_core_new_memory_pool(&mono_pool) != SWITCH_STATUS_SUCCESS) { @@ -158,7 +161,7 @@ * Function for cleanly shutting down mod_mono * */ -SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_mono_shutdown) { if (globals.domain) { mono_jit_cleanup(globals.domain); Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Wed Jun 13 13:48:49 2007 @@ -49,7 +49,9 @@ void init_freeswitch(void); static switch_api_interface_t python_run_interface; -const char modname[] = "mod_python"; +SWITCH_MODULE_LOAD_FUNCTION(mod_python_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_python_shutdown); +SWITCH_MODULE_DEFINITION(mod_python, mod_python_load, mod_python_shutdown, NULL); static void eval_some_python(char *uuid, char *args) { @@ -221,7 +223,7 @@ /*.directory_interface */ NULL }; -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_python_load) { /* connect my internal structure to the blank pointer passed to me */ *module_interface = &python_module_interface; @@ -242,7 +244,7 @@ /* Called when the system shuts down*/ -SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_python_shutdown) { PyInterpreterState *mainInterpreterState; PyThreadState *myThreadState; Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Wed Jun 13 13:48:49 2007 @@ -39,7 +39,10 @@ #define DEFAULT_FORMAT "[message]" #define MAX_LENGTH 1024 -static const char modname[] = "mod_syslog"; +SWITCH_MODULE_LOAD_FUNCTION(mod_syslog_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_syslog_shutdown); +SWITCH_MODULE_DEFINITION(mod_syslog, mod_syslog_load, mod_syslog_shutdown, NULL); + static switch_status_t load_config(void); static struct { @@ -148,7 +151,7 @@ return 0; } -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_syslog_load) { switch_status_t status; *interface = &console_module_interface; @@ -164,7 +167,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MOD_DECLARE(switch_status_t) switch_module_unload(const switch_loadable_module_interface_t **interface) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_syslog_shutdown) { closelog();