Minor meetme cleanups

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-09 19:43:23 +00:00
parent 3ef099dede
commit a53d260d5f

View File

@@ -763,12 +763,13 @@ zapretry:
if (c) { if (c) {
if (c->fds[0] != origfd) { if (c->fds[0] != origfd) {
if (retryzap) { if (using_pseudo) {
/* Kill old pseudo */ /* Kill old pseudo */
close(fd); close(fd);
} }
ast_log(LOG_DEBUG, "Ooh, something swapped out under us, starting over\n"); ast_log(LOG_DEBUG, "Ooh, something swapped out under us, starting over\n");
retryzap = 0; retryzap = 0;
using_pseudo = 0;
goto zapretry; goto zapretry;
} }
f = ast_read(c); f = ast_read(c);
@@ -876,7 +877,7 @@ zapretry:
if (musiconhold) { if (musiconhold) {
ast_moh_start(chan, NULL); ast_moh_start(chan, NULL);
} }
} else if (fd != chan->fds[0]) { } else if (using_pseudo) {
if (f->frametype == AST_FRAME_VOICE) { if (f->frametype == AST_FRAME_VOICE) {
if (f->subclass == AST_FORMAT_ULAW) { if (f->subclass == AST_FORMAT_ULAW) {
/* Carefully write */ /* Carefully write */