From 37754559b8f934ce8d554e0d9f976d4f6eb376d9 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 19 Jul 2009 16:24:43 +0100 Subject: Add audio_format_init() function It makes no difference right now, but we're about to add an endianness flag and will want to make sure it's correctly initialised every time. --- src/decoder/mad_plugin.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/decoder/mad_plugin.c') diff --git a/src/decoder/mad_plugin.c b/src/decoder/mad_plugin.c index c6b9d32d3..85f4506d2 100644 --- a/src/decoder/mad_plugin.c +++ b/src/decoder/mad_plugin.c @@ -1148,13 +1148,6 @@ mp3_read(struct mp3_data *data, struct replay_gain_info **replay_gain_info_r) return ret != DECODE_BREAK; } -static void mp3_audio_format(struct mp3_data *data, struct audio_format *af) -{ - af->bits = 24; - af->sample_rate = (data->frame).header.samplerate; - af->channels = MAD_NCHANNELS(&(data->frame).header); -} - static void mp3_decode(struct decoder *decoder, struct input_stream *input_stream) { @@ -1170,7 +1163,8 @@ mp3_decode(struct decoder *decoder, struct input_stream *input_stream) return; } - mp3_audio_format(&data, &audio_format); + audio_format_init(&audio_format, data.frame.header.samplerate, 24, + MAD_NCHANNELS(&data.frame.header)); decoder_initialized(decoder, &audio_format, data.input_stream->seekable, data.total_time); -- cgit v1.2.3