[svn-commits] tilghman: branch tilghman/auto_preload r276210 - in /team/tilghman/auto_prelo...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Jul 13 17:00:47 CDT 2010
Author: tilghman
Date: Tue Jul 13 17:00:34 2010
New Revision: 276210
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=276210
Log:
More changes to load order, starting testing
Modified:
team/tilghman/auto_preload/formats/format_g719.c
team/tilghman/auto_preload/formats/format_g723.c
team/tilghman/auto_preload/formats/format_g726.c
team/tilghman/auto_preload/formats/format_g729.c
team/tilghman/auto_preload/formats/format_gsm.c
team/tilghman/auto_preload/formats/format_h263.c
team/tilghman/auto_preload/formats/format_h264.c
team/tilghman/auto_preload/formats/format_ilbc.c
team/tilghman/auto_preload/formats/format_jpeg.c
team/tilghman/auto_preload/formats/format_ogg_vorbis.c
team/tilghman/auto_preload/formats/format_pcm.c
team/tilghman/auto_preload/formats/format_siren14.c
team/tilghman/auto_preload/formats/format_siren7.c
team/tilghman/auto_preload/formats/format_sln.c
team/tilghman/auto_preload/formats/format_sln16.c
team/tilghman/auto_preload/formats/format_vox.c
team/tilghman/auto_preload/formats/format_wav.c
team/tilghman/auto_preload/formats/format_wav_gsm.c
team/tilghman/auto_preload/include/asterisk/module.h
team/tilghman/auto_preload/pbx/pbx_lua.c
team/tilghman/auto_preload/res/res_crypto.c
team/tilghman/auto_preload/res/res_fax.c
team/tilghman/auto_preload/res/res_monitor.c
team/tilghman/auto_preload/res/res_musiconhold.c
team/tilghman/auto_preload/res/res_rtp_asterisk.c
team/tilghman/auto_preload/res/res_rtp_multicast.c
team/tilghman/auto_preload/res/res_smdi.c
team/tilghman/auto_preload/res/res_speech.c
team/tilghman/auto_preload/res/res_srtp.c
Modified: team/tilghman/auto_preload/formats/format_g719.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_g719.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_g719.c (original)
+++ team/tilghman/auto_preload/formats/format_g719.c Tue Jul 13 17:00:34 2010
@@ -133,11 +133,7 @@
static int unload_module(void)
{
return ast_format_unregister(g719_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER,"ITU G.719",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ITU G.719");
Modified: team/tilghman/auto_preload/formats/format_g723.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_g723.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_g723.c (original)
+++ team/tilghman/auto_preload/formats/format_g723.c Tue Jul 13 17:00:34 2010
@@ -147,10 +147,6 @@
static int unload_module(void)
{
return ast_format_unregister(g723_1_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "G.723.1 Simple Timestamp File Format",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "G.723.1 Simple Timestamp File Format");
Modified: team/tilghman/auto_preload/formats/format_g726.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_g726.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_g726.c (original)
+++ team/tilghman/auto_preload/formats/format_g726.c Tue Jul 13 17:00:34 2010
@@ -256,10 +256,6 @@
ast_log(LOG_WARNING, "Failed to unregister format %s.\n", f[i].name);
}
return(0);
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw G.726 (16/24/32/40kbps) data",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+}
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G.726 (16/24/32/40kbps) data");
Modified: team/tilghman/auto_preload/formats/format_g729.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_g729.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_g729.c (original)
+++ team/tilghman/auto_preload/formats/format_g729.c Tue Jul 13 17:00:34 2010
@@ -143,10 +143,6 @@
static int unload_module(void)
{
return ast_format_unregister(g729_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw G729 data",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G729 data");
Modified: team/tilghman/auto_preload/formats/format_gsm.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_gsm.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_gsm.c (original)
+++ team/tilghman/auto_preload/formats/format_gsm.c Tue Jul 13 17:00:34 2010
@@ -167,10 +167,6 @@
static int unload_module(void)
{
return ast_format_unregister(gsm_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw GSM data",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw GSM data");
Modified: team/tilghman/auto_preload/formats/format_h263.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_h263.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_h263.c (original)
+++ team/tilghman/auto_preload/formats/format_h263.c Tue Jul 13 17:00:34 2010
@@ -181,10 +181,6 @@
static int unload_module(void)
{
return ast_format_unregister(h263_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw H.263 data",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw H.263 data");
Modified: team/tilghman/auto_preload/formats/format_h264.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_h264.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_h264.c (original)
+++ team/tilghman/auto_preload/formats/format_h264.c Tue Jul 13 17:00:34 2010
@@ -170,10 +170,6 @@
static int unload_module(void)
{
return ast_format_unregister(h264_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw H.264 data",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw H.264 data");
Modified: team/tilghman/auto_preload/formats/format_ilbc.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_ilbc.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_ilbc.c (original)
+++ team/tilghman/auto_preload/formats/format_ilbc.c Tue Jul 13 17:00:34 2010
@@ -141,10 +141,6 @@
static int unload_module(void)
{
return ast_format_unregister(ilbc_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw iLBC data",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw iLBC data");
Modified: team/tilghman/auto_preload/formats/format_jpeg.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_jpeg.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_jpeg.c (original)
+++ team/tilghman/auto_preload/formats/format_jpeg.c Tue Jul 13 17:00:34 2010
@@ -110,10 +110,6 @@
ast_image_unregister(&jpeg_format);
return 0;
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "jpeg (joint picture experts group) image format",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "jpeg (joint picture experts group) image format");
Modified: team/tilghman/auto_preload/formats/format_ogg_vorbis.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_ogg_vorbis.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_ogg_vorbis.c (original)
+++ team/tilghman/auto_preload/formats/format_ogg_vorbis.c Tue Jul 13 17:00:34 2010
@@ -556,8 +556,4 @@
return ast_format_unregister(vorbis_f.name);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "OGG/Vorbis audio",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "OGG/Vorbis audio");
Modified: team/tilghman/auto_preload/formats/format_pcm.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_pcm.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_pcm.c (original)
+++ team/tilghman/auto_preload/formats/format_pcm.c Tue Jul 13 17:00:34 2010
@@ -492,10 +492,6 @@
|| ast_format_unregister(alaw_f.name)
|| ast_format_unregister(au_f.name)
|| ast_format_unregister(g722_f.name);
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+}
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz");
Modified: team/tilghman/auto_preload/formats/format_siren14.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_siren14.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_siren14.c (original)
+++ team/tilghman/auto_preload/formats/format_siren14.c Tue Jul 13 17:00:34 2010
@@ -133,10 +133,6 @@
static int unload_module(void)
{
return ast_format_unregister(siren14_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.722.1 Annex C (Siren14, licensed from Polycom)",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ITU G.722.1 Annex C (Siren14, licensed from Polycom)");
Modified: team/tilghman/auto_preload/formats/format_siren7.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_siren7.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_siren7.c (original)
+++ team/tilghman/auto_preload/formats/format_siren7.c Tue Jul 13 17:00:34 2010
@@ -133,10 +133,6 @@
static int unload_module(void)
{
return ast_format_unregister(siren7_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.722.1 (Siren7, licensed from Polycom)",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ITU G.722.1 (Siren7, licensed from Polycom)");
Modified: team/tilghman/auto_preload/formats/format_sln.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_sln.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_sln.c (original)
+++ team/tilghman/auto_preload/formats/format_sln.c Tue Jul 13 17:00:34 2010
@@ -125,10 +125,6 @@
static int unload_module(void)
{
return ast_format_unregister(slin_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw Signed Linear Audio support (SLN)",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw Signed Linear Audio support (SLN)");
Modified: team/tilghman/auto_preload/formats/format_sln16.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_sln16.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_sln16.c (original)
+++ team/tilghman/auto_preload/formats/format_sln16.c Tue Jul 13 17:00:34 2010
@@ -133,10 +133,6 @@
static int unload_module(void)
{
return ast_format_unregister(slin_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw Signed Linear 16KHz Audio support (SLN16)",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw Signed Linear 16KHz Audio support (SLN16)");
Modified: team/tilghman/auto_preload/formats/format_vox.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_vox.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_vox.c (original)
+++ team/tilghman/auto_preload/formats/format_vox.c Tue Jul 13 17:00:34 2010
@@ -130,10 +130,6 @@
static int unload_module(void)
{
return ast_format_unregister(vox_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Dialogic VOX (ADPCM) File Format",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Dialogic VOX (ADPCM) File Format");
Modified: team/tilghman/auto_preload/formats/format_wav.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_wav.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_wav.c (original)
+++ team/tilghman/auto_preload/formats/format_wav.c Tue Jul 13 17:00:34 2010
@@ -493,10 +493,6 @@
static int unload_module(void)
{
return ast_format_unregister(wav_f.name);
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Microsoft WAV format (8000Hz Signed Linear)",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+}
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Microsoft WAV format (8000Hz Signed Linear)");
Modified: team/tilghman/auto_preload/formats/format_wav_gsm.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/formats/format_wav_gsm.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/formats/format_wav_gsm.c (original)
+++ team/tilghman/auto_preload/formats/format_wav_gsm.c Tue Jul 13 17:00:34 2010
@@ -546,10 +546,6 @@
static int unload_module(void)
{
return ast_format_unregister(wav49_f.name);
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Microsoft WAV format (Proprietary GSM)",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+}
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Microsoft WAV format (Proprietary GSM)");
Modified: team/tilghman/auto_preload/include/asterisk/module.h
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/include/asterisk/module.h?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/include/asterisk/module.h (original)
+++ team/tilghman/auto_preload/include/asterisk/module.h Tue Jul 13 17:00:34 2010
@@ -198,7 +198,7 @@
AST_MODPRI_REALTIME_DEPEND = 20, /*!< Dependency for a realtime driver */
AST_MODPRI_REALTIME_DEPEND2 = 25, /*!< Second level dependency for a realtime driver (func_curl needs res_curl, but is needed by res_config_curl) */
AST_MODPRI_REALTIME_DRIVER = 30, /*!< A realtime driver, which provides configuration services for other modules */
- AST_MODPRI_CHANNEL_DEPEND = 50, /*!< Channel drivers (provide devicestate) */
+ AST_MODPRI_CHANNEL_DEPEND = 50, /*!< Channel driver dependency (may depend upon realtime, e.g. MOH) */
AST_MODPRI_CHANNEL_DRIVER = 60, /*!< Channel drivers (provide devicestate) */
AST_MODPRI_APP_DEPEND = 70, /*!< Dependency for an application */
AST_MODPRI_DEVSTATE_PROVIDER = 80, /*!< Applications and other modules that _provide_ devicestate (e.g. meetme) */
Modified: team/tilghman/auto_preload/pbx/pbx_lua.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/pbx/pbx_lua.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/pbx/pbx_lua.c (original)
+++ team/tilghman/auto_preload/pbx/pbx_lua.c Tue Jul 13 17:00:34 2010
@@ -84,7 +84,7 @@
static void lua_create_autoservice_functions(lua_State *L);
static void lua_create_hangup_function(lua_State *L);
-void lua_state_destroy(void *data);
+static void lua_state_destroy(void *data);
static lua_State *lua_get_state(struct ast_channel *chan);
static int exists(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, const char *data);
@@ -108,7 +108,7 @@
/*!
* \brief The destructor for lua_datastore
*/
-void lua_state_destroy(void *data)
+static void lua_state_destroy(void *data)
{
if (data)
lua_close(data);
@@ -1467,7 +1467,7 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Lua PBX Switch",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Lua PBX Switch",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/tilghman/auto_preload/res/res_crypto.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_crypto.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/res/res_crypto.c (original)
+++ team/tilghman/auto_preload/res/res_crypto.c Tue Jul 13 17:00:34 2010
@@ -621,8 +621,9 @@
}
/* needs usecount semantics defined */
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Cryptographic Digital Signatures",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Cryptographic Digital Signatures",
.load = load_module,
.unload = unload_module,
- .reload = reload
+ .reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DEPEND, /*!< Since we don't have a config file, we could move up to REALTIME_DEPEND, if necessary */
);
Modified: team/tilghman/auto_preload/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_fax.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/res/res_fax.c (original)
+++ team/tilghman/auto_preload/res/res_fax.c Tue Jul 13 17:00:34 2010
@@ -2398,7 +2398,8 @@
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Generic FAX Applications",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Generic FAX Applications",
.load = load_module,
.unload = unload_module,
+ .load_pri = AST_MODPRI_APP_DEPEND,
);
Modified: team/tilghman/auto_preload/res/res_monitor.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_monitor.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/res/res_monitor.c (original)
+++ team/tilghman/auto_preload/res/res_monitor.c Tue Jul 13 17:00:34 2010
@@ -930,7 +930,8 @@
}
/* usecount semantics need to be defined */
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Call Monitoring Resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Call Monitoring Resource",
.load = load_module,
.unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DEPEND,
);
Modified: team/tilghman/auto_preload/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_musiconhold.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/res/res_musiconhold.c (original)
+++ team/tilghman/auto_preload/res/res_musiconhold.c Tue Jul 13 17:00:34 2010
@@ -1902,8 +1902,9 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Music On Hold Resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Music On Hold Resource",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DEPEND,
);
Modified: team/tilghman/auto_preload/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_rtp_asterisk.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/res/res_rtp_asterisk.c (original)
+++ team/tilghman/auto_preload/res/res_rtp_asterisk.c Tue Jul 13 17:00:34 2010
@@ -2775,8 +2775,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk RTP Stack",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk RTP Stack",
.load = load_module,
.unload = unload_module,
.reload = reload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DEPEND,
);
Modified: team/tilghman/auto_preload/res/res_rtp_multicast.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_rtp_multicast.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/res/res_rtp_multicast.c (original)
+++ team/tilghman/auto_preload/res/res_rtp_multicast.c Tue Jul 13 17:00:34 2010
@@ -268,4 +268,8 @@
return 0;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Multicast RTP Engine");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Multicast RTP Engine",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DEPEND,
+);
Modified: team/tilghman/auto_preload/res/res_smdi.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_smdi.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/res/res_smdi.c (original)
+++ team/tilghman/auto_preload/res/res_smdi.c Tue Jul 13 17:00:34 2010
@@ -1471,8 +1471,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Simplified Message Desk Interface (SMDI) Resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Simplified Message Desk Interface (SMDI) Resource",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DEPEND,
);
Modified: team/tilghman/auto_preload/res/res_speech.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_speech.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/res/res_speech.c (original)
+++ team/tilghman/auto_preload/res/res_speech.c Tue Jul 13 17:00:34 2010
@@ -339,7 +339,8 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Generic Speech Recognition API",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Generic Speech Recognition API",
.load = load_module,
.unload = unload_module,
+ .load_pri = AST_MODPRI_APP_DEPEND,
);
Modified: team/tilghman/auto_preload/res/res_srtp.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_srtp.c?view=diff&rev=276210&r1=276209&r2=276210
==============================================================================
--- team/tilghman/auto_preload/res/res_srtp.c (original)
+++ team/tilghman/auto_preload/res/res_srtp.c Tue Jul 13 17:00:34 2010
@@ -397,7 +397,8 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Secure RTP (SRTP)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Secure RTP (SRTP)",
.load = load_module,
.unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DEPEND,
);
More information about the svn-commits
mailing list