[asterisk-commits] alecdavis: branch 1.6.1 r249949 - in /branches/1.6.1: ./ apps/ main/editline/

[SVN commits to the Asterisk project]

Author: alecdavis
Date: Tue Mar  2 13:47:21 2010
New Revision: 249949

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=249949
Log:
revert ability to exit echo app

caused a regression, as only supported VOICE, not VIDEO etc.

(issue #16880)


Modified:
    branches/1.6.1/UPGRADE.txt   (props changed)
    branches/1.6.1/apps/app_echo.c
    branches/1.6.1/main/editline/makelist.in   (props changed)

Propchange: branches/1.6.1/UPGRADE.txt
            ('svn:mergeinfo' removed)

Modified: branches/1.6.1/apps/app_echo.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_echo.c?view=diff&rev=249949&r1=249948&r2=249949
==============================================================================
--- branches/1.6.1/apps/app_echo.c (original)
+++ branches/1.6.1/apps/app_echo.c Tue Mar  2 13:47:21 2010
@@ -57,23 +57,16 @@
 		if (!f) {
 			break;
 		}
-		switch (f->frametype) {
-		case AST_FRAME_VOICE:
-		case AST_FRAME_DTMF:
-			f->delivery.tv_sec = 0;
-			f->delivery.tv_usec = 0;
-			if (ast_write(chan, f)) {
-				ast_frfree(f);
-				goto end;
-			}
-			if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#')) {
-				res = 0;
-				ast_frfree(f);
-				goto end;
-			}
-			break;
-		default:
-			break;
+		f->delivery.tv_sec = 0;
+		f->delivery.tv_usec = 0;
+		if (ast_write(chan, f)) {
+			ast_frfree(f);
+			goto end;
+		}
+		if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#')) {
+			res = 0;
+			ast_frfree(f);
+			goto end;
 		}
 		ast_frfree(f);
 	}

Propchange: branches/1.6.1/main/editline/makelist.in
            ('svn:mergeinfo' removed)