diff options
| author | alecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 19:36:20 +0000 |
|---|---|---|
| committer | alecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 19:36:20 +0000 |
| commit | 271c17c2e0c14d1d8d215a9358cfde00c73fb1ab (patch) | |
| tree | c2cddcfb06c8bd88ed0807bf3f752b6af4489ce1 | |
| parent | 722a7fa23906711ad60d38f722f34714d79e0d0f (diff) | |
revert ability to exit echo app
caused a regression, as only supported VOICE, not VIDEO etc.
Left in small formatting change.
(issue #16880)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@249946 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 d75d34dc1..b759a510b 100644 --- a/apps/app_echo.c +++ b/apps/app_echo.c @@ -68,23 +68,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); } |