]> git.ipfire.org Git - thirdparty/asterisk.git/commit
confbridge: Separate user muting from system muting overrides. 18/2118/1
authorRichard Mudgett <rmudgett@digium.com>
Sat, 2 Nov 2013 02:11:03 +0000 (02:11 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 27 Jan 2016 23:21:48 +0000 (17:21 -0600)
commit53e23608d1d2a0472c8c99efa85dbfe0e8e964bd
tree439c10a6248daf4db9234d69487e839566a1d79f
parentb5fb4f7e8909ff63911ba6b088faba2db1859dac
confbridge: Separate user muting from system muting overrides.

The system overrides the user muting requests when MOH is playing or a
waitmarked user is waiting for a marked user to join.  System muting
overrides interfere with what the user may wish the muting to be when the
system override ends.

* User muting requests are now independent of the system muting overrides.
The effective muting is now the logical or of the user request and system
override.

* Added a Muted column to the CLI "confbridge list <conference>" command.

* Added a Muted header to the AMI ConfbridgeList action ConfbridgeList
event.

(closes issue AST-1102)
Reported by: John Bigelow

Review: https://reviewboard.asterisk.org/r/2960/

Cherry-picked to support ASTERISK-20987

Change-Id: Iec7bd77736847af6a5f70b8d279f85c6e2082ee2
apps/app_confbridge.c
apps/confbridge/conf_state.c
apps/confbridge/conf_state_inactive.c
apps/confbridge/conf_state_multi.c
apps/confbridge/conf_state_multi_marked.c
apps/confbridge/conf_state_single.c
apps/confbridge/conf_state_single_marked.c
apps/confbridge/include/confbridge.h