Prefix public functions of ogg_afh_common.c with "oac".

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index cb0611e01440a2a1e23e4c586a602c16cb7bbc16..8a64fcc53b8635d6d14d472da4bb836f4401ab3b 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -66,14 +66,14 @@ static int ogg_vorbis_get_file_info(char *map, size_t numbytes, __a_unused int f
 {
        int ret;
        struct private_vorbis_data pvd;
-       struct ogg_afh_callback_info vorbis_callback_info = {
+       struct oac_callback_info vorbis_callback_info = {
                .packet_callback = vorbis_packet_callback,
                .private_data = &pvd,
        };
 
        vorbis_info_init(&pvd.vi);
        vorbis_comment_init(&pvd.vc);
-       ret = ogg_get_file_info(map, numbytes, afhi, &vorbis_callback_info);
+       ret = oac_get_file_info(map, numbytes, afhi, &vorbis_callback_info);
        vorbis_info_clear(&pvd.vi);
        vorbis_comment_clear(&pvd.vc);
        return ret;
@@ -155,12 +155,12 @@ static void vorbis_get_header(void *map, size_t mapsize, char **buf,
 {
        int ret;
        struct vorbis_get_header_data vghd = {.len = 0};
-       struct ogg_afh_callback_info cb = {
+       struct oac_callback_info cb = {
                .packet_callback = vorbis_get_header_callback,
                .private_data = &vghd,
        };
 
-       ret = ogg_get_file_info(map, mapsize, NULL, &cb);
+       ret = oac_get_file_info(map, mapsize, NULL, &cb);
        if (ret < 0)
                goto fail;
        *buf = vghd.buf;
@@ -199,7 +199,7 @@ static int vorbis_rewrite_tags(const char *map, size_t mapsize,
        ret = vorbis_make_meta_packet(tags, &packet);
        if (ret < 0)
                return ret;
-       ret = ogg_rewrite_tags(map, mapsize, output_fd, (char *)packet.packet,
+       ret = oac_rewrite_tags(map, mapsize, output_fd, (char *)packet.packet,
                packet.bytes);
        free(packet.packet);
        return ret;