From 8ab22f5dd04eb9c38deec9f9fef2086897d33080 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 8 Dec 2009 18:00:16 +0000 Subject: Set a module load priority for format modules. A recent change to app_voicemail made it such that the module now assumes that all format modules are available while processing voicemail configuration. However, when autoloading modules, it was possible that app_voicemail was loaded before the format modules. Since format modules don't depend on anything, set a module load priority on them to ensure that they get loaded first when autoloading. This fix applies to trunk, 1.6.1, and 1.6.2. The fix for 1.4 and 1.6.0 will require a different approach since the module load priority functionality is not present in the module API. (issue #16412) Reported by: jiddings git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@233692 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- formats/format_ogg_vorbis.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'formats/format_ogg_vorbis.c') diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index 29d5ad50f..928b00104 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -556,5 +556,8 @@ static int unload_module(void) 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 = 10, +); -- cgit v1.2.3