introduce input_eof and ouput_eof

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 1d2d69c17de28ee40bbefebc6ca61e0355cdd2da..db4d478cff1d1411c0f0a636ad8567f6bba467d1 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -451,7 +451,6 @@ static void kill_stream_writer(int slot_num)
                s->wpid, audio_formats[s->format], slot_num);
        kill(s->wpid, SIGTERM);
        s->wkilled = 1;
-       s->fci->error = 1;
 }
 
 static void set_restart_barrier(int format, struct timeval *now)
@@ -928,16 +927,15 @@ static void close_decoder_if_idle(int slot_num)
                return;
        if (!s->fci)
                return;
-       if (!rn->eof && !s->fci->error && s->wpid > 0)
+       if (!rn->eof && !s->fc->eof && s->wpid > 0)
                return;
-       if (!s->fci->error && s->wpid > 0) { /* eof */
+       if (!s->fci->eof && s->wpid > 0) { /* eof */
                if (filter_io(s->fci) > 0)
                        return;
                if (get_loaded_bytes(slot_num))
                        return;
        }
        if (s->write_fd > 0) {
-               PARA_INFO_LOG("err: %d\n", s->fci->error);
                PARA_INFO_LOG("slot %d: closing write fd %d\n", slot_num,
                        s->write_fd);
                close(s->write_fd);