diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-12 18:31:07 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-12 18:31:07 +0000 |
| commit | a44b9dcf2cf65bb7baaff18b51d2305a8fea1529 (patch) | |
| tree | 814650d2cfc962b0754d3c2f2c096ff4325ec358 /apps | |
| parent | 4525971eef4dc190eb4c728ff74ae5ff2548c602 (diff) | |
Merged revisions 108084 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r108084 | file | 2008-03-12 15:29:33 -0300 (Wed, 12 Mar 2008) | 12 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@108085 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_mixmonitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 012af01c5..066103b3b 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -253,7 +253,7 @@ static void launch_monitor_thread(struct ast_channel *chan, const char *filename return; } - ast_set_flag(&mixmonitor->audiohook, AST_AUDIOHOOK_TRIGGER_WRITE); + ast_set_flag(&mixmonitor->audiohook, AST_AUDIOHOOK_TRIGGER_SYNC); if (readvol) mixmonitor->audiohook.options.read_volume = readvol; |