aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-26 16:40:18 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-26 16:40:18 +0000
commitcd92d97714a3062e154519b480e3ac7372293a29 (patch)
tree780600058cd62b852b8e9ef23fbde11b7c53ec03 /channels
parent52898aff7b908609a2987aeb5384cb2d22b710a1 (diff)
Merged revisions 214195 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r214195 | dvossel | 2009-08-26 11:38:53 -0500 (Wed, 26 Aug 2009) | 25 lines Merged revisions 214194 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r214194 | dvossel | 2009-08-26 11:36:42 -0500 (Wed, 26 Aug 2009) | 19 lines ast_write() ignores ast_audiohook_write() results In ast_write(), if a channel has a list of audiohooks, those lists are written to and the resulting frame is what ast_write() should continue with. The problem was the returned audiohook frame was not being handled at all, and the original frame passed into it did not contain the mixed audio, so essentially audio was being lost. One result of this was chan_spy's whisper mode no longer worked. To complicate the issue, frames passed into ast_write may either be a single frame, or a list of frames. So, as the list of frames is processed in the audiohook_write, the returned frames had to be added to a new list. (closes issue #15660) Reported by: corruptor Tested by: dvossel ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@214197 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
0 files changed, 0 insertions, 0 deletions