diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-11-02 03:24:47 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-11-02 03:24:47 +0000 |
commit | a84cff117d1f862a6b345f87d0ba1f158e5feecd (patch) | |
tree | 816da062b06ce3bdef561447c7fb0b6ff7dd7ef1 /apps/confbridge/conf_state_inactive.c | |
parent | 0721b1de836da3e91ac71d54c972caa80a9e2379 (diff) |
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 flag 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/
........
Merged revisions 402425 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 402427 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/confbridge/conf_state_inactive.c')
-rw-r--r-- | apps/confbridge/conf_state_inactive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/confbridge/conf_state_inactive.c b/apps/confbridge/conf_state_inactive.c index 28447983d..379f071a5 100644 --- a/apps/confbridge/conf_state_inactive.c +++ b/apps/confbridge/conf_state_inactive.c @@ -61,7 +61,7 @@ static void join_unmarked(struct confbridge_user *user) static void join_marked(struct confbridge_user *user) { conf_add_user_marked(user->conference, user); - conf_handle_second_active(user->conference); + conf_update_user_mute(user); conf_change_state(user, CONF_STATE_MULTI_MARKED); } |