summaryrefslogtreecommitdiff
path: root/res/res_musiconhold.c
AgeCommit message (Collapse)Author
2007-08-16Merged revisions 79778 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79778 | russell | 2007-08-16 17:24:25 -0500 (Thu, 16 Aug 2007) | 14 lines This patch fixes a bug where reloading the module with "module reload" did not delete classes from memory that were no longer in the config. This patch fixes that problem as well as another one. Previously, if you reloaded MOH using the "moh reload" CLI command, which behaved differently than "module reload ...", MOH had to be stopped on every channel and started again immediately. However, there was no way to tell what class was being used, so they would all fall back to the default class. (closes issue #10139) Reported by: blitzrage Patches: asterisk-10139-advanced.diff.txt uploaded by jamesgolovich (license 176) Tested by: jamesgolovich ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79788 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16Don't reload a configuration file if nothing has changed.Tilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15Modify the names of functions/variables in res_musiconhold to be useful.Jason Parker
Closes issue #10464, patch by caio1982 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79634 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-26Do a massive conversion for using the ast_verb() macroRussell Bryant
(closes issue #10277, patches by mvanbaak) Basically, this changes ... if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3, "Something\n"); to ... ast_verb(3, "Something\n"); git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19After some study, thought, comparing, etc. I've backed out the previous ↵Steve Murphy
universal mod to make ast_flags a 64 bit thing. Instead, I added a 64-bit version of ast_flags (ast_flags64), and 64-bit versions of the test-flag, set-flag, etc. macros, and an app_parse_options64 routine, and I use these in app_dial alone, to eliminate the 30-option limit it had grown to meet. There is room now for 32 more options and flags. I was heavily tempted to implement some of the other ideas that were presented, but this solution does not intro any new versions of dial, doesn't have a different API, has a minimal/zero impact on code outside of dial, and doesn't seriously (I hope) affect the code structure of dial. It's the best I can think of right now. My goal was NOT to rewrite dial. I leave that to a future, coordinated effort. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-17via 10206, I have added an option (e) to Dial to allow the h exten to get ↵Steve Murphy
run on peer. Had to upgrade ast_flag stuff to 64 bits to do this. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-13Merged revisions 75067 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r75067 | russell | 2007-07-13 15:10:40 -0500 (Fri, 13 Jul 2007) | 14 lines Merged revisions 75059 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r75059 | russell | 2007-07-13 15:07:21 -0500 (Fri, 13 Jul 2007) | 6 lines Ensure that adding a user to the list of users of a specific music on hold class is not done at the same time as any of the other operations on this list to prevent list corruption. Using the global moh_data lock for this is not ideal, but it is what is used to protect these lists everywhere else in the module, and I am only changing what is necessary to fix the bug. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75075 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-12Merged revisions 74815 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r74815 | file | 2007-07-12 12:53:55 -0300 (Thu, 12 Jul 2007) | 10 lines Merged revisions 74814 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r74814 | file | 2007-07-12 12:51:24 -0300 (Thu, 12 Jul 2007) | 2 lines Only print out a warning for situations where it is actually helpful. (issue #10187 reported by denke) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74816 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-10Merged revisions 74323 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r74323 | russell | 2007-07-10 11:00:11 -0500 (Tue, 10 Jul 2007) | 1 line fix an uninitialized variable ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74324 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-09Merged revisions 74162 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r74162 | russell | 2007-07-09 15:53:46 -0500 (Mon, 09 Jul 2007) | 9 lines (closes issue #10123) Reported by: blitzrage Patches submitted by: juggie, qwell, me Tested by: blitzrage When trying to find a music on hold class to use, try all of the options, instead of only the first one that is set. Also, change the MusicOnHold applications to not hang up on the channel when a class can not be found. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-14Add a massive set of changes for converting to use the ast_debug() macro.Russell Bryant
(issue #9957, patches from mvanbaak, caio1982, critch, and dimas) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-06Issue 9869 - replace malloc and memset with ast_calloc, and other coding ↵Tilghman Lesher
guidelines changes git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-23Fix compiling of res_musiconhold under dev mode.Joshua Colp
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65590 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-22 Add a new feature for Music on Hold. If you set the "digit" option for aRussell Bryant
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-20Music on hold and crypto no longer need their symbols globally exported. ↵Joshua Colp
They register the function pointers upon loading with their respective stubs. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65249 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-09I'm crazy so I think I'll change the musiconhold classes linked list to ↵Joshua Colp
read/write as well! git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53691 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-01Merged revisions 53088 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r53088 | file | 2007-02-01 15:11:28 -0600 (Thu, 01 Feb 2007) | 10 lines Merged revisions 53084 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r53084 | file | 2007-02-01 15:03:10 -0600 (Thu, 01 Feb 2007) | 2 lines Return previous behavior of having MOH pick up where it was left off. (issue #8672 reported by sinistermidget) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-23Merged revisions 51513 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r51513 | file | 2007-01-22 20:45:04 -0500 (Mon, 22 Jan 2007) | 10 lines Merged revisions 51512 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r51512 | file | 2007-01-22 20:41:35 -0500 (Mon, 22 Jan 2007) | 2 lines Yield before reading from zaptel timing source under Solaris so that other threads get a chance to do things. (issue #7875 reported by bob) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51514 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19include "asterisk/zapata.h" instead of lookingLuigi Rizzo
directly for the zaptel.h and tonezone.h git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51292 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-11Merged revisions 48375 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r48375 | tilghman | 2006-12-10 18:47:21 -0600 (Sun, 10 Dec 2006) | 13 lines Merged revisions 48374 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r48374 | tilghman | 2006-12-10 18:33:59 -0600 (Sun, 10 Dec 2006) | 5 lines When doing a fork() and exec(), two problems existed (Issue 8086): 1) Ignored signals stayed ignored after the exec(). 2) Signals could possibly fire between the fork() and exec(), causing Asterisk signal handlers within the child to execute, which caused nasty race conditions. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-07Merged revisions 48357 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r48357 | russell | 2006-12-07 13:17:28 -0500 (Thu, 07 Dec 2006) | 11 lines Merged revisions 48356 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r48356 | russell | 2006-12-07 13:14:13 -0500 (Thu, 07 Dec 2006) | 3 lines Ensure that the file position is not incremented beyond the total number of files available for playback. (issue #8539, ulogic) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48358 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27Merged revisions 48049 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r48049 | tilghman | 2006-11-27 11:20:37 -0600 (Mon, 27 Nov 2006) | 10 lines Merged revisions 48045 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r48045 | tilghman | 2006-11-27 11:15:54 -0600 (Mon, 27 Nov 2006) | 2 lines Random MOH wasn't really random (bug 8381) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-07Merged revisions 47239 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r47239 | russell | 2006-11-06 20:25:10 -0500 (Mon, 06 Nov 2006) | 13 lines Merged revisions 47238 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r47238 | russell | 2006-11-06 20:22:58 -0500 (Mon, 06 Nov 2006) | 5 lines If random order is enabled for files mode music on hold, set a random initial position, instead of always starting at the first file, and doing the random operation only when switching to the next file. (bug reported by John Lange on the asterisk-dev mailing list) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47240 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-02Merged revisions 47051 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r47051 | tilghman | 2006-11-02 17:00:20 -0600 (Thu, 02 Nov 2006) | 2 lines Reverse change of "show" to "list" and make several other commands more consistent with "category verb arguments" ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-02Merged revisions 46965 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r46965 | russell | 2006-11-02 12:49:54 -0500 (Thu, 02 Nov 2006) | 11 lines Merged revisions 46964 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r46964 | russell | 2006-11-02 12:47:56 -0500 (Thu, 02 Nov 2006) | 3 lines ignore files in a music on hold directory that begin with '.' (issue #8249, cboie) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46966 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-27Merged revisions 46363 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r46363 | russell | 2006-10-27 12:39:31 -0500 (Fri, 27 Oct 2006) | 5 lines We should always be using _exit() after a fork() or vfork() instead of exit(). This is because exit() does some extra cleanup which in some implementations of vfork(), for example, can actually modify the state of the parent process, causing very weird bugs or crashes. (issue #7971, Nick Gavrikov) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04Merged revisions 44378 via svnmerge from Kevin P. Fleming
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r44378 | kpfleming | 2006-10-04 14:47:22 -0500 (Wed, 04 Oct 2006) | 4 lines update thread creation code a bit reduce standard thread stack size slightly to allow the pthreads library to allocate the stack+data and not overflow a power-of-2 allocation in the kernel and waste memory/address space add a new stack size for 'background' threads (those that don't handle PBX calls) when LOW_MEMORY is defined ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-03bug #8076 check option_debug before printing to debug channel.Matt O'Gorman
patch provided in bugnote, with minor changes. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44253 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28Merged revisions 43933 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r43933 | file | 2006-09-28 14:05:43 -0400 (Thu, 28 Sep 2006) | 2 lines Put in missing \ns on the end of ast_logs (issue #7936 reported by wojtekka) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43934 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-21Lots more removal of deprecated thingsTilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43452 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-19do this fix properly :-)Kevin P. Fleming
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-19Various updates from PCadach's chan_h323-live branchMatthew Fredrickson
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43294 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-18merge qwell's CLI verbification workKevin P. Fleming
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-24Fix a small typo I found.Jason Parker
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41009 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21merge new_loader_completion branch, including (at least):Kevin P. Fleming
- restructured build tree and makefiles to eliminate recursion problems - support for embedded modules - support for static builds - simpler cross-compilation support - simpler module/loader interface (no exported symbols) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-03Merged revisions 38825 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r38825 | file | 2006-08-03 15:54:02 -0400 (Thu, 03 Aug 2006) | 2 lines Treat the file as invalid if we have no valid formats for it (issue #7643 reported by KNK) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38826 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-01Merged revisions 38654 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r38654 | file | 2006-08-01 15:20:05 -0400 (Tue, 01 Aug 2006) | 2 lines Close the stream when file based MOH stop. This won't get rid of their position in the file but it will cause the translation path to be setup again. (issue #7634 reported by asimpson) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-19merge Russell's 'hold_handling' branch, finally implementing music-on-hold ↵Kevin P. Fleming
handling the way it was decided at AstriDevCon Europe 2006 (and the way people really want it to be) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-05prepare Asterisk for new zaptel.h/tonezone.h installation locationsKevin P. Fleming
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-24The Eurostar Commit! (it's amazing how much work you can get done on a 150 ↵Kevin P. Fleming
minute train ride from Paris to London <G>) support the new location for zaptel.h and tonezone.h use the dependency information output by menuselect to build Makefile rules for each module for header files and libraries combine the common rules into a top-level Makefile.rules file remove all (now) unnecessary stuff from subdir Makefiles change translator API so that the newpvt() callback returns an int instead of a pointer (it no longer allocates memory) alphabetize --with-<foo> options in configure script enhance Net-SNMP support in configure script to provide a --with-netsnmp option fix support for --with-pq so that if pg-config is not found when --with-pq is specified, an error will be generated add 'optional package' usage to modules now that menuselect can output it allow res_snmp to build by default, since the new loader changes coming soon will solve the function naming problem (and users can disable it via menuselect anyway) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-09various minor portability fixes (mostly from tholo for OpenBSD)Kevin P. Fleming
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-07simplify autoconfig include mechanism (make tholo happy he can use lint ↵Kevin P. Fleming
again :-) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32846 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-04Use a dynamically sized array to store the list of files for moh "files" modeRussell Bryant
- Instead of always allocating 64KB of memory for every MOH class, this has been reduced to only a single pointer per class, with more memory only allocatted when using "files" mode, as needed - Instead of imposing a length limit on the full filename, including full path, of 127 characters, use PATH_MAX, the maximum length that the system can handle - There is no longer a limit on the number of files than can be used for a single MOH class using "files" mode git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31953 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-03when using moh files mode, don't look for a file past the number of filesRussell Bryant
that have been loaded, or worse, past the size of the files array git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-02add a comment where some memory usage optimization needs to be doneRussell Bryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31613 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-01Merged revisions 31555 via svnmerge from Kevin P. Fleming
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r31555 | kpfleming | 2006-06-01 16:46:50 -0500 (Thu, 01 Jun 2006) | 2 lines remove pointless forcing of the channel into SLINEAR mode; the write format will be set later based on the file that is chosen to be played to the channel ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-19when displaying the list of registered music on hold classes, only showRussell Bryant
the format if the mode is not "files", because the field has no meaning in that case git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@28445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-01Merged revisions 24019 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r24019 | tilghman | 2006-05-01 15:44:24 -0500 (Mon, 01 May 2006) | 2 lines Bug 6864 - drop realtime priority on ALL external processes ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24053 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-29- convert lists to use linked list macrosRussell Bryant
- instead of allocating a frame on the stack every time the music on hold generator is called, put a frame in the mohdata structure. Also, initialize the parts of the frame that will never change when the mohdata struct is allocatted and only change the necessary parts in the generator function. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23334 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-24Thanks to the fine work of Russell Bryant and Dancho Lazarov, we now have ↵Kevin P. Fleming
autoconf and menuselect tools for Asterisk! git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22267 65c4cc65-6c06-0410-ace0-fbb531ad65f3
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 00:37:06 +0000