diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-11 18:00:07 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-11 18:00:07 +0000 |
| commit | beb7fb45860a616a4d18f79e6d621035bf90fe8a (patch) | |
| tree | 6d7a6aae32054cfc1c1ec3164dcff62940542891 /channels | |
| parent | e09381994aa541469275619e28ed46d55df296b9 (diff) | |
Fix DTMF issue with 3-way native zap
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7076 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_zap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index ca3936a94..79ae6c921 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3146,10 +3146,10 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann return AST_BRIDGE_FAILED; } - if (!(flags & AST_BRIDGE_DTMF_CHANNEL_0)) + if (!(flags & AST_BRIDGE_DTMF_CHANNEL_0) && (oi0 == SUB_REAL)) disable_dtmf_detect(op0); - if (!(flags & AST_BRIDGE_DTMF_CHANNEL_1)) + if (!(flags & AST_BRIDGE_DTMF_CHANNEL_1) && (oi1 == SUB_REAL)) disable_dtmf_detect(op1); for (;;) { @@ -3237,10 +3237,10 @@ return_from_bridge: if (op1 == p1) zt_enable_ec(p1); - if (!(flags & AST_BRIDGE_DTMF_CHANNEL_0)) + if (!(flags & AST_BRIDGE_DTMF_CHANNEL_0) && (oi0 == SUB_REAL)) enable_dtmf_detect(op0); - if (!(flags & AST_BRIDGE_DTMF_CHANNEL_1)) + if (!(flags & AST_BRIDGE_DTMF_CHANNEL_1) && (oi1 == SUB_REAL)) enable_dtmf_detect(op1); zt_unlink(slave, master, 1); |