X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=a9b07a3c676515f610dc678ad06aa5cfcbb06435;hp=5adcc25218377e57c8b038e30e325268aeb6e86f;hb=843950e7a85730b796bb6238b6e91111f7209c25;hpb=fd7ddaebab6613627a070e8867ace2f2eb3d4cc3

diff --git a/ogg_afh.c b/ogg_afh.c
index 5adcc252..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,27 +94,28 @@ 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;
 
 }
 
-static int ogg_compute_header_len(char *map, off_t numbytes,
+static int ogg_compute_header_len(char *map, size_t numbytes,
 		struct audio_format_info *afi)
 {
-	int ret, len = PARA_MIN(numbytes, CHUNK_SIZE);
-	unsigned int serial;
+	int ret;
+	size_t len = PARA_MIN(numbytes, CHUNK_SIZE);
+	int serial;
 	char *buf;
+
 	ogg_page page;
 	ogg_packet packet;
 	vorbis_comment vc;
@@ -134,9 +127,9 @@ static int ogg_compute_header_len(char *map, off_t numbytes,
 	ogg_sync_init(sync_in);
 	vorbis_info_init(&vi);
 	vorbis_comment_init(&vc);
-	buf = ogg_sync_buffer(sync_in, len);
+	buf = ogg_sync_buffer(sync_in, (long)len);
 	memcpy(buf, map, len);
-	ogg_sync_wrote(sync_in, len);
+	ogg_sync_wrote(sync_in, (long)len);
 	ret = -E_SYNC_PAGEOUT;
 	if (ogg_sync_pageout(sync_in, &page) <= 0)
 		goto err1;
@@ -145,7 +138,7 @@ static int ogg_compute_header_len(char *map, off_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);
@@ -199,7 +192,7 @@ err1:
  * CHUNK_TIME begins. Always successful.
  */
 static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
-	struct audio_format_info *afi, double time_total)
+	struct audio_format_info *afi, long unsigned time_total)
 {
 	int i, ret, num;
 	ssize_t max_chunk_len, pos = 0, min = 0, old_pos;
@@ -239,7 +232,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
 /*
  * Init oggvorbis file and write some tech data to given pointers.
  */
-static int ogg_get_file_info(char *map, off_t numbytes,
+static int ogg_get_file_info(char *map, size_t numbytes,
 		struct audio_format_info *afi)
 {
 	int ret;