X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec.c;h=929e2eccf7df08435b2d59f17561a6012f7822ee;hp=481e42ace61510d13efffbe9f7ce3531b7be9a19;hb=6e1de6469d0595740fd8350f435b0562d23d87fa;hpb=40cbbb95e256e63e1e6958e9034311d4904604af

diff --git a/oggdec.c b/oggdec.c
index 481e42ac..929e2ecc 100644
--- a/oggdec.c
+++ b/oggdec.c
@@ -57,7 +57,7 @@ static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
 //	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->reader_eof)
+		if (*fn->fc->input_eof)
 			return 0;
 		errno = EAGAIN;
 		return -1;
@@ -134,9 +134,9 @@ 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->reader_eof) {
-			PARA_INFO_LOG("initial input buffer %zd/%d, waiting for more data\n",
-				len, ib);
+		if (len <ib && !*fn->fc->input_eof) {
+			PARA_DEBUG_LOG("initial input buffer %zd/%d, "
+				"waiting for more data\n", len, ib);
 			return 0;
 		}
 		pod->vf = para_malloc(sizeof(struct OggVorbis_File));
@@ -168,7 +168,7 @@ again:
 	if (ret < 0)
 		return -E_OGGDEC_BADLINK;
 	fn->loaded += ret;
-	if (!*fn->fc->reader_eof && fn->loaded < fn->bufsize)
+	if (!*fn->fc->input_eof && fn->loaded < fn->bufsize)
 		goto again;
 	return pod->converted;
 }