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
This commit is contained in:
Tilghman Lesher
2010-07-20 19:35:02 +00:00
parent 293bdffe70
commit b4e18d5660
92 changed files with 282 additions and 190 deletions

View File

@@ -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");

View File

@@ -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");

View File

@@ -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");

View File

@@ -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");

View File

@@ -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");

View File

@@ -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");

View File

@@ -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");

View File

@@ -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");

View File

@@ -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");

View File

@@ -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");

View File

@@ -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");

View File

@@ -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)");

View File

@@ -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)");

View File

@@ -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)");

View File

@@ -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)");

View File

@@ -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");

View File

@@ -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)");

View File

@@ -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)");