diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-15 16:22:02 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-15 16:22:02 +0000 |
| commit | 1325cf60c3982119d7ce51630bf78746ab24a4b4 (patch) | |
| tree | 4f27a6050b9c684348fa3dd104aa164cd8af89cf /main/rtp.c | |
| parent | fd3e5d670f37bd82cbcc75d5dc2093169dc3ee24 (diff) | |
Bring both DTMF begin and end frames up through to the core for DTMF feature handling.
(closes issue #10826)
Reported by: dimas
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@85559 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
| -rw-r--r-- | main/rtp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/rtp.c b/main/rtp.c index 91d0965aa..624f1673d 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -2913,7 +2913,7 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct } fr = ast_read(who); other = (who == c0) ? c1 : c0; - if (!fr || ((fr->frametype == AST_FRAME_DTMF) && + if (!fr || ((fr->frametype == AST_FRAME_DTMF_BEGIN || fr->frametype == AST_FRAME_DTMF_END) && (((who == c0) && (flags & AST_BRIDGE_DTMF_CHANNEL_0)) || ((who == c1) && (flags & AST_BRIDGE_DTMF_CHANNEL_1))))) { /* Break out of bridge */ @@ -2965,7 +2965,7 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct } } else { if ((fr->frametype == AST_FRAME_DTMF_BEGIN) || - (fr->frametype == AST_FRAME_DTMF) || + (fr->frametype == AST_FRAME_DTMF_END) || (fr->frametype == AST_FRAME_VOICE) || (fr->frametype == AST_FRAME_VIDEO) || (fr->frametype == AST_FRAME_IMAGE) || @@ -3143,7 +3143,7 @@ static enum ast_bridge_result bridge_p2p_loop(struct ast_channel *c0, struct ast fr = ast_read(who); other = (who == c0) ? c1 : c0; /* Dependong on the frame we may need to break out of our bridge */ - if (!fr || ((fr->frametype == AST_FRAME_DTMF) && + if (!fr || ((fr->frametype == AST_FRAME_DTMF_BEGIN || fr->frametype == AST_FRAME_DTMF_END) && ((who == c0) && (flags & AST_BRIDGE_DTMF_CHANNEL_0)) | ((who == c1) && (flags & AST_BRIDGE_DTMF_CHANNEL_1)))) { /* Record received frame and who */ @@ -3185,7 +3185,7 @@ static enum ast_bridge_result bridge_p2p_loop(struct ast_channel *c0, struct ast } } else { if ((fr->frametype == AST_FRAME_DTMF_BEGIN) || - (fr->frametype == AST_FRAME_DTMF) || + (fr->frametype == AST_FRAME_DTMF_END) || (fr->frametype == AST_FRAME_VOICE) || (fr->frametype == AST_FRAME_VIDEO) || (fr->frametype == AST_FRAME_IMAGE) || |