-
- Downloads
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
Showing
- apps/app_confbridge.c 93 additions, 36 deletionsapps/app_confbridge.c
- apps/confbridge/conf_state.c 1 addition, 2 deletionsapps/confbridge/conf_state.c
- apps/confbridge/conf_state_inactive.c 1 addition, 1 deletionapps/confbridge/conf_state_inactive.c
- apps/confbridge/conf_state_multi.c 2 additions, 0 deletionsapps/confbridge/conf_state_multi.c
- apps/confbridge/conf_state_multi_marked.c 11 additions, 11 deletionsapps/confbridge/conf_state_multi_marked.c
- apps/confbridge/conf_state_single.c 2 additions, 0 deletionsapps/confbridge/conf_state_single.c
- apps/confbridge/conf_state_single_marked.c 2 additions, 0 deletionsapps/confbridge/conf_state_single_marked.c
- apps/confbridge/include/confbridge.h 10 additions, 0 deletionsapps/confbridge/include/confbridge.h
Loading
Please register or sign in to comment