change naming convention of internal mods

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

diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index 24a08391c51686d3dd0d8c457b4778f4681ab772..699537b51228b26f49b59c99e3dfcdd522048520 100644 (file)
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -977,8 +977,8 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init()
        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;

diff --git a/src/switch_pcm.c b/src/switch_pcm.c
index f14577e6d2907f7e3fcbfc8d479c3447c03a2b74..9527a611874ba3c95f47a3d21645378d18316f61 100644 (file)
--- a/src/switch_pcm.c
+++ b/src/switch_pcm.c
@@ -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 @@ static void mod_g711_load(switch_loadable_module_interface_t **module_interface,
 
 }
 
-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;