Index: include/asterisk/module.h =================================================================== --- include/asterisk/module.h (revision 279420) +++ include/asterisk/module.h (working copy) @@ -194,9 +194,10 @@ }; enum ast_module_load_priority { - AST_MODPRI_REALTIME_DEPEND = 10, /*!< Dependency for a realtime driver */ - AST_MODPRI_REALTIME_DEPEND2 = 20, /*!< 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_SYSTEM_DEPEND = 10, /*!< Dependency for core functionally (format_*) */ + AST_MODPRI_REALTIME_DEPEND = 20, /*!< Dependency for a realtime driver */ + AST_MODPRI_REALTIME_DEPEND2 = 30, /*!< Second level dependency for a realtime driver (func_curl needs res_curl, but is needed by res_config_curl) */ + AST_MODPRI_REALTIME_DRIVER = 40, /*!< A realtime driver, which provides configuration services for other modules */ 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 */ Index: formats/format_gsm.c =================================================================== --- formats/format_gsm.c (revision 279420) +++ formats/format_gsm.c (working copy) @@ -167,6 +167,10 @@ static int unload_module(void) { return ast_format_unregister(gsm_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw GSM data"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw GSM data", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_g719.c =================================================================== --- formats/format_g719.c (revision 279420) +++ formats/format_g719.c (working copy) @@ -133,7 +133,11 @@ static int unload_module(void) { return ast_format_unregister(g719_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ITU G.719"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.719", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_g729.c =================================================================== --- formats/format_g729.c (revision 279420) +++ formats/format_g729.c (working copy) @@ -143,6 +143,10 @@ static int unload_module(void) { return ast_format_unregister(g729_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G729 data"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw G729 data", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_sln.c =================================================================== --- formats/format_sln.c (revision 279420) +++ formats/format_sln.c (working copy) @@ -125,6 +125,10 @@ static int unload_module(void) { return ast_format_unregister(slin_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw Signed Linear Audio support (SLN)"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw Signed Linear Audio support (SLN)", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_wav.c =================================================================== --- formats/format_wav.c (revision 279420) +++ formats/format_wav.c (working copy) @@ -493,6 +493,10 @@ static int unload_module(void) { return ast_format_unregister(wav_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Microsoft WAV format (8000Hz Signed Linear)"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Microsoft WAV format (8000Hz Signed Linear)", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_ogg_vorbis.c =================================================================== --- formats/format_ogg_vorbis.c (revision 279420) +++ formats/format_ogg_vorbis.c (working copy) @@ -556,4 +556,8 @@ return ast_format_unregister(vorbis_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "OGG/Vorbis audio"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "OGG/Vorbis audio", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_wav_gsm.c =================================================================== --- formats/format_wav_gsm.c (revision 279420) +++ formats/format_wav_gsm.c (working copy) @@ -546,6 +546,10 @@ static int unload_module(void) { return ast_format_unregister(wav49_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Microsoft WAV format (Proprietary GSM)"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Microsoft WAV format (Proprietary GSM)", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_sln16.c =================================================================== --- formats/format_sln16.c (revision 279420) +++ formats/format_sln16.c (working copy) @@ -133,6 +133,10 @@ static int unload_module(void) { return ast_format_unregister(slin_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw Signed Linear 16KHz Audio support (SLN16)"); +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 = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_siren7.c =================================================================== --- formats/format_siren7.c (revision 279420) +++ formats/format_siren7.c (working copy) @@ -133,6 +133,10 @@ static int unload_module(void) { return ast_format_unregister(siren7_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ITU G.722.1 (Siren7, licensed from Polycom)"); +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 = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_ilbc.c =================================================================== --- formats/format_ilbc.c (revision 279420) +++ formats/format_ilbc.c (working copy) @@ -141,6 +141,10 @@ static int unload_module(void) { return ast_format_unregister(ilbc_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw iLBC data"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw iLBC data", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_vox.c =================================================================== --- formats/format_vox.c (revision 279420) +++ formats/format_vox.c (working copy) @@ -130,6 +130,10 @@ static int unload_module(void) { return ast_format_unregister(vox_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Dialogic VOX (ADPCM) File Format"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Dialogic VOX (ADPCM) File Format", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_pcm.c =================================================================== --- formats/format_pcm.c (revision 279420) +++ formats/format_pcm.c (working copy) @@ -492,6 +492,10 @@ || ast_format_unregister(alaw_f.name) || ast_format_unregister(au_f.name) || ast_format_unregister(g722_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz"); +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 = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_g723.c =================================================================== --- formats/format_g723.c (revision 279420) +++ formats/format_g723.c (working copy) @@ -147,6 +147,10 @@ static int unload_module(void) { return ast_format_unregister(g723_1_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "G.723.1 Simple Timestamp File Format"); +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 = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_h263.c =================================================================== --- formats/format_h263.c (revision 279420) +++ formats/format_h263.c (working copy) @@ -181,6 +181,10 @@ static int unload_module(void) { return ast_format_unregister(h263_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw H.263 data"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw H.263 data", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_h264.c =================================================================== --- formats/format_h264.c (revision 279420) +++ formats/format_h264.c (working copy) @@ -170,6 +170,10 @@ static int unload_module(void) { return ast_format_unregister(h264_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw H.264 data"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw H.264 data", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_siren14.c =================================================================== --- formats/format_siren14.c (revision 279420) +++ formats/format_siren14.c (working copy) @@ -133,6 +133,10 @@ static int unload_module(void) { return ast_format_unregister(siren14_f.name); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ITU G.722.1 Annex C (Siren14, licensed from Polycom)"); +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 = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_jpeg.c =================================================================== --- formats/format_jpeg.c (revision 279420) +++ formats/format_jpeg.c (working copy) @@ -110,6 +110,10 @@ ast_image_unregister(&jpeg_format); return 0; -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "jpeg (joint picture experts group) image format"); +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 = AST_MODPRI_SYSTEM_DEPEND, +); Index: formats/format_g726.c =================================================================== --- formats/format_g726.c (revision 279420) +++ formats/format_g726.c (working copy) @@ -256,6 +256,10 @@ ast_log(LOG_WARNING, "Failed to unregister format %s.\n", f[i].name); } return(0); -} +} -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G.726 (16/24/32/40kbps) data"); +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 = AST_MODPRI_SYSTEM_DEPEND, +);