summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorMichael Kuron <m.kuron@gmx.de>2016-11-06 10:46:30 +0100
committerMichael Kuron <m.kuron@gmx.de>2016-11-06 10:48:32 +0100
commit59c23e1768a48825cd628b8c4b59f7eb46b8d364 (patch)
treea4addd7199c08a0dee37ff9c39181fbcdee2c5b2 /bridges
parentcb30963d222cb1e12af9bbf8dfed58001c9fcaf4 (diff)
automon: restore mixing of the both channels after recording stops
This is a regression over Asterisk 11, introduced by 2dc8a060064f359a17f5ebcd515d85fe5203c019. Previously, recordings started via the automon DTMF code would automatically be mixed together using sox because app_monitor would be called with the m option. This commit restores this behavior. Change-Id: Ibaf58684285c3f1b6ca3714524e6d638ae3b3759
Diffstat (limited to 'bridges')
-rw-r--r--bridges/bridge_builtin_features.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/bridges/bridge_builtin_features.c b/bridges/bridge_builtin_features.c
index d09a7a2ec..43cf2c971 100644
--- a/bridges/bridge_builtin_features.c
+++ b/bridges/bridge_builtin_features.c
@@ -202,6 +202,8 @@ static void start_automonitor(struct ast_bridge_channel *bridge_channel, struct
return;
}
+ ast_monitor_setjoinfiles(peer_chan, 1);
+
if (features_cfg && !ast_strlen_zero(features_cfg->courtesytone)) {
ast_bridge_channel_queue_playfile(bridge_channel, NULL, features_cfg->courtesytone, NULL);
ast_bridge_channel_write_playfile(bridge_channel, NULL, features_cfg->courtesytone, NULL);