X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=918c5636a5bf8d58c916e0225a96f1dab78fa8c6;hb=298ad3958d76fc775dfd0503ae4b1e43dce70f04;hp=29bae161682bc00f6fd133e3c29ca7e5df06994d;hpb=55f0f9461990455656bef7a36b0f963e3d676653;p=paraslash.git diff --git a/afs.c b/afs.c index 29bae161..918c5636 100644 --- a/afs.c +++ b/afs.c @@ -45,20 +45,20 @@ extern struct gengetopt_args_info conf; static FILE *audio_file = NULL; #if 1 - void mp3_init(void *); + void mp3_init(struct audio_format_handler *); #endif #ifdef HAVE_OGGVORBIS - void ogg_init(void *); + void ogg_init(struct audio_format_handler *); #endif #ifdef HAVE_FAAD - void aac_afh_init(void *); + void aac_afh_init(struct audio_format_handler *); #endif /** * the list of supported audio formats */ -struct audio_format afl[] = { +struct audio_format_handler afl[] = { #if 1 { .name = "mp3", @@ -336,7 +336,7 @@ static struct timeval *afs_compute_timeout(void) return &the_timeout; } -static void afs_eof(struct audio_format *af) +static void afs_eof(struct audio_format_handler *af) { struct timeval now; int i; @@ -388,7 +388,7 @@ static void afs_eof(struct audio_format *af) */ struct timeval *afs_preselect(void) { - struct audio_format *af = NULL; + struct audio_format_handler *af = NULL; int i, format; struct timeval *ret; again: @@ -449,7 +449,7 @@ again: void afs_send_chunk(void) { int i; - struct audio_format *af; + struct audio_format_handler *af; char *buf; ssize_t ret; struct timeval now, due;