X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=a9b07a3c676515f610dc678ad06aa5cfcbb06435;hp=d5c4726269b4d30c889f16340cb5f2ca5e86c640;hb=cd4b294da6f6802d9918c8fe5bcecb8a2a2363c3;hpb=ae0e4594c6a0312c5b4b4c0bde86f9c12253d11b

diff --git a/ogg_afh.c b/ogg_afh.c
index d5c47262..a9b07a3c 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2004-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 /** \file ogg_afh.c para_server's ogg vorbis audio format handler */
 
@@ -30,9 +18,13 @@
 #define CHUNK_SIZE 32768
 static double chunk_time = 0.25;
 
+/** describes a memory-mapped ogg vorbis file */
 struct ogg_datasource {
+	/** the memory mapping */
 	char *map;
+	/** this size of the mapping */
 	off_t numbytes;
+	/** the current position in the mapping */
 	off_t fpos;
 };
 
@@ -102,17 +94,16 @@ static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks
 		0, /* no initial bytes */
 		c); /* the ov_open_callbacks */
 
-	/* FIXME: provide better error codes */
 	if (ret == OV_EREAD)
 		return -E_OGG_READ;
 	if (ret == OV_ENOTVORBIS)
-		return -E_OGG_READ;
+		return -E_VORBIS;
 	if (ret == OV_EVERSION)
-		return -E_OGG_READ;
+		return -E_OGG_VERSION;
 	if (ret == OV_EBADHEADER)
-		return -E_OGG_READ;
+		return -E_OGG_BAD_HEADER;
 	if (ret < 0)
-		return -E_OGG_READ;
+		return -E_OGG_UNKNOWN_ERROR;
 	return 1;
 
 }
@@ -147,7 +138,7 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
 	ogg_stream_init(stream_out, serial);
 	ret = ogg_stream_pagein(stream_in, &page);
 	if (ret < 0) {
-		ret = E_STREAM_PAGEIN;
+		ret = -E_STREAM_PAGEIN;
 		goto err2;
 	}
 	ret = ogg_stream_packetout(stream_in, &packet);