diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-05-01 19:10:48 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-05-01 19:10:48 +0000 |
| commit | a965f18695137320d1b50df0f84fdb307e4da57d (patch) | |
| tree | b49a48bf5e48529bfa34fb5e387a7cf9f11491e9 /apps/app_confbridge.c | |
| parent | cefff2e52cee70e6c75e6fd3625348a96ead59d0 (diff) | |
Play conf-placeintoconf message to the correct channel
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
Diffstat (limited to 'apps/app_confbridge.c')
| -rw-r--r-- | apps/app_confbridge.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 866042cdd..2e7d8fcc7 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -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 */ if (!ast_test_flag(&conference_bridge_user->u_profile, USER_OPT_QUIET)) { - ao2_unlock(conference_bridge); - ast_autoservice_start(conference_bridge_user->chan); - play_sound_file(conference_bridge, - conf_get_sound(CONF_SOUND_PLACE_IN_CONF, conference_bridge_user->b_profile.sounds)); - ast_autoservice_stop(conference_bridge_user->chan); - ao2_lock(conference_bridge); + if (play_prompt_to_channel(conference_bridge, + conference_bridge_user->chan, + conf_get_sound(CONF_SOUND_PLACE_IN_CONF, conference_bridge_user->b_profile.sounds))) { + /* user hungup while the sound was playing */ + return -1; + } } /* Finally iterate through and unmute them all */ |