From 2c6032259d6536daabd4132a3737cac08ebdd018 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 13 Mar 2007 23:20:10 +0100 Subject: [PATCH] kill file parameter from get_file_info of struct audio format handler Now that all audio format handlers use mmap(), this parameter is unused. --- aac_afh.c | 2 +- afh.h | 2 +- mp3_afh.c | 2 +- ogg_afh.c | 2 +- vss.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aac_afh.c b/aac_afh.c index 17b72250..bf402f09 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -97,7 +97,7 @@ static long unsigned aac_set_chunk_tv(struct audio_format_info *afi, /* * Init m4a file and write some tech data to given pointers. */ -static int aac_get_file_info(__a_unused FILE *file, char *map, off_t numbytes, +static int aac_get_file_info(char *map, off_t numbytes, struct audio_format_info *afi) { int i; diff --git a/afh.h b/afh.h index 7925aee3..246cb920 100644 --- a/afh.h +++ b/afh.h @@ -108,7 +108,7 @@ struct audio_format_handler { * * \sa struct audio_format_info */ - int (*get_file_info)(FILE *audio_file, char *map, off_t numbytes, + int (*get_file_info)(char *map, off_t numbytes, struct audio_format_info *afi); }; diff --git a/mp3_afh.c b/mp3_afh.c index a3e3c5c3..8f36bb83 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -404,7 +404,7 @@ err_out: /* * Read mp3 information from audio file */ -static int mp3_get_file_info(FILE *file, char *map, off_t numbytes, +static int mp3_get_file_info(char *map, off_t numbytes, struct audio_format_info *afi) { int ret; diff --git a/ogg_afh.c b/ogg_afh.c index 7a3286fd..eaed1621 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -247,7 +247,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, /* * Init oggvorbis file and write some tech data to given pointers. */ -static int ogg_get_file_info(FILE *file, char *map, off_t numbytes, +static int ogg_get_file_info(char *map, off_t numbytes, struct audio_format_info *afi) { int ret; diff --git a/vss.c b/vss.c index 74b0f009..93790a73 100644 --- a/vss.c +++ b/vss.c @@ -185,7 +185,7 @@ void vss_init(void) static int get_file_info(int i) { - return afl[i].get_file_info(audio_file, map, mmd->size, &mmd->afi); + return afl[i].get_file_info(map, mmd->size, &mmd->afi); } /** -- 2.39.5