kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Play conf-placeintoconf message to the correct channel

Browse Source 
Correct the code in app_confbridge to play the conf-placeintoconf message to
the marked user entering the bridge instead of to the conference while the
marked user hears silence.

(closes issue ASTERISK-19641)
Reported-by: Mark A Walters
........

Merged revisions 364786 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 364787 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@364788 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2012-05-01 19:10:48 +00:00
parent cefff2e52c
commit a965f18695
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/app_confbridge.c
View File

@@ -745,12 +745,12 @@ static int post_join_marked(struct conference_bridge *conference_bridge, struct
/* Next play the audio file stating they are going to be placed into the conference */ /* Next play the audio file stating they are going to be placed into the conference */
if (!ast_test_flag(&conference_bridge_user->u_profile, USER_OPT_QUIET)) { if (!ast_test_flag(&conference_bridge_user->u_profile, USER_OPT_QUIET)) {
ao2_unlock(conference_bridge); if (play_prompt_to_channel(conference_bridge,
ast_autoservice_start(conference_bridge_user->chan); conference_bridge_user->chan,
play_sound_file(conference_bridge, conf_get_sound(CONF_SOUND_PLACE_IN_CONF, conference_bridge_user->b_profile.sounds))) {
conf_get_sound(CONF_SOUND_PLACE_IN_CONF, conference_bridge_user->b_profile.sounds)); /* user hungup while the sound was playing */
ast_autoservice_stop(conference_bridge_user->chan); return -1;
ao2_lock(conference_bridge); }
} }
/* Finally iterate through and unmute them all */ /* Finally iterate through and unmute them all */