X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg.c;h=3445970bd867acfbcd7ad52a1df1a58edd9bf691;hp=2d584e5be5a84f8d5ce9e4f1a2f0eb7ca928f7d1;hb=f3ebfd3dcb117f1c4a91c2c9f08d8ed710ee3907;hpb=a8a78f935dcefa8a7fcda8dae80bca64fe39d632 diff --git a/ogg.c b/ogg.c index 2d584e5b..3445970b 100644 --- a/ogg.c +++ b/ogg.c @@ -24,6 +24,7 @@ #include "server.cmdline.h" #include "server.h" #include "afs.h" +#include "afh.h" #include "error.h" #include "string.h" @@ -36,7 +37,7 @@ static FILE *infile; static int header_len, oggbuf_len, vi_channels; static char *header, *oggbuf; static ssize_t *chunk_table, max_chunk_len; -struct audio_format *af; +struct audio_format_handler *af; static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal, num_chunks; @@ -46,7 +47,7 @@ static int ogg_compute_header_len(void) unsigned int serial; char *buf; ogg_page page; - ogg_packet packet; + ogg_packet packet; vorbis_comment vc; vorbis_info vi; ogg_stream_state *stream_in = para_malloc(sizeof(ogg_stream_state)); @@ -345,7 +346,8 @@ static char *ogg_get_header_info(int *len) return header; } -void ogg_init(void *p) +static const char* ogg_suffixes[] = {"ogg", NULL}; +void ogg_init(struct audio_format_handler *p) { af = p; af->reposition_stream = ogg_reposition_stream; @@ -356,4 +358,5 @@ void ogg_init(void *p) af->chunk_tv.tv_sec = 0; af->chunk_tv.tv_usec = 250 * 1000; tv_scale(3, &af->chunk_tv, &af->eof_tv); + af->suffixes = ogg_suffixes; }