diff options
| author | Matthew Jordan <mjordan@digium.com> | 2011-11-17 18:09:13 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2011-11-17 18:09:13 +0000 |
| commit | 279873e8eb2a9cb97878b72f221b22c10cdcc63c (patch) | |
| tree | 70037a5d19ecc8068b8f95e9c6de87e166130650 /apps/confbridge/include | |
| parent | 4a125f45a0e6bb2a6c71265521834ef3dd1972cd (diff) | |
Add admin toggle mute all and participant count menu options to app_confbridge
This patch adds two new menu features to app_confbridge, admin_toggle_menu_
participants and participant_count. The admin action will globally mute /
unmute all non-admin participants on a converence, while the participant
count simply exposes the existing participant count function to the
conference bridge menu.
This also adds configuration options to change the sound played when the
conference is globally muted / unmuted, as well as the necessary config
hooks to place these functions in the DTMF menus.
(closes issue ASTERISK-18204)
Reported by: Kevin Reeves
Tested by: Matt Jordan
Patches:
app_confbridge.c.patch.txt, conf_config_parser.c.patch.txt,
confbridge.h.patch.txt uploaded by Kevin Reeves (license 6281)
Review: https://reviewboard.asterisk.org/r/1518/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@345560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/confbridge/include')
| -rw-r--r-- | apps/confbridge/include/confbridge.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/confbridge/include/confbridge.h b/apps/confbridge/include/confbridge.h index ab4a8c4b0..5337e22aa 100644 --- a/apps/confbridge/include/confbridge.h +++ b/apps/confbridge/include/confbridge.h @@ -83,6 +83,8 @@ enum conf_menu_action_id { MENU_ACTION_NOOP, MENU_ACTION_SET_SINGLE_VIDEO_SRC, MENU_ACTION_RELEASE_SINGLE_VIDEO_SRC, + MENU_ACTION_PARTICIPANT_COUNT, + MENU_ACTION_ADMIN_TOGGLE_MUTE_PARTICIPANTS, }; /*! The conference menu action contains both @@ -156,6 +158,8 @@ enum conf_sounds { CONF_SOUND_ERROR_MENU, CONF_SOUND_JOIN, CONF_SOUND_LEAVE, + CONF_SOUND_PARTICIPANTS_MUTED, + CONF_SOUND_PARTICIPANTS_UNMUTED, }; struct bridge_profile_sounds { @@ -180,6 +184,8 @@ struct bridge_profile_sounds { AST_STRING_FIELD(errormenu); AST_STRING_FIELD(leave); AST_STRING_FIELD(join); + AST_STRING_FIELD(participantsmuted); + AST_STRING_FIELD(participantsunmuted); ); }; @@ -202,6 +208,7 @@ struct conference_bridge { unsigned int users; /*!< Number of users present */ unsigned int markedusers; /*!< Number of marked users present */ unsigned int locked:1; /*!< Is this conference bridge locked? */ + unsigned int muted:1; /*!< Is this conference bridge muted? */ struct ast_channel *playback_chan; /*!< Channel used for playback into the conference bridge */ struct ast_channel *record_chan; /*!< Channel used for recording the conference */ pthread_t record_thread; /*!< The thread the recording chan lives in */ |