[svn-commits] alecdavis: branch 1.4 r249946 - /branches/1.4/apps/app_echo.c

[SVN commits to the Digium repositories]

Author: alecdavis
Date: Tue Mar  2 13:36:20 2010
New Revision: 249946

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

caused a regression, as only supported VOICE, not VIDEO etc.
Left in small formatting change.

(issue #16880)


Modified:
    branches/1.4/apps/app_echo.c

Modified: branches/1.4/apps/app_echo.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/apps/app_echo.c?view=diff&rev=249946&r1=249945&r2=249946
==============================================================================
--- branches/1.4/apps/app_echo.c (original)
+++ branches/1.4/apps/app_echo.c Tue Mar  2 13:36:20 2010
@@ -68,23 +68,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);
 	}