X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=db4d478cff1d1411c0f0a636ad8567f6bba467d1;hp=08b29e00db6fcb70e0dfe7437a517c9132ab35e8;hb=b0cad48a864fe3f621138e717ff025060c396fad;hpb=2290d9be0703d3f83f38c2f100b1b41ec0790bb3

diff --git a/audiod.c b/audiod.c
index 08b29e00..db4d478c 100644
--- a/audiod.c
+++ b/audiod.c
@@ -24,6 +24,7 @@
 #include "audiod.cmdline.h"
 #include "list.h"
 #include "close_on_fork.h"
+#include "sched.h"
 #include "recv.h"
 #include "filter.h"
 #include "grab_client.cmdline.h"
@@ -450,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)
@@ -927,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);