diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-19 20:44:39 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-19 20:44:39 +0000 |
commit | 6049bb6539153c2f400f1f2dbc763c74d796204b (patch) | |
tree | 3c36781db3a5a7a08967cbe8d83acb5d82e581cb /configs | |
parent | 28df168d0f9fd12f5914263015dc26898e834146 (diff) |
merge Russell's 'hold_handling' branch, finally implementing music-on-hold handling the way it was decided at AstriDevCon Europe 2006 (and the way people really want it to be)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37988 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r-- | configs/alsa.conf.sample | 7 | ||||
-rw-r--r-- | configs/features.conf.sample | 3 | ||||
-rw-r--r-- | configs/iax.conf.sample | 18 | ||||
-rw-r--r-- | configs/queues.conf.sample | 8 | ||||
-rw-r--r-- | configs/sip.conf.sample | 18 | ||||
-rw-r--r-- | configs/skinny.conf.sample | 5 | ||||
-rw-r--r-- | configs/zapata.conf.sample | 20 |
7 files changed, 70 insertions, 9 deletions
diff --git a/configs/alsa.conf.sample b/configs/alsa.conf.sample index e39197719..9b036a9d9 100644 --- a/configs/alsa.conf.sample +++ b/configs/alsa.conf.sample @@ -20,6 +20,13 @@ extension=s ; ;language=en ; +; Default Music on Hold class to use when this channel is placed on hold in +; the case that the music class is not set on the channel with +; Set(CHANNEL(musicclass)=whatever) in the dialplan and the peer channel +; putting this one on hold did not suggest a class to use. +; +;mohinterpret=default +; ; Silence supression can be enabled when sound is over a certain threshold. ; The value for the threshold should probably be between 500 and 2000 or so, ; but your mileage may vary. Use the echo test to evaluate the best setting. diff --git a/configs/features.conf.sample b/configs/features.conf.sample index a0cc63600..1bfa45820 100644 --- a/configs/features.conf.sample +++ b/configs/features.conf.sample @@ -18,6 +18,9 @@ context => parkedcalls ; Which context parked calls are in ;adsipark = yes ; if you want ADSI parking announcements ;findslot => next ; Continue to the 'next' free parking space. ; Defaults to 'first' available +;parkedmusicclass=default ; This is the MOH class to use for the parked channel + ; as long as the class is not set on the channel directly + ; using Set(CHANNEL(musicclass)=whatever) in the dialplan ;transferdigittimeout => 3 ; Number of seconds to wait between digits when transfering a call ; (default is 3 seconds) diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample index a63c145ee..f616e4b21 100644 --- a/configs/iax.conf.sample +++ b/configs/iax.conf.sample @@ -62,6 +62,24 @@ ; ;language=en ; +; This option specifies a preference for which music on hold class this channel +; should listen to when put on hold if the music class has not been set on the +; channel with Set(CHANNEL(musicclass)=whatever) in the dialplan, and the peer +; channel putting this one on hold did not suggest a music class. +; +; If this option is set to "passthrough", then the hold message will always be +; passed through as signalling instead of generating hold music locally. +; +; This option may be specified globally, or on a per-user or per-peer basis. +; +;mohinterpret=default +; +; This option specifies which music on hold class to suggest to the peer channel +; when this channel places the peer on hold. It may be specified globally or on +; a per-user or per-peer basis. +; +;mohsuggest=default +; ; Specify bandwidth of low, medium, or high to control which codecs are used ; in general. ; diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample index 86534f546..40098606f 100644 --- a/configs/queues.conf.sample +++ b/configs/queues.conf.sample @@ -51,10 +51,12 @@ monitor-type = MixMonitor ; ; A sample call queue ; -; Musiconhold sets which music applies for this particular -; call queue (configure classes in musiconhold.conf) +; Musicclass sets which music applies for this particular call queue. +; The only class which can override this one is if the MOH class is set +; directly on the channel using Set(CHANNEL(musicclass)=whatever) in the +; dialplan. ; -;musiconhold = default +;musicclass = default ; ; An announcement may be specified which is played for the member as ; soon as they answer a call, typically to indicate to them which queue diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 2409f6ef3..3f24034cc 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -71,8 +71,22 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ;disallow=all ; First disallow all codecs ;allow=ulaw ; Allow codecs in order of preference ;allow=ilbc ; -;musicclass=default ; Sets the default music on hold class for all SIP calls - ; This may also be set for individual users/peers +; +; This option specifies a preference for which music on hold class this channel +; should listen to when put on hold if the music class has not been set on the +; channel with Set(CHANNEL(musicclass)=whatever) in the dialplan, and the peer +; channel putting this one on hold did not suggest a music class. +; +; This option may be specified globally, or on a per-user or per-peer basis. +; +;mohinterpret=default +; +; This option specifies which music on hold class to suggest to the peer channel +; when this channel places the peer on hold. It may be specified globally or on +; a per-user or per-peer basis. +; +;mohsuggest=default +; ;language=en ; Default language setting for all users/peers ; This may also be set for individual users/peers ;relaxdtmf=yes ; Relax dtmf handling diff --git a/configs/skinny.conf.sample b/configs/skinny.conf.sample index 39313e4fc..c131c2963 100644 --- a/configs/skinny.conf.sample +++ b/configs/skinny.conf.sample @@ -60,7 +60,10 @@ keepalive=120 ;threewaycalling=yes ;context=default ;line => 500 ; Dial(Skinny/500@duba) - +;mohinterpret=default ; This option specifies a default music on hold class to + ; use when put on hold if the channel's moh class was not + ; explicitly set with Set(CHANNEL(musicclass)=whatever) and + ; the peer channel did not suggest a class to use. ; Typical config for a 7940 with dual 7914s ;[support] diff --git a/configs/zapata.conf.sample b/configs/zapata.conf.sample index e28153f4c..c425bca4d 100644 --- a/configs/zapata.conf.sample +++ b/configs/zapata.conf.sample @@ -481,10 +481,24 @@ immediate=no ;faxdetect=outgoing ;faxdetect=no ; -; Select which class of music to use for music on hold. If not specified -; then the default will be used. +; This option specifies a preference for which music on hold class this channel +; should listen to when put on hold if the music class has not been set on the +; channel with Set(CHANNEL(musicclass)=whatever) in the dialplan, and the peer +; channel putting this one on hold did not suggest a music class. ; -;musicclass=default +; If this option is set to "passthrough", then the hold message will always be +; passed through as signalling instead of generating hold music locally. This +; setting is only valid when used on a channel that uses digital signalling. +; +; This option may be specified globally, or on a per-user or per-peer basis. +; +;mohinterpret=default +; +; This option specifies which music on hold class to suggest to the peer channel +; when this channel places the peer on hold. It may be specified globally or on +; a per-user or per-peer basis. +; +;mohsuggest=default ; ; PRI channels can have an idle extension and a minunused number. So long as ; at least "minunused" channels are idle, chan_zap will try to call "idledial" |