From 05f4629fa3785b9596024d24eaea6f9f5afd75fa Mon Sep 17 00:00:00 2001 From: Laszlo Ashin Date: Wed, 19 Nov 2008 00:02:06 +0100 Subject: wavpack: redo using audio_format_frame_size() Somehow we lost 600e1322 after renaming some variables in ed6f6046. --- src/decoder/wavpack_plugin.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src') diff --git a/src/decoder/wavpack_plugin.c b/src/decoder/wavpack_plugin.c index 224895f25..377174e51 100644 --- a/src/decoder/wavpack_plugin.c +++ b/src/decoder/wavpack_plugin.c @@ -157,12 +157,7 @@ wavpack_decode(struct decoder *decoder, WavpackContext *wpc, bool can_seek, total_time = WavpackGetNumSamples(wpc); total_time /= audio_format.sample_rate; bytes_per_sample = WavpackGetBytesPerSample(wpc); - - output_sample_size = bytes_per_sample; - if (output_sample_size == 3) { - output_sample_size = 4; - } - output_sample_size *= audio_format.channels; + output_sample_size = audio_format_frame_size(&audio_format); /* wavpack gives us all kind of samples in a 32-bit space */ samples_requested = sizeof(chunk) / (4 * audio_format.channels); -- cgit v1.2.3