mp4: Whitespace and indentation cleanups for create_ilst().

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index c2daf5b533ca881990963618fbd2c488468f58ce..dd9247d7ac6bba54a1c49512613ea8011a387a46 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -23,9 +23,9 @@ struct aac_afh_context {
        size_t mapsize;
        size_t fpos;
        int32_t track;
-       mp4ff_t *mp4ff;
+       struct mp4ff *mp4ff;
        mp4AudioSpecificConfig masc;
-       mp4ff_callback_t cb;
+       struct mp4ff_callback cb;
 };
 
 static uint32_t aac_afh_read_cb(void *user_data, void *dest, uint32_t want)
@@ -50,7 +50,7 @@ static uint32_t aac_afh_seek_cb(void *user_data, uint64_t pos)
        return 0;
 }
 
-static int32_t aac_afh_get_track(mp4ff_t *mp4ff, mp4AudioSpecificConfig *masc)
+static int32_t aac_afh_get_track(struct mp4ff *mp4ff, mp4AudioSpecificConfig *masc)
 {
        int32_t i, rc, num_tracks = mp4ff_total_tracks(mp4ff);
 
@@ -127,7 +127,7 @@ static int aac_afh_get_chunk(uint32_t chunk_num, void *afh_context,
        return 1;
 }
 
-static void _aac_afh_get_taginfo(const mp4ff_t *mp4ff, struct taginfo *tags)
+static void _aac_afh_get_taginfo(const struct mp4ff *mp4ff, struct taginfo *tags)
 {
        mp4ff_meta_get_artist(mp4ff, &tags->artist);
        mp4ff_meta_get_title(mp4ff, &tags->title);
@@ -216,14 +216,14 @@ static uint32_t aac_afh_meta_truncate_cb(void *user_data)
        return ftruncate(fd, offset);
 }
 
-static void replace_tag(mp4ff_tag_t *tag, const char *new_val, bool *found)
+static void replace_tag(struct mp4ff_tag *tag, const char *new_val, bool *found)
 {
        free(tag->value);
        tag->value = para_strdup(new_val);
        *found = true;
 }
 
-static void add_tag(mp4ff_metadata_t *md, const char *item, const char *value)
+static void add_tag(struct mp4ff_metadata *md, const char *item, const char *value)
 {
        md->tags[md->count].item = para_strdup(item);
        md->tags[md->count].value = para_strdup(value);
@@ -235,9 +235,9 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
 {
        int ret, i;
        int32_t rv;
-       mp4ff_metadata_t metadata;
-       mp4ff_t *mp4ff;
-       mp4ff_callback_t cb = {
+       struct mp4ff_metadata metadata;
+       struct mp4ff *mp4ff;
+       struct mp4ff_callback cb = {
                .read = aac_afh_meta_read_cb,
                .seek = aac_afh_meta_seek_cb,
                .write = aac_afh_meta_write_cb,
@@ -263,9 +263,9 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
        metadata.count = rv;
        PARA_NOTICE_LOG("%d metadata item(s) found\n", rv);
 
-       metadata.tags = para_malloc((metadata.count + 5) * sizeof(mp4ff_tag_t));
+       metadata.tags = para_malloc((metadata.count + 5) * sizeof(struct mp4ff_tag));
        for (i = 0; i < metadata.count; i++) {
-               mp4ff_tag_t *tag = metadata.tags + i;
+               struct mp4ff_tag *tag = metadata.tags + i;
 
                ret = -E_MP4FF_META_READ;
                if (!mp4ff_meta_get_by_index(mp4ff, i, &tag->item, &tag->value))