[svn-commits] file: trunk r72889 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Jul  2 09:39:49 2007
New Revision: 72889

URL: http://svn.digium.com/view/asterisk?view=rev&rev=72889
Log:
Merged revisions 72888 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r72888 | file | 2007-07-02 11:32:59 -0300 (Mon, 02 Jul 2007) | 2 lines

Added additional DTMF debug messages for when emulation occurs.

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

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

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=72889&r1=72888&r2=72889
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Jul  2 09:39:49 2007
@@ -2129,9 +2129,11 @@
 		/* Drop first digit from the buffer */
 		memmove(chan->dtmfq, chan->dtmfq + 1, sizeof(chan->dtmfq) - 1);
 		f = &chan->dtmff;
-		if (ast_test_flag(chan, AST_FLAG_END_DTMF_ONLY))
+		if (ast_test_flag(chan, AST_FLAG_END_DTMF_ONLY)) {
+			ast_log(LOG_DTMF, "DTMF end emulation of '%c' queued on %s\n", f->subclass, chan->name);
 			chan->dtmff.frametype = AST_FRAME_DTMF_END;
-		else {
+		} else {
+			ast_log(LOG_DTMF, "DTMF begin emulation of '%c' with duration %d queued on %s\n", f->subclass, AST_DEFAULT_EMULATE_DTMF_DURATION, chan->name);
 			chan->dtmff.frametype = AST_FRAME_DTMF_BEGIN;
 			ast_set_flag(chan, AST_FLAG_EMULATE_DTMF);
 			chan->emulate_dtmf_digit = f->subclass;
@@ -2295,6 +2297,7 @@
 							chan->emulate_dtmf_duration = AST_MIN_DTMF_DURATION;
 					} else
 						chan->emulate_dtmf_duration = AST_DEFAULT_EMULATE_DTMF_DURATION;
+					ast_log(LOG_DTMF, "DTMF begin emulation of '%c' with duration %d queued on %s\n", f->subclass, chan->emulate_dtmf_duration, chan->name);
 				}
 			} else {
 				struct timeval now = ast_tvnow();
@@ -2336,6 +2339,7 @@
 					chan->dtmf_tv = now;
 					ast_clear_flag(chan, AST_FLAG_EMULATE_DTMF);
 					chan->emulate_dtmf_digit = 0;
+					ast_log(LOG_DTMF, "DTMF end emulation of '%c' queued on %s\n", f->subclass, chan->name);
 				}
 			}
 			break;
@@ -2366,6 +2370,7 @@
 					f->subclass = chan->emulate_dtmf_digit;
 					f->len = ast_tvdiff_ms(now, chan->dtmf_tv);
 					chan->dtmf_tv = now;
+					ast_log(LOG_DTMF, "DTMF end emulation of '%c' queued on %s\n", f->subclass, chan->name);
 				} else {
 					/* Drop voice frames while we're still in the middle of the digit */
 					ast_frfree(f);