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
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@364786 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index 657dcf9f1e82797b4de454a4cdfed6e2e49fb89a..18cfb746c71c3cbef8b2a14d1f8cc3331d73722e 100644 (file)
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -280,11 +280,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->flags, OPTION_QUIET)) {
-                       ao2_unlock(conference_bridge);
-                       ast_autoservice_start(conference_bridge_user->chan);
-                       play_sound_file(conference_bridge, "conf-placeintoconf");
-                       ast_autoservice_stop(conference_bridge_user->chan);
-                       ao2_lock(conference_bridge);
+                       if (play_prompt_to_channel(conference_bridge,
+                               conference_bridge_user->chan,
+                               "conf-placeintoconf")) {
+                               /* user hungup while the sound was playing */
+                               return -1;
+                       }
                }
 
                /* Finally iterate through and unmute them all */