Commit Graph

22 Commits

Author SHA1 Message Date
Jonathan Rose de09749470 Add an announcement option to music-on-hold - plays sound when put on hold/between songs
This is a feature patch which allows an 'announcement' option to be specified in
musiconhold.conf which should be set to the name of a sound. If a valid sound is
specified for this option, then it will be played on that music on hold class whenever
a channel bound to that class is put on hold as well as when Asterisk is able to detect
that a song has ended before starting the next song (excludes external players).

(closes ASTERISK-18977)
Reported by: Timo Teräs
Patches:
	asterisk-moh-announcement.diff uploaded by Timo Teräs (license 5409)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@352134 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-01-23 18:34:47 +00:00
Tzafrir Cohen 4d6eac5282 Merged revisions 292050 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@292052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-16 11:51:54 +00:00
Sean Bright f22962a0c1 Remove a bunch of trailing whitespace in preparation for reformatting/cleanup.
Let's try that again, this time removing trailing whitespace and not leading
whitespace.  I can't believe no one noticed.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@197535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-28 14:39:21 +00:00
Sean Bright a7d813cae7 Remove a bunch of trailing whitespace in preparation for reformatting/cleanup.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@197528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-28 14:32:03 +00:00
Kevin P. Fleming 109a17ae79 support relative paths in musiconhold.conf, which makes moh work by default when Asterisk was configured using --prefix and 'make samples' is run
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@149917 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-16 08:30:32 +00:00
Mark Michelson a42259c3ff Adding support for realtime music on hold. The following are the main points:
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: https://origsvn.digium.com/svn/asterisk/trunk@89946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-28 00:47:22 +00:00
Russell Bryant df30de142c Add a new option for files-based music on hold to ensure that the sort order
of the files is alphabetical.

(closes issue #10855)
Reported by: jamesgolovich
Patches: 
      asterisk-mohsortalpha.diff.txt uploaded by jamesgolovich (license 176)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84168 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-01 14:43:56 +00:00
Russell Bryant 90d6885701 Add a new feature for Music on Hold. If you set the "digit" option for a
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: https://origsvn.digium.com/svn/asterisk/trunk@65505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-22 18:52:59 +00:00
Kevin P. Fleming 8b8d8d0b24 Merged revisions 47279 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@47280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-07 18:56:56 +00:00
Kevin P. Fleming bc49d5bfb3 moh files will now be distributed in native format, not mp3, so...
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: https://origsvn.digium.com/svn/asterisk/trunk@32917 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-07 22:37:31 +00:00
Olle Johansson 0efbe1aa5d Add reference to examples for files and custom, too make it more obious
that you're required to read on... (hello xrobau)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@13323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-17 08:46:31 +00:00
Kevin P. Fleming 2c65582b66 remove extraneous svn:executable properties
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-29 18:24:39 +00:00
Kevin P. Fleming f387421905 make sample config files easier to ready (issue #5371)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6720 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-10-04 22:51:59 +00:00
Russell Bryant 9f13284f02 change sample ip
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6407 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-08-25 16:11:46 +00:00
Kevin P. Fleming aad6fbb85e add madplay example for Solaris users (issue #4929)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6403 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-08-25 02:40:08 +00:00
Kevin P. Fleming ff971379f4 support new format for musiconhold.conf (issue #4908)
support non-SLINEAR moh streams (issue #4908)
add external app to feed TCP stream into Asterisk for moh (issue #4908)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6353 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-08-22 19:29:29 +00:00
Russell Bryant ea346597bb update sample to reflect new nodir option
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6058 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-07-08 15:04:01 +00:00
Mark Spencer 127c3c93d0 Load formats first (bug #3242)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4664 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-01-04 20:55:43 +00:00
Mark Spencer 05e338ce75 Rename newp to newpvt (bug #2190), change hold music.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-08-01 14:19:04 +00:00
Mark Spencer de4188df06 Merge musiconhold stuff (bug #2027), restructure AGI to eventually support registration
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3460 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-07-17 20:12:28 +00:00
Mark Spencer 4f51ef7ab7 Unbuffered music on hold
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2811 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-04-29 03:36:46 +00:00
Mark Spencer 218fdfa3e5 Version 0.1.12 from FTP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@444 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2002-05-12 11:48:14 +00:00