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

[paraslash.git] / spx_afh.c

diff --git a/spx_afh.c b/spx_afh.c
index 4e318af19af8940570887ac3ebf8edb7a4c25b85..cd65ac519c0673c0b9df997f7608e2c86b5920dd 100644 (file)
--- a/spx_afh.c
+++ b/spx_afh.c
@@ -152,13 +152,13 @@ static int spx_get_file_info(char *map, size_t numbytes, __a_unused int fd,
                struct afh_info *afhi)
 {
        struct private_spx_data psd;
                struct afh_info *afhi)
 {
        struct private_spx_data psd;

-       struct ogg_afh_callback_info spx_callback_info = {
+       struct oac_callback_info spx_callback_info = {

                .packet_callback = spx_packet_callback,
                .private_data = &psd,
        };
 
        memset(&psd, 0, sizeof(psd));
                .packet_callback = spx_packet_callback,
                .private_data = &psd,
        };
 
        memset(&psd, 0, sizeof(psd));

-       return ogg_get_file_info(map, numbytes, afhi, &spx_callback_info);
+       return oac_get_file_info(map, numbytes, afhi, &spx_callback_info);

 }
 
 static size_t spx_make_meta_packet(struct taginfo *tags, char **result)
 }
 
 static size_t spx_make_meta_packet(struct taginfo *tags, char **result)


@@ -244,7 +244,7 @@ static int spx_rewrite_tags(const char *map, size_t mapsize,
        int ret;
 
        meta_sz = spx_make_meta_packet(tags, &meta_packet);
        int ret;
 
        meta_sz = spx_make_meta_packet(tags, &meta_packet);

-       ret = ogg_rewrite_tags(map, mapsize, output_fd, meta_packet, meta_sz);
+       ret = oac_rewrite_tags(map, mapsize, output_fd, meta_packet, meta_sz);

        free(meta_packet);
        return ret;
 }
        free(meta_packet);
        return ret;
 }