dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 321211 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r321211 | alecdavis | 2011-05-27 20:31:15 +1200 (Fri, 27 May 2011) | 16 lines
  
  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.8.diff.txt alecdavis (license 585)
   Tested by: alecdavis
   
  Review: https://reviewboard.asterisk.org/r/1232/
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@321212 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
alecdavis 2011-05-27 08:37:59 +00:00
parent 570da4c7e7
commit e1c5ddc93e
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/features.c
View File

@ -5782,20 +5782,14 @@ int ast_pickup_call(struct ast_channel *chan)
ast_log(LOG_NOTICE, "pickup %s attempt by %s\n", target->name, chan->name);
res = ast_do_pickup(chan, target);
ast_channel_unlock(target);
if (!res) {
if (!ast_strlen_zero(pickupsound)) {
/*!
* \todo We are not the bridge thread when we inject this sound
* so we need to hold the target channel lock while the sound is
* played. A better way needs to be found as this pauses the
* system.
*/
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);
target = ast_channel_unref(target);
}