mp4: Merge sample_to_offset() into mp4_set_sample_position().

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index 30e7164e726b21956b0734d69369d30227bad95c..34ad7cbadf1e95296af4a36119f20b18dfdce764 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -27,7 +27,7 @@ struct aac_afh_context {
        struct mp4_callback cb;
 };
 
-static uint32_t aac_afh_read_cb(void *user_data, void *dest, uint32_t want)
+static ssize_t aac_afh_read_cb(void *user_data, void *dest, size_t want)
 {
        struct aac_afh_context *c = user_data;
        size_t have, rv;
@@ -35,7 +35,7 @@ static uint32_t aac_afh_read_cb(void *user_data, void *dest, uint32_t want)
        if (want == 0 || c->fpos >= c->mapsize)
                return 0;
        have = c->mapsize - c->fpos;
-       rv = PARA_MIN(have, (size_t)want);
+       rv = PARA_MIN(have, want);
        PARA_DEBUG_LOG("reading %zu bytes @%zu\n", rv, c->fpos);
        memcpy(dest, c->map + c->fpos, rv);
        c->fpos += rv;
@@ -51,7 +51,7 @@ static uint32_t aac_afh_seek_cb(void *user_data, uint64_t pos)
 
 static int32_t aac_afh_get_track(struct mp4 *mp4)
 {
-       int32_t i, num_tracks = mp4_total_tracks(mp4);
+       int32_t i, num_tracks = mp4_get_total_tracks(mp4);
 
        assert(num_tracks >= 0);
        for (i = 0; i < num_tracks; i++)
@@ -178,7 +178,7 @@ close:
        return ret;
 }
 
-static uint32_t aac_afh_meta_read_cb(void *user_data, void *dest, uint32_t want)
+static ssize_t aac_afh_meta_read_cb(void *user_data, void *dest, size_t want)
 {
        int fd = *(int *)user_data;
        return read(fd, dest, want);