diff options
| author | alecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 19:47:21 +0000 |
|---|---|---|
| committer | alecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 19:47:21 +0000 |
| commit | bc8481a447acb5a2bb68de148638de20664d4c6a (patch) | |
| tree | 892f7c64b18e2b55c00848305e9867a41bb674e7 /apps | |
| parent | f750b5bf08473b56da0d08e5f873ac1e408bc9d2 (diff) | |
revert ability to exit echo app
caused a regression, as only supported VOICE, not VIDEO etc.
(issue #16880)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@249949 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_echo.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/apps/app_echo.c b/apps/app_echo.c index 46b393aae..76c701cd7 100644 --- a/apps/app_echo.c +++ b/apps/app_echo.c @@ -57,23 +57,16 @@ static int echo_exec(struct ast_channel *chan, void *data) 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); } |