X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=cb0611e01440a2a1e23e4c586a602c16cb7bbc16;hp=32f8bc1beda6f10376db3d3842e0e3cfcaf02e96;hb=7649f22106cec2c6eb8bb10f279401e1af5451d0;hpb=76b96e3530d576e2a5a8da487ee975d3bec6ae44 diff --git a/ogg_afh.c b/ogg_afh.c index 32f8bc1b..cb0611e0 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -95,7 +95,7 @@ static void add_ogg_page(ogg_page *og, struct vorbis_get_header_data *vghd) memcpy(p + og->header_len, og->body, og->body_len); vghd->buf = buf; vghd->len = new_len; - PARA_DEBUG_LOG("header/body/old/new: %lu/%lu/%zu/%zu\n", + PARA_DEBUG_LOG("header/body/old/new: %li/%li/%zu/%zu\n", og->header_len, og->body_len, old_len, new_len); } @@ -171,8 +171,6 @@ fail: PARA_ERROR_LOG("%s\n", para_strerror(-ret)); } -static const char* ogg_suffixes[] = {"ogg", NULL}; - static int vorbis_make_meta_packet(struct taginfo *tags, ogg_packet *result) { vorbis_comment vc; @@ -206,12 +204,15 @@ static int vorbis_rewrite_tags(const char *map, size_t mapsize, free(packet.packet); return ret; } + +static const char * const ogg_suffixes[] = {"ogg", NULL}; + /** * The init function of the ogg vorbis audio format handler. * * \param afh Pointer to the struct to initialize. */ -void ogg_init(struct audio_format_handler *afh) +void ogg_afh_init(struct audio_format_handler *afh) { afh->get_file_info = ogg_vorbis_get_file_info; afh->get_header = vorbis_get_header;