diff options
author | Joshua Colp <jcolp@digium.com> | 2016-08-23 05:54:02 -0500 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2016-08-23 05:54:02 -0500 |
commit | 065d810d3ff91208e2e7784eb658d3e96b9a1931 (patch) | |
tree | 5a0d2154d6c0e09547a886f78c8d4820d8dbb260 /apps/confbridge/include | |
parent | 5aa877305223faab5a1119276a934893ab9dc138 (diff) |
Revert "ConfBridge: Rework announcer channel methodology"
This reverts commit 5aa877305223faab5a1119276a934893ab9dc138.
Change-Id: I9ab45776e54a54ecf1bac9ae62d976dec30ef491
Diffstat (limited to 'apps/confbridge/include')
-rw-r--r-- | apps/confbridge/include/confbridge.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/apps/confbridge/include/confbridge.h b/apps/confbridge/include/confbridge.h index 5d71a63bc..5ae042113 100644 --- a/apps/confbridge/include/confbridge.h +++ b/apps/confbridge/include/confbridge.h @@ -228,9 +228,9 @@ struct confbridge_conference { struct ast_channel *record_chan; /*!< Channel used for recording the conference */ struct ast_str *record_filename; /*!< Recording filename. */ struct ast_str *orig_rec_file; /*!< Previous b_profile.rec_file. */ + ast_mutex_t playback_lock; /*!< Lock used for playback channel */ AST_LIST_HEAD_NOLOCK(, confbridge_user) active_list; /*!< List of users participating in the conference bridge */ AST_LIST_HEAD_NOLOCK(, confbridge_user) waiting_list; /*!< List of users waiting to join the conference bridge */ - struct ast_taskprocessor *playback_queue; /*!< Queue for playing back bridge announcements and managing the announcer channel */ }; extern struct ao2_container *conference_bridges; @@ -610,6 +610,16 @@ struct ast_channel_tech *conf_record_get_tech(void); struct ast_channel_tech *conf_announce_get_tech(void); /*! + * \brief Remove the announcer channel from the conference. + * \since 12.0.0 + * + * \param chan Either channel in the announcer channel pair. + * + * \return Nothing + */ +void conf_announce_channel_depart(struct ast_channel *chan); + +/*! * \brief Push the announcer channel into the conference. * \since 12.0.0 * |