From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 19 Jan 2007 19:08:25 +0000 (+0000)
Subject: Fix VLDTMF support in chan_gtalk.  AST_FRAME_DTMF and AST_FRAME_DTMF_END are
X-Git-Tag: 1.4.1~243
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e37d936daea344e2a28a0fa476b8195c66c5382;p=thirdparty%2Fasterisk.git

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/branches/1.4@51328 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 530af5b25e..44ef9364bc 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -1388,9 +1388,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");