[svn-commits] russell: trunk r94791 - in /trunk: ./ main/autoservice.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Dec 26 11:07:12 2007
New Revision: 94791

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

........
r94790 | russell | 2007-12-26 11:06:26 -0600 (Wed, 26 Dec 2007) | 5 lines

Don't store DTMF BEGIN frames while a channel is in autoservice.  It's just
going to make ast_read() do a lot of extra work when the channel comes back
out of autoservice.
(closes issue #11628, patched by me)

........

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

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

Modified: trunk/main/autoservice.c
URL: http://svn.digium.com/view/asterisk/trunk/main/autoservice.c?view=diff&rev=94791&r1=94790&r2=94791
==============================================================================
--- trunk/main/autoservice.c (original)
+++ trunk/main/autoservice.c Wed Dec 26 11:07:12 2007
@@ -116,7 +116,6 @@
 			 * be queued up or not. */
 			switch (f->frametype) {
 			/* Save these frames */
-			case AST_FRAME_DTMF_BEGIN:
 			case AST_FRAME_DTMF_END:
 			case AST_FRAME_CONTROL:
 			case AST_FRAME_TEXT:
@@ -126,6 +125,7 @@
 				break;
 
 			/* Throw these frames away */
+			case AST_FRAME_DTMF_BEGIN:
 			case AST_FRAME_VOICE:
 			case AST_FRAME_VIDEO:
 			case AST_FRAME_NULL: