[asterisk-commits] alecdavis: branch 1.6.2 r321210 - /branches/1.6.2/main/features.c

[SVN commits to the Asterisk project]

Author: alecdavis
Date: Fri May 27 03:24:32 2011
New Revision: 321210

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321210
Log:
Fix *8 directed pickup locks system during pickupsound play out

move playout from sip_pickup_thread to bridge using BRIDGE_PLAY_SOUND method,
This stop the clash of 2 threads trying to write audio to same channel.
In addition fixes choppy audio beep in issue 19177.
 
 (issue #18654)
 (issue #19177)
 Reported by: Docent
 Patches: 
      review1232-1.6.2.diff.txt uploaded by alecdavis (license 585)
 Tested by: alecdavis
 
Review: https://reviewboard.asterisk.org/r/1232/


Modified:
    branches/1.6.2/main/features.c

Modified: branches/1.6.2/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/features.c?view=diff&rev=321210&r1=321209&r2=321210
==============================================================================
--- branches/1.6.2/main/features.c (original)
+++ branches/1.6.2/main/features.c Fri May 27 03:24:32 2011
@@ -5074,14 +5074,15 @@
 	ast_debug(1, "pickup attempt by %s\n", chan->name);
 
 	if (target) {
-		if (!(res = ast_do_pickup(chan, target))) {
+		res = ast_do_pickup(chan, target);
+		ast_channel_unlock(target);
+		if (!res) {
 			if (!ast_strlen_zero(pickupsound)) {
-				ast_stream_and_wait(target, pickupsound, "");
+				pbx_builtin_setvar_helper(target, "BRIDGE_PLAY_SOUND", pickupsound);
 			}
 		} else {
 			ast_log(LOG_WARNING, "pickup %s failed by %s\n", target->name, chan->name);
 		}
-		ast_channel_unlock(target);
 	}
 
 	if (res < 0) {