From b4e18d5660fcc13b97cd4682ff48e33aa9d15d83 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Tue, 20 Jul 2010 19:35:02 +0000 Subject: Add load priority order, such that preload becomes unnecessary in most cases git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278132 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- formats/format_g719.c | 8 ++------ formats/format_g723.c | 8 ++------ formats/format_g726.c | 8 ++------ formats/format_g729.c | 8 ++------ formats/format_gsm.c | 8 ++------ formats/format_h263.c | 8 ++------ formats/format_h264.c | 8 ++------ formats/format_ilbc.c | 8 ++------ formats/format_jpeg.c | 8 ++------ formats/format_ogg_vorbis.c | 6 +----- formats/format_pcm.c | 8 ++------ formats/format_siren14.c | 8 ++------ formats/format_siren7.c | 8 ++------ formats/format_sln.c | 8 ++------ formats/format_sln16.c | 8 ++------ formats/format_vox.c | 8 ++------ formats/format_wav.c | 8 ++------ formats/format_wav_gsm.c | 8 ++------ 18 files changed, 35 insertions(+), 107 deletions(-) (limited to 'formats') diff --git a/formats/format_g719.c b/formats/format_g719.c index 779bea996..6a981d124 100644 --- a/formats/format_g719.c +++ b/formats/format_g719.c @@ -133,11 +133,7 @@ static int load_module(void) 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"); diff --git a/formats/format_g723.c b/formats/format_g723.c index 46f22f1ee..3d48f26ec 100644 --- a/formats/format_g723.c +++ b/formats/format_g723.c @@ -147,10 +147,6 @@ static int load_module(void) 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"); diff --git a/formats/format_g726.c b/formats/format_g726.c index d519fa46d..53e344cdf 100644 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -256,10 +256,6 @@ static int unload_module(void) 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"); diff --git a/formats/format_g729.c b/formats/format_g729.c index 19be7a418..439f8a69e 100644 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -143,10 +143,6 @@ static int load_module(void) 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"); diff --git a/formats/format_gsm.c b/formats/format_gsm.c index f1ba9fb76..06d1d94d1 100644 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -167,10 +167,6 @@ static int load_module(void) 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"); diff --git a/formats/format_h263.c b/formats/format_h263.c index 02b7f792c..6e95c7ad4 100644 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -181,10 +181,6 @@ static int load_module(void) 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"); diff --git a/formats/format_h264.c b/formats/format_h264.c index 1573475ce..0a5ba9421 100644 --- a/formats/format_h264.c +++ b/formats/format_h264.c @@ -170,10 +170,6 @@ static int load_module(void) 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"); diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c index d01c74fc4..d2fa8a1c0 100644 --- a/formats/format_ilbc.c +++ b/formats/format_ilbc.c @@ -141,10 +141,6 @@ static int load_module(void) 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"); diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c index 54a242212..169ffbb32 100644 --- a/formats/format_jpeg.c +++ b/formats/format_jpeg.c @@ -110,10 +110,6 @@ static int unload_module(void) 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"); diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index 928b00104..d45511a2e 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -556,8 +556,4 @@ static int unload_module(void) 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"); diff --git a/formats/format_pcm.c b/formats/format_pcm.c index b272b2663..2b0db56e2 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -492,10 +492,6 @@ static int unload_module(void) || 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"); diff --git a/formats/format_siren14.c b/formats/format_siren14.c index 215450f78..498317c82 100644 --- a/formats/format_siren14.c +++ b/formats/format_siren14.c @@ -133,10 +133,6 @@ static int load_module(void) 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)"); diff --git a/formats/format_siren7.c b/formats/format_siren7.c index a2871fcf8..6017207cf 100644 --- a/formats/format_siren7.c +++ b/formats/format_siren7.c @@ -133,10 +133,6 @@ static int load_module(void) 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)"); diff --git a/formats/format_sln.c b/formats/format_sln.c index 11b150d5b..538f77fe7 100644 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -125,10 +125,6 @@ static int load_module(void) 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)"); diff --git a/formats/format_sln16.c b/formats/format_sln16.c index 3f9a73678..5e73fc9d8 100644 --- a/formats/format_sln16.c +++ b/formats/format_sln16.c @@ -133,10 +133,6 @@ static int load_module(void) 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)"); diff --git a/formats/format_vox.c b/formats/format_vox.c index db9e64631..1501375bb 100644 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -130,10 +130,6 @@ static int load_module(void) 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"); diff --git a/formats/format_wav.c b/formats/format_wav.c index 6cd4c54bc..050df73eb 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -493,10 +493,6 @@ static int load_module(void) 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)"); diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index 0b93b6eb9..106d88cb7 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -546,10 +546,6 @@ static int load_module(void) 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)"); -- cgit v1.2.3