diff options
author | Russell Bryant <russell@russellbryant.com> | 2007-01-19 19:09:04 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2007-01-19 19:09:04 +0000 |
commit | 3275357f202e78dc5f3e159acb3072badc1bbe51 (patch) | |
tree | a30a8fd42f94a9c728cd521654612bb01e4923fb /channels/chan_gtalk.c | |
parent | e1c10955349ff54d4bea1cfe14546281a4cef2ad (diff) |
Merged revisions 51328 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51328 | russell | 2007-01-19 13:08:25 -0600 (Fri, 19 Jan 2007) | 5 lines
Fix VLDTMF support in chan_gtalk. AST_FRAME_DTMF and AST_FRAME_DTMF_END are
actually the same thing. So, a digit would have been interpreted incorrectly
here. Since the channel driver will always have the begin and end callbacks
called for a digit, only support the button-down and button-up messages.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_gtalk.c')
-rw-r--r-- | channels/chan_gtalk.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 3e6f4d4f0..430601a4c 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -1385,9 +1385,7 @@ static int gtalk_digit(struct ast_channel *ast, char digit, unsigned int duratio iks_insert_node(gtalk, dtmf); ast_mutex_lock(&p->lock); - if (ast->dtmff.frametype == AST_FRAME_DTMF) { - ast_log(LOG_DEBUG, "Sending 250ms dtmf!\n"); - } else if (ast->dtmff.frametype == AST_FRAME_DTMF_BEGIN) { + if (ast->dtmff.frametype == AST_FRAME_DTMF_BEGIN) { iks_insert_attrib(dtmf, "action", "button-down"); } else if (ast->dtmff.frametype == AST_FRAME_DTMF_END) { iks_insert_attrib(dtmf, "action", "button-up"); |