From 084197df39e3ebd29a88e8bef0a16141b8f32423 Mon Sep 17 00:00:00 2001 From: russell 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: http://svn.digium.com/svn/asterisk/trunk@233692 f38db490-d61c-443f-a65b-d21fe96a405b --- formats/format_pcm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'formats/format_pcm.c') diff --git a/formats/format_pcm.c b/formats/format_pcm.c index b8517af6e..3129fae11 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -494,4 +494,8 @@ static int unload_module(void) || 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 = 10, +); -- cgit v1.2.3