NEWS update

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index 5adcc25218377e57c8b038e30e325268aeb6e86f..94383c4564156cb7f608c9eaa9a7b6b5e8846614 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -30,9 +30,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 +106,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 +139,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 +150,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 +204,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 +244,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;