[svn-commits] russell: branch 1.6.2 r233694 - in /branches/1.6.2: ./ formats/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Dec 8 12:04:04 CST 2009
Author: russell
Date: Tue Dec 8 12:04:00 2009
New Revision: 233694
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=233694
Log:
Merged revisions 233692 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r233692 | russell | 2009-12-08 12:00:16 -0600 (Tue, 08 Dec 2009) | 16 lines
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
........
Modified:
branches/1.6.2/ (props changed)
branches/1.6.2/formats/format_g723.c
branches/1.6.2/formats/format_g726.c
branches/1.6.2/formats/format_g729.c
branches/1.6.2/formats/format_gsm.c
branches/1.6.2/formats/format_h263.c
branches/1.6.2/formats/format_h264.c
branches/1.6.2/formats/format_ilbc.c
branches/1.6.2/formats/format_jpeg.c
branches/1.6.2/formats/format_ogg_vorbis.c
branches/1.6.2/formats/format_pcm.c
branches/1.6.2/formats/format_siren14.c
branches/1.6.2/formats/format_siren7.c
branches/1.6.2/formats/format_sln.c
branches/1.6.2/formats/format_sln16.c
branches/1.6.2/formats/format_vox.c
branches/1.6.2/formats/format_wav.c
branches/1.6.2/formats/format_wav_gsm.c
Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.2/formats/format_g723.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_g723.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_g723.c (original)
+++ branches/1.6.2/formats/format_g723.c Tue Dec 8 12:04:00 2009
@@ -149,4 +149,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_g726.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_g726.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_g726.c (original)
+++ branches/1.6.2/formats/format_g726.c Tue Dec 8 12:04:00 2009
@@ -258,4 +258,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_g729.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_g729.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_g729.c (original)
+++ branches/1.6.2/formats/format_g729.c Tue Dec 8 12:04:00 2009
@@ -145,4 +145,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_gsm.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_gsm.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_gsm.c (original)
+++ branches/1.6.2/formats/format_gsm.c Tue Dec 8 12:04:00 2009
@@ -169,4 +169,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_h263.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_h263.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_h263.c (original)
+++ branches/1.6.2/formats/format_h263.c Tue Dec 8 12:04:00 2009
@@ -183,4 +183,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_h264.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_h264.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_h264.c (original)
+++ branches/1.6.2/formats/format_h264.c Tue Dec 8 12:04:00 2009
@@ -172,4 +172,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_ilbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_ilbc.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_ilbc.c (original)
+++ branches/1.6.2/formats/format_ilbc.c Tue Dec 8 12:04:00 2009
@@ -143,4 +143,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_jpeg.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_jpeg.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_jpeg.c (original)
+++ branches/1.6.2/formats/format_jpeg.c Tue Dec 8 12:04:00 2009
@@ -112,4 +112,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_ogg_vorbis.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_ogg_vorbis.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_ogg_vorbis.c (original)
+++ branches/1.6.2/formats/format_ogg_vorbis.c Tue Dec 8 12:04:00 2009
@@ -556,5 +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 = 10,
+);
Modified: branches/1.6.2/formats/format_pcm.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_pcm.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_pcm.c (original)
+++ branches/1.6.2/formats/format_pcm.c Tue Dec 8 12:04:00 2009
@@ -494,4 +494,8 @@
|| 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,
+);
Modified: branches/1.6.2/formats/format_siren14.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_siren14.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_siren14.c (original)
+++ branches/1.6.2/formats/format_siren14.c Tue Dec 8 12:04:00 2009
@@ -135,4 +135,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_siren7.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_siren7.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_siren7.c (original)
+++ branches/1.6.2/formats/format_siren7.c Tue Dec 8 12:04:00 2009
@@ -135,4 +135,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_sln.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_sln.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_sln.c (original)
+++ branches/1.6.2/formats/format_sln.c Tue Dec 8 12:04:00 2009
@@ -127,4 +127,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_sln16.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_sln16.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_sln16.c (original)
+++ branches/1.6.2/formats/format_sln16.c Tue Dec 8 12:04:00 2009
@@ -135,4 +135,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_vox.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_vox.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_vox.c (original)
+++ branches/1.6.2/formats/format_vox.c Tue Dec 8 12:04:00 2009
@@ -132,4 +132,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_wav.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_wav.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_wav.c (original)
+++ branches/1.6.2/formats/format_wav.c Tue Dec 8 12:04:00 2009
@@ -495,4 +495,8 @@
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 = 10,
+);
Modified: branches/1.6.2/formats/format_wav_gsm.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/formats/format_wav_gsm.c?view=diff&rev=233694&r1=233693&r2=233694
==============================================================================
--- branches/1.6.2/formats/format_wav_gsm.c (original)
+++ branches/1.6.2/formats/format_wav_gsm.c Tue Dec 8 12:04:00 2009
@@ -548,4 +548,8 @@
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 = 10,
+);
More information about the svn-commits
mailing list