You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Vossel 112fb69d3b 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@214196 65c4cc65-6c06-0410-ace0-fbb531ad65f3		17 years ago
..
db1-ast	Merged revisions 209887 via svnmerge from	17 years ago
editline	Merged revisions 179395 via svnmerge from	17 years ago
stdtime	Merged revisions 189539 via svnmerge from	17 years ago
Makefile	Merged revisions 209760-209761 via svnmerge from	17 years ago
abstract_jb.c	Spacing changes only	17 years ago
acl.c	AST-2009-005	17 years ago
adsistub.c	…
aescrypt.c	Spacing changes only	17 years ago
aeskey.c	…
aesopt.h	…
aestab.c	…
alaw.c	Merged revisions 213179 via svnmerge from	17 years ago
app.c	Merged revisions 210908 via svnmerge from	17 years ago
ast_expr2.c	Merged revisions 203444 via svnmerge from	17 years ago
ast_expr2.fl	Merged revisions 203444 via svnmerge from	17 years ago
ast_expr2.h	Merged revisions 179807 via svnmerge from	17 years ago
ast_expr2.y	Merged revisions 179807 via svnmerge from	17 years ago
ast_expr2f.c	Merged revisions 201678 via svnmerge from	17 years ago
asterisk.c	AST-2009-005	17 years ago
astfd.c	Merged revisions 211275 via svnmerge from	17 years ago
astmm.c	Janitor, use ARRAY_LEN() when possible.	17 years ago
astobj2.c	Merged revisions 192357 via svnmerge from	17 years ago
audiohook.c	Merged revisions 197543 via svnmerge from	17 years ago
autoservice.c	Merged revisions 201056 via svnmerge from	17 years ago
bridging.c	Merged revisions 193502 via svnmerge from	17 years ago
buildinfo.c	…
callerid.c	Merged revisions 206868 via svnmerge from	17 years ago
cdr.c	AST-2009-005	17 years ago
channel.c	Merged revisions 214195 via svnmerge from	17 years ago
chanvars.c	…
cli.c	AST-2009-005	17 years ago
config.c	AST-2009-005	17 years ago
cryptostub.c	…
cygload.c	…
datastore.c	Merged revisions 192318 via svnmerge from	17 years ago
db.c	Merged revisions 182450 via svnmerge from	17 years ago
devicestate.c	Merged revisions 205412 via svnmerge from	17 years ago
dial.c	…
dns.c	incorporates r159808 from branches/1.4:	17 years ago
dnsmgr.c	AST-2009-005	17 years ago
dsp.c	AST-2009-005	17 years ago
ecdisa.h	…
enum.c	AST-2009-005	17 years ago
event.c	Merged revisions 209835 via svnmerge from	17 years ago
features.c	Merged revisions 213327 via svnmerge from	17 years ago
file.c	Merged revisions 203802 via svnmerge from	17 years ago
fixedjitterbuf.c	…
fixedjitterbuf.h	…
frame.c	AST-2009-005	17 years ago
fskmodem.c	…
fskmodem_float.c	…
fskmodem_int.c	…
global_datastores.c	Merged revisions 172517 via svnmerge from	17 years ago
hashtab.c	Add MALLOC_DEBUG to various utility APIs, so that memory leaks can be tracked back to their source.	17 years ago
heap.c	Merged revisions 184512 via svnmerge from	17 years ago
http.c	AST-2009-005	17 years ago
image.c	…
indications.c	AST-2009-005	17 years ago
io.c	Merged revisions 182847 via svnmerge from	17 years ago
jitterbuf.c	Merged revisions 174583 via svnmerge from	17 years ago
loader.c	Merged revisions 213450 via svnmerge from	17 years ago
logger.c	Merged revisions 212574 via svnmerge from	17 years ago
manager.c	Merged revisions 212764 via svnmerge from	17 years ago
md5.c	…
netsock.c	AST-2009-005	17 years ago
pbx.c	Merged revisions 213971 via svnmerge from	17 years ago
plc.c	…
poll.c	Merged revisions 182847 via svnmerge from	17 years ago
privacy.c	…
rtp.c	Merged revisions 210190 via svnmerge from	17 years ago
say.c	Merged revisions 214071 via svnmerge from	17 years ago
sched.c	Fix a regression in scheduler entry ordering, and add a regression test for it.	17 years ago
sha1.c	…
slinfactory.c	Merged revisions 201056 via svnmerge from	17 years ago
srv.c	bump the verbosity of a message in srv.c up by one. It used to be	17 years ago
ssl.c	Merged revisions 205532 via svnmerge from	17 years ago
strcompat.c	…
strings.c	Merged revisions 186021 via svnmerge from	17 years ago
taskprocessor.c	Merged revisions 185912 via svnmerge from	17 years ago
tcptls.c	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	17 years ago
tdd.c	Merged revisions 185912 via svnmerge from	17 years ago
term.c	…
threadstorage.c	Merged revisions 164736 via svnmerge from	17 years ago
timing.c	AST-2009-005	17 years ago
translate.c	Merged revisions 208924 via svnmerge from	17 years ago
udptl.c	Merged revisions 210992 via svnmerge from	17 years ago
ulaw.c	Merged revisions 213179 via svnmerge from	17 years ago
utils.c	AST-2009-005	17 years ago
xml.c	Merged revisions 197374 via svnmerge from	17 years ago
xmldoc.c	Merged revisions 196948 via svnmerge from	17 years ago