Merge topic 'ASTERISK-20987' into 13

* changes:
  app_confbridge: Add ability to get the muted conference state.
  app_confbridge.c: Update CONFBRIDGE and CONFBRIDGE_INFO documentation.
  app_confbridge: Make non-admin users join a muted conference muted.
This commit is contained in:
Joshua Colp
2016-02-05 11:49:10 -06:00
committed by Gerrit Code Review
3 changed files with 98 additions and 40 deletions

View File

@@ -334,10 +334,12 @@ type=bridge
; upon release of the video src.
; admin_toggle_mute_participants ; This action allows an administrator to toggle the mute
; state for all non-admins within a conference. All
; admin users are unaffected by this option. Note that all
; users, regardless of their admin status, are notified
; that the conference is muted.
; state for all non-admins within a conference.
; Subsequent non-admins joining a muted conference will
; start muted. All admin users are unaffected by this
; option. Note that all users, regardless of their admin
; status, are notified that the conference is muted when
; the state is toggled.
; participant_count ; This action plays back the number of participants currently
; in a conference