aboutsummaryrefslogtreecommitdiffstats
path: root/configs/musiconhold.conf.sample
AgeCommit message (Collapse)AuthorFilesLines
2010-10-16Merged revisions 292050 via svnmerge from tzafrir1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r292050 | tzafrir | 2010-10-16 12:47:00 +0200 (ש', 16 אוק 2010) | 22 lines Merged revisions 292049 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r292049 | tzafrir | 2010-10-16 12:03:04 +0200 (ש', 16 אוק 2010) | 15 lines Base directory for MOH should be ASTDATADIR If the directive 'directory' is relative, make it relative to the datadir, rather than to the varlibdir. In the sample configuration it is relative ('moh'). This has no effect unless you have actively set the datadir explicitly (at build time or at run time). (closes issue #16906) Patches: moh_datadir uploaded by tzafrir (license 46) Review: https://reviewboard.asterisk.org/r/974/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@292052 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-28Remove a bunch of trailing whitespace in preparation for reformatting/cleanup.seanbright1-4/+4
Let's try that again, this time removing trailing whitespace and not leading whitespace. I can't believe no one noticed. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@197535 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-28Remove a bunch of trailing whitespace in preparation for reformatting/cleanup.seanbright1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@197528 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-16support relative paths in musiconhold.conf, which makes moh work by default ↵kpfleming1-3/+8
when Asterisk was configured using --prefix and 'make samples' is run git-svn-id: http://svn.digium.com/svn/asterisk/trunk@149917 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-28Adding support for realtime music on hold. The following are the main points:mmichelson1-0/+5
1. When moh is started, we search first in memory to find the class. If we do not find it in memory, we search realtime instead. 2. When moh is restarted (as in, it had been started on this particular channel, stopped, and now we're starting it again), if using the "files" mode, then realtime will always be rechecked. If you are using other modes, however, we will simply reattach to the external running process which was playing moh earlier in the call. This is a necessary compromise so that we don't end up with too many background processes. 3. musiconhold.conf has a general section now. It has one option: cachertclasses. If set to yes, then moh classes found in realtime will be added to the in-memory list. This has the advantage of not requiring database lookups each time moh is started, but it has the disadvantage of not truly being realtime. I have tested this for functionality, and it passes. I also tested this under valgrind and there are no memory problems reported under typical use. Special thanks to Sergee for implementing this feature and enduring my complaints on the bugtracker! (closes issue #11196, reported and patched by sergee) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89946 f38db490-d61c-443f-a65b-d21fe96a405b
2007-10-01Add a new option for files-based music on hold to ensure that the sort orderrussell1-1/+6
of the files is alphabetical. (closes issue #10855) Reported by: jamesgolovich Patches: asterisk-mohsortalpha.diff.txt uploaded by jamesgolovich (license 176) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@84168 f38db490-d61c-443f-a65b-d21fe96a405b
2007-05-22 Add a new feature for Music on Hold. If you set the "digit" option for arussell1-1/+4
class in musiconhold.conf, a caller on hold may press this digit to switch to listening to that music class. This involved adding a new callback for generators, which allow generators to get notified of DTMF from the channel they are running on. Then, a callback was implemented for the music on hold generators. (patch from bbryant) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@65505 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-07Merged revisions 47279 via svnmerge from kpfleming1-27/+28
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r47279 | kpfleming | 2006-11-07 12:56:21 -0600 (Tue, 07 Nov 2006) | 2 lines clean up sample config, and make native file playback the more obvious default choice ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47280 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-07moh files will now be distributed in native format, not mp3, so...kpfleming1-8/+8
update sounds/Makefile to download/unpack the proper files remove all evidence of mpg123 from the main Makefile change the sample musiconhold.conf file to use native mode instead of mp3 git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32917 f38db490-d61c-443f-a65b-d21fe96a405b
2006-03-17Add reference to examples for files and custom, too make it more obiousoej1-3/+4
that you're required to read on... (hello xrobau) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@13323 f38db490-d61c-443f-a65b-d21fe96a405b
2005-11-29git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7221 ↵kpfleming1-0/+0
f38db490-d61c-443f-a65b-d21fe96a405b
2005-10-04make sample config files easier to ready (issue #5371)kpfleming1-1/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6720 f38db490-d61c-443f-a65b-d21fe96a405b
2005-08-25change sample iprussell1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6407 f38db490-d61c-443f-a65b-d21fe96a405b
2005-08-25add madplay example for Solaris users (issue #4929)kpfleming1-0/+7
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6403 f38db490-d61c-443f-a65b-d21fe96a405b
2005-08-22support new format for musiconhold.conf (issue #4908)kpfleming1-14/+34
support non-SLINEAR moh streams (issue #4908) add external app to feed TCP stream into Asterisk for moh (issue #4908) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6353 f38db490-d61c-443f-a65b-d21fe96a405b
2005-07-08update sample to reflect new nodir optionrussell1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6058 f38db490-d61c-443f-a65b-d21fe96a405b
2005-01-04Load formats first (bug #3242)markster1-0/+23
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4664 f38db490-d61c-443f-a65b-d21fe96a405b
2004-08-01Rename newp to newpvt (bug #2190), change hold music.markster1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3560 f38db490-d61c-443f-a65b-d21fe96a405b
2004-07-17Merge musiconhold stuff (bug #2027), restructure AGI to eventually support ↵markster1-0/+2
registration git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3460 f38db490-d61c-443f-a65b-d21fe96a405b
2004-04-29Unbuffered music on holdmarkster1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2811 f38db490-d61c-443f-a65b-d21fe96a405b
2002-05-12Version 0.1.12 from FTPmarkster1-0/+7
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@444 f38db490-d61c-443f-a65b-d21fe96a405b