[asterisk-commits] russell: trunk r51329 - in /trunk: ./ channels/chan_gtalk.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Fri Jan 19 13:09:04 2007
New Revision: 51329

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51329
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_gtalk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=51329&r1=51328&r2=51329
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Fri Jan 19 13:09:04 2007
@@ -1385,9 +1385,7 @@
 	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");