From 2650b9eb318a9eec0c45757624debf363aa156f9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 26 Aug 2008 08:27:09 +0200 Subject: added inline function audio_format_time_to_size() Make the code more readable by hiding big formulas in an inline function with a nice name. --- src/audio_format.h | 5 +++++ src/decode.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/audio_format.h b/src/audio_format.h index ba22b3bf..a6e97e04 100644 --- a/src/audio_format.h +++ b/src/audio_format.h @@ -27,6 +27,11 @@ typedef struct _AudioFormat { volatile mpd_sint8 bits; } AudioFormat; +static inline double audio_format_time_to_size(const AudioFormat * af) +{ + return af->sampleRate * af->bits * af->channels / 8.0; +} + static inline double audioFormatSizeToTime(const AudioFormat * af) { return 8.0 / af->bits / af->channels / af->sampleRate; diff --git a/src/decode.c b/src/decode.c index da649ece..f0c13f70 100644 --- a/src/decode.c +++ b/src/decode.c @@ -78,7 +78,7 @@ static unsigned calculateCrossFadeChunks(AudioFormat * af, assert(af->channels > 0); assert(af->sampleRate > 0); - chunks = (af->sampleRate * af->bits * af->channels / 8.0 / CHUNK_SIZE); + chunks = audio_format_time_to_size(af) / CHUNK_SIZE; chunks = (chunks * pc.crossFade + 0.5); if (chunks > max_chunks) -- cgit v1.2.3