kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

ConfBridge: Correct prompt playback target

Browse Source 
Currently, when the first marked user enters the conference that
contains waitmarked users, a prompt is played indicating that the user
is being placed into the conference. Unfortunately, this prompt is
played to the marked user and not the waitmarked users which is not
very helpful.

This patch changes that behavior to play a prompt stating
"The conference will now begin" to the entire conference after adding
and unmuting the waitmarked users since the design of confbridge is not
conducive to playing a prompt to a subset of users in a conference in
an asynchronous manner.

(closes issue PQ-1396)
Review: https://reviewboard.asterisk.org/r/3155/
Reported by: Steve Pitts


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@407857 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2014-02-10 15:28:16 +00:00
parent 311f2eeada
commit 2254a05348
7 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/confbridge/include/confbridge.h
View File

@@ -160,6 +160,7 @@ enum conf_sounds {
CONF_SOUND_LEAVE,
CONF_SOUND_PARTICIPANTS_MUTED,
CONF_SOUND_PARTICIPANTS_UNMUTED,
CONF_SOUND_BEGIN,
};
struct bridge_profile_sounds {
@@ -186,6 +187,7 @@ struct bridge_profile_sounds {
AST_STRING_FIELD(join);
AST_STRING_FIELD(participantsmuted);
AST_STRING_FIELD(participantsunmuted);
AST_STRING_FIELD(begin);
);
};
@@ -396,13 +398,6 @@ void conf_moh_start(struct conference_bridge_user *user);
*/
void conf_mute_only_active(struct conference_bridge *conference_bridge);
/*! \brief Callback to execute any time we transition from zero to one marked users
* \param cbu The first marked user joining the conference
* \retval 0 success
* \retval -1 failure
*/
int conf_handle_first_marked_common(struct conference_bridge_user *cbu);
/*! \brief Callback to execute any time we transition from zero to one active users
* \param conference_bridge The conference bridge with a single active user joined
* \retval 0 success