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/include | |
| 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/include')
| -rw-r--r-- | apps/confbridge/include/confbridge.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/apps/confbridge/include/confbridge.h b/apps/confbridge/include/confbridge.h index 492cf8557..1efefea0b 100644 --- a/apps/confbridge/include/confbridge.h +++ b/apps/confbridge/include/confbridge.h @@ -242,6 +242,7 @@ struct confbridge_user { struct ast_bridge_features features; /*!< Bridge features structure */ struct ast_bridge_tech_optimizations tech_args; /*!< Bridge technology optimizations for talk detection */ unsigned int suspended_moh; /*!< Count of active suspended MOH actions. */ + unsigned int muted:1; /*!< Has the user requested to be muted? */ unsigned int kicked:1; /*!< User has been kicked from the conference */ unsigned int playing_moh:1; /*!< MOH is currently being played to the user */ AST_LIST_HEAD_NOLOCK(, post_join_action) post_join_list; /*!< List of sounds to play after joining */; @@ -385,6 +386,15 @@ int play_sound_file(struct confbridge_conference *conference, const char *filena void conf_ended(struct confbridge_conference *conference); /*! + * \brief Update the actual mute status of the user and set it on the bridge. + * + * \param user User to update the mute status. + * + * \return Nothing + */ +void conf_update_user_mute(struct confbridge_user *user); + +/*! * \brief Stop MOH for the conference user. * * \param user Conference user to stop MOH on. |