kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bring both DTMF begin and end frames up through to the core for DTMF feature handling.

Browse Source 
(closes issue #10826)
Reported by: dimas


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@85559 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-10-15 16:22:02 +00:00
parent ca69081253
commit 0f3e461074
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/rtp.c
View File

@@ -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) ||