kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set a module load priority for format modules.

Browse Source 
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
This commit is contained in:
Russell Bryant
2009-12-08 18:00:16 +00:00
parent 2cc499708c
commit 8ab22f5dd0
17 changed files with 85 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
formats/format_g723.c
View File

@@ -149,4 +149,8 @@ static int unload_module(void)
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,
);

6
formats/format_g726.c
View File

@@ -258,4 +258,8 @@ static int unload_module(void)
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,
);

6
formats/format_g729.c
View File

@@ -145,4 +145,8 @@ static int unload_module(void)
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,
);

6
formats/format_gsm.c
View File

@@ -169,4 +169,8 @@ static int unload_module(void)
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,
);

6
formats/format_h263.c
View File

@@ -183,4 +183,8 @@ static int unload_module(void)
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,
);

6
formats/format_h264.c
View File

@@ -172,4 +172,8 @@ static int unload_module(void)
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,
);

6
formats/format_ilbc.c
View File

@@ -143,4 +143,8 @@ static int unload_module(void)
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,
);

6
formats/format_jpeg.c
View File

@@ -112,4 +112,8 @@ static int unload_module(void)
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,
);

7
formats/format_ogg_vorbis.c
View File

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

6
formats/format_pcm.c
View File

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

6
formats/format_siren14.c
View File

@@ -135,4 +135,8 @@ static int unload_module(void)
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,
);

6
formats/format_siren7.c
View File

@@ -135,4 +135,8 @@ static int unload_module(void)
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,
);

6
formats/format_sln.c
View File

@@ -127,4 +127,8 @@ static int unload_module(void)
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,
);

6
formats/format_sln16.c
View File

@@ -135,4 +135,8 @@ static int unload_module(void)
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,
);

6
formats/format_vox.c
View File

@@ -132,4 +132,8 @@ static int unload_module(void)
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,
);

6
formats/format_wav.c
View File

@@ -495,4 +495,8 @@ static int unload_module(void)
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,
);

6
formats/format_wav_gsm.c
View File

@@ -548,4 +548,8 @@ static int unload_module(void)
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,
);