X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec.c;h=b82f12ef8b994c605cb7f1699e0923d41738d365;hp=3dced8a0baf58baf6617498c481668944e5ad183;hb=e67fbcaf61d3d0f3ce62332f9615e5ed8e5a1c81;hpb=1f31b52b6816ce2716a3755a1896f77744fa167b

diff --git a/oggdec.c b/oggdec.c
index 3dced8a0..b82f12ef 100644
--- a/oggdec.c
+++ b/oggdec.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file oggdec.c paraslash's ogg vorbis decoder */
+/** \file oggdec.c Paraslash's ogg vorbis decoder. */
 
 #include "para.h"
 
@@ -46,7 +46,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->input_eof)
+		if (*fn->fc->input_error)
 			return 0;
 		errno = EAGAIN;
 		return (size_t)-1;
@@ -58,7 +58,8 @@ static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
 }
 
 /*
- * cb_seek -- custom data seeking function
+ * Custom data seeking function.
+ *
  * Since we want the data source to be treated as unseekable at all
  * times, the provided seek callback always returns -1 (failure).
  */
@@ -78,8 +79,8 @@ static const ov_callbacks ovc = {
 	.seek_func = cb_seek,
 	.close_func = cb_close,
 	/*
-	 * The tell function need not be provided if
-	 * the data IO abstraction is not seekable
+	 * The tell function need not be provided if the data IO abstraction is
+	 * not seekable
 	 */
 	.tell_func = NULL
 };
@@ -123,7 +124,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->input_eof) {
+		if (len <ib && !*fn->fc->input_error) {
 			PARA_DEBUG_LOG("initial input buffer %zd/%d, "
 				"waiting for more data\n", len, ib);
 			return 0;
@@ -149,7 +150,7 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
 		PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fc->channels,
 			fn->fc->samplerate);
 	}
-	while (!*fn->fc->input_eof && fn->loaded < fn->bufsize) {
+	while (!*fn->fc->input_error && fn->loaded < fn->bufsize) {
 		int length = fn->bufsize - fn->loaded;
 		long read_ret = ov_read(pod->vf, fn->buf + fn->loaded, length,
 			ENDIAN, 2 /* 16 bit */, 1 /* signed */, NULL);