summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorKinsey Moore <kmoore@digium.com>2014-02-10 16:01:37 +0000
committerKinsey Moore <kmoore@digium.com>2014-02-10 16:01:37 +0000
commit75edef52e031c3909b16216946ba91c27deb10b6 (patch)
tree83df779bd602103674007190949dc6a5af08dbfa /configs
parent67f84590e5f2420d5aa3752b369fd2519278d58f (diff)
ConfBridge: Correct prompt playback target
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 ........ Merged revisions 407857 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 407858 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@407859 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs')
-rw-r--r--configs/confbridge.conf.sample5
1 files changed, 4 insertions, 1 deletions
diff --git a/configs/confbridge.conf.sample b/configs/confbridge.conf.sample
index 4f7c6e552..860f1cb87 100644
--- a/configs/confbridge.conf.sample
+++ b/configs/confbridge.conf.sample
@@ -232,7 +232,9 @@ type=bridge
; The sounds are stringed together like this.
; "sound_there_are" <number of participants> "sound_other_in_party"
;sound_place_into_conference ; The sound played when someone is placed into the conference
- ; after waiting for a marked user.
+ ; after waiting for a marked user. This sound is now deprecated
+ ; since it was only ever used improperly and correcting that bug
+ ; made it completely unused.
;sound_wait_for_leader ; The sound played when a user is placed into a conference that
; can not start until a marked user enters.
;sound_leader_has_left ; The sound played when the last marked user leaves the conference.
@@ -242,6 +244,7 @@ type=bridge
;sound_locked_now ; The sound played to an admin after toggling the conference to locked mode.
;sound_unlocked_now; The sound played to an admin after toggling the conference to unlocked mode.
;sound_error_menu ; The sound played when an invalid menu option is entered.
+;sound_begin ; The sound played to the conference when the first marked user enters the conference.
; --- ConfBridge Menu Options ---
; The ConfBridge application also has the ability to