From a84cff117d1f862a6b345f87d0ba1f158e5feecd Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Sat, 2 Nov 2013 03:24:47 +0000 Subject: 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 " 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 --- apps/confbridge/conf_state_single.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'apps/confbridge/conf_state_single.c') diff --git a/apps/confbridge/conf_state_single.c b/apps/confbridge/conf_state_single.c index 2d01420b0..e3e0ca11c 100644 --- a/apps/confbridge/conf_state_single.c +++ b/apps/confbridge/conf_state_single.c @@ -55,6 +55,7 @@ static void join_unmarked(struct confbridge_user *user) { conf_add_user_active(user->conference, user); conf_handle_second_active(user->conference); + conf_update_user_mute(user); conf_change_state(user, CONF_STATE_MULTI); } @@ -63,6 +64,7 @@ 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); } -- cgit v1.2.3