X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec.c;h=e1c4517ec94e3cda5e5ba92d86485ec47666aef6;hp=637fa965b3d49d3dd35966791f2b882903b570ac;hb=633f7c0f0194cd8ec3a478d820f55dd6a752d915;hpb=607ac63646d7c31aa1792dcf1d9a60e498654376

diff --git a/oggdec.c b/oggdec.c
index 637fa965..e1c4517e 100644
--- a/oggdec.c
+++ b/oggdec.c
@@ -22,6 +22,7 @@
 
 #include "oggdec_filter.cmdline.h"
 #include "list.h"
+#include "sched.h"
 #include "filter.h"
 #include "error.h"
 #include "string.h"
@@ -53,11 +54,11 @@ static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
 	size_t ret, have = pod->inbuf_len - pod->converted;
 	char *p = pod->inbuf + pod->converted;
 
-	if (*fn->fc->eof)
-		return 0;
 //	PARA_DEBUG_LOG("pod = %p\n", pod);
 //	PARA_DEBUG_LOG("vorbis requests %d bytes, have %d\n", size * nmemb, have);
 	if (pod->inbuf_len < size) {
+		if (*fn->fc->input_eof)
+			return 0;
 		errno = EAGAIN;
 		return -1;
 	}
@@ -133,7 +134,7 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
 
 	if (!pod->vf) {
 		int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
-		if (len <ib && !*fn->fc->eof && !fn->fc->error) {
+		if (len <ib && !*fn->fc->input_eof) {
 			PARA_INFO_LOG("initial input buffer %zd/%d, waiting for more data\n",
 				len, ib);
 			return 0;
@@ -167,7 +168,7 @@ again:
 	if (ret < 0)
 		return -E_OGGDEC_BADLINK;
 	fn->loaded += ret;
-	if (!*fn->fc->eof && !fn->fc->error && fn->loaded < fn->bufsize)
+	if (!*fn->fc->input_eof && fn->loaded < fn->bufsize)
 		goto again;
 	return pod->converted;
 }