Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index d5c4726269b4d30c889f16340cb5f2ca5e86c640..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,17 +106,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 +150,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);