From 127c3c93d09fbbb3d8f2c64908ae008b74433edb Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Tue, 4 Jan 2005 20:55:43 +0000 Subject: [PATCH] Load formats first (bug #3242) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4664 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- configs/musiconhold.conf.sample | 23 +++++++++++++++++++++++ loader.c | 1 + 2 files changed, 24 insertions(+) diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample index 78e7022510..b47ee749c4 100755 --- a/configs/musiconhold.conf.sample +++ b/configs/musiconhold.conf.sample @@ -9,3 +9,26 @@ default => quietmp3:/var/lib/asterisk/mohmp3 ;quietunbuf => quietmp3nb:/var/lib/asterisk/mohmp3 ; Note that the custom mode cannot handle escaped parameters (specifically embedded spaces) ;manual => custom:/var/lib/asterisk/mohmp3,/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s + +; +; File-based (native) music on hold +; +; This plays files directly from the specified directory, no external +; processes are required. Files are played in normal sorting order +; (same as a sorted directory listing), and no volume or other +; sound adjustments are available. If the file is available in +; the same format as the channel's codec, then it will be played +; without transcoding (same as Playback would do in the dialplan). +; Files can be present in as many formats as you wish, and the +; 'best' format will be chosen at playback time. +; +; NOTE: +; If you are not using "autoload" in modules.conf, then you +; must ensure that the format modules for any formats you wish +; to use are loaded _before_ res_musiconhold. If you do not do +; this, res_musiconhold will skip the files it is not able to +; understand when it loads. +; +[moh_files] +;native => /var/lib/asterisk/moh-native +;native-random => /var/lib/asterisk/moh-native,r diff --git a/loader.c b/loader.c index 89d006ea34..eb10d1b12a 100755 --- a/loader.c +++ b/loader.c @@ -421,6 +421,7 @@ static int ast_resource_exists(char *resource) static const char *loadorder[] = { + "format_", "res_", "chan_", "pbx_",