Merged revisions 108083 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 12 Mar 2008 18:29:33 +0000 (18:29 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 12 Mar 2008 18:29:33 +0000 (18:29 +0000)
commit5fc569f5f51bbd2d05c45888034880bb0e4b150b
treec5468cf7feecf9f2cc9fcb0d0932231569647e06
parentd4110872753759c624c83105cd0d34bc48251979
Merged revisions 108083 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r108083 | file | 2008-03-12 15:26:37 -0300 (Wed, 12 Mar 2008) | 4 lines

Add a trigger mode that triggers on both read and write. The actual function that returns the combined audio frame though will wait until both sides have fed in audio, or until one side stops (such as the case when you call Wait).
(closes issue #11945)
Reported by: xheliox

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@108084 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_mixmonitor.c
include/asterisk/audiohook.h
main/audiohook.c