From 1d214b4aed84384e91400a9a83b3f39bc3ba24aa Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 10 Jul 2014 08:35:24 +0200
Subject: [PATCH] decoder/audiofile: use audiofile_get_duration() in
_stream_decode()
---
src/decoder/plugins/AudiofileDecoderPlugin.cxx | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/decoder/plugins/AudiofileDecoderPlugin.cxx b/src/decoder/plugins/AudiofileDecoderPlugin.cxx
index e78c156f9..f0bc03ed1 100644
--- a/src/decoder/plugins/AudiofileDecoderPlugin.cxx
+++ b/src/decoder/plugins/AudiofileDecoderPlugin.cxx
@@ -186,10 +186,9 @@ static void
audiofile_stream_decode(Decoder &decoder, InputStream &is)
{
AFvirtualfile *vf;
- int fs, frame_count;
+ int fs;
AFfilehandle af_fp;
AudioFormat audio_format;
- float total_time;
uint16_t bit_rate;
int ret;
char chunk[CHUNK_SIZE];
@@ -219,9 +218,7 @@ audiofile_stream_decode(Decoder &decoder, InputStream &is)
return;
}
- frame_count = afGetFrameCount(af_fp, AF_DEFAULT_TRACK);
-
- total_time = ((float)frame_count / (float)audio_format.sample_rate);
+ const double total_time = audiofile_get_duration(af_fp);
bit_rate = (uint16_t)(is.GetSize() * 8.0 / total_time / 1000.0 + 0.5);