[asterisk-commits] kmoore: trunk r364788 - in /trunk: ./ apps/app_confbridge.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue May  1 14:10:48 2012
New Revision: 364788

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=364788
Log:
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

Modified:
    trunk/   (props changed)
    trunk/apps/app_confbridge.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_confbridge.c?view=diff&rev=364788&r1=364787&r2=364788
==============================================================================
--- trunk/apps/app_confbridge.c (original)
+++ trunk/apps/app_confbridge.c Tue May  1 14:10:48 2012
@@ -745,12 +745,12 @@
 
 		/* 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 */