From 26330e38b94e355e2767742d3f0d7415ceb7d908 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 4 Mar 2007 23:48:29 +0100 Subject: [PATCH 1/1] ogg_afh.c: Kill global variable infile Pass it where neccessary instead. --- ogg_afh.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ogg_afh.c b/ogg_afh.c index 2e3ed72c..ad7da3ee 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -35,16 +35,15 @@ static double chunk_time = 0.25; static OggVorbis_File *oggvorbis_file; -static FILE *infile; static int header_len; static char *header; static ssize_t *chunk_table, max_chunk_len, num_chunks; static struct audio_format_handler *af; static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal; -static int ogg_compute_header_len(void) +static int ogg_compute_header_len(FILE *file) { - int ret, len, in = fileno(infile); + int ret, len, in = fileno(file); unsigned int serial; char *buf; ogg_page page; @@ -146,10 +145,10 @@ static void tunetable(void) /* * Alloc and fill array table of byte offsets. chunk_table[i] is the - * offset in the current infile at which the sample containing time i * + * offset in the current input file at which the sample containing time i * * CHUNK_TIME begins. */ -static void ogg_compute_chunk_table(double time_total) +static void ogg_compute_chunk_table(FILE *file, double time_total) { int i, ret, num; ssize_t pos = 0, min = 0, old_pos; @@ -162,7 +161,7 @@ static void ogg_compute_chunk_table(double time_total) chunk_table = para_malloc(num * sizeof(size_t)); chunk_table[0] = 0; max_chunk_len = 0; - rewind(infile); + rewind(file); for (i = 1; ret == 0; i++) { ogg_int64_t diff; ret = ov_time_seek(oggvorbis_file, i * chunk_time); @@ -184,7 +183,7 @@ static void ogg_compute_chunk_table(double time_total) tunetable(); PARA_INFO_LOG("%zu chunks (%fs), max chunk: %zd, min chunk: %zd\n", num_chunks, chunk_time, max_chunk_len, min); - rewind(infile); + rewind(file); } static void ogg_close_audio_file(void) @@ -226,10 +225,9 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames, vorbis_info *vi; ogg_int64_t raw_total; - infile = file; if (!file) return -E_OGG_NO_FILE; - ret = ogg_compute_header_len(); + ret = ogg_compute_header_len(file); if (ret < 0) return ret; ret = ogg_save_header(file, header_len); @@ -253,7 +251,7 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames, vi_sampling_rate = vi->rate; vi_bitrate = ov_bitrate(oggvorbis_file, 0); vi_bitrate_nominal = vi->bitrate_nominal; - ogg_compute_chunk_table(time_total); + ogg_compute_chunk_table(file, time_total); *frames = num_chunks; *vss_chunk_table = chunk_table; sprintf(info_str, "audio_file_info1:%zu x %lu, %ldkHz, %d channels, %ldkbps\n" -- 2.39.2