[Freeswitch-svn] [commit] r7708 - freeswitch/trunk/src

[Freeswitch SVN]

Author: anthm
Date: Wed Feb 20 12:11:37 2008
New Revision: 7708

Modified:
   freeswitch/trunk/src/switch_loadable_module.c
   freeswitch/trunk/src/switch_pcm.c

Log:
change naming convention of internal mods

Modified: freeswitch/trunk/src/switch_loadable_module.c
==============================================================================
--- freeswitch/trunk/src/switch_loadable_module.c	(original)
+++ freeswitch/trunk/src/switch_loadable_module.c	Wed Feb 20 12:11:37 2008
@@ -977,8 +977,8 @@
 	switch_core_hash_init(&loadable_modules.dialplan_hash, loadable_modules.pool);
 	switch_mutex_init(&loadable_modules.mutex, SWITCH_MUTEX_NESTED, loadable_modules.pool);
 
-	switch_loadable_module_load_module("", "softtimer", SWITCH_FALSE, &err);
-	switch_loadable_module_load_module("", "PCM", SWITCH_FALSE, &err);
+	switch_loadable_module_load_module("", "CORE_SOFTTIMER_MODULE", SWITCH_FALSE, &err);
+	switch_loadable_module_load_module("", "CORE_PCM_MODULE", SWITCH_FALSE, &err);
 
 	if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
 		switch_xml_t mods, ld;

Modified: freeswitch/trunk/src/switch_pcm.c
==============================================================================
--- freeswitch/trunk/src/switch_pcm.c	(original)
+++ freeswitch/trunk/src/switch_pcm.c	Wed Feb 20 12:11:37 2008
@@ -37,8 +37,8 @@
 #undef SWITCH_MOD_DECLARE_DATA
 #define SWITCH_MOD_DECLARE_DATA __declspec(dllexport)
 #endif
-SWITCH_MODULE_LOAD_FUNCTION(mod_l16_load);
-SWITCH_MODULE_DEFINITION(mod_l16, mod_l16_load, NULL, NULL);
+SWITCH_MODULE_LOAD_FUNCTION(core_pcm_load);
+SWITCH_MODULE_DEFINITION(CORE_PCM_MODULE, core_pcm_load, NULL, NULL);
 
 static switch_status_t switch_raw_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
 {
@@ -258,7 +258,7 @@
 
 }
 
-SWITCH_MODULE_LOAD_FUNCTION(mod_l16_load)
+SWITCH_MODULE_LOAD_FUNCTION(core_pcm_load)
 {
 	switch_codec_interface_t *codec_interface;
     int mpf = 10000, spf = 80, bpf = 160, ebpf = 160, bps = 128000, rate = 8000, counta, countb;