moved expression to audioFormatSizeToTime()

The multi-line expression which calculates sizeToTime is hard to read, partly because "cb->audioFormat." is too long. Create a separate inline function in audio.h for that. git-svn-id: https://svn.musicpd.org/mpd/trunk@7277 09075e82-0dd4-0310-85a5-a0d7c8717e4f

moved expression to audioFormatSizeToTime()
646260b1 · Max Kellermann · Eric Wong · dc55e13c · 646260b1 · 646260b1
Commit 646260b1 authored Apr 12, 2008 by Max Kellermann Committed by Eric Wong Apr 12, 2008
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

audio.h src/audio.h +5 -0

decode.c src/decode.c +1 -3

No files found.
--- a/src/audio.h
+++ b/src/audio.h
@@ -35,6 +35,11 @@ typedef struct _AudioFormat {
 unsigned int audio_device_count(void);
+static inline double audioFormatSizeToTime(const AudioFormat * af)
+{
+	return 8.0 / af->bits / af->channels / af->sampleRate;
+}
 void copyAudioFormat(AudioFormat * dest, AudioFormat * src);
 int cmpAudioFormat(AudioFormat * dest, AudioFormat * src);

--- a/src/decode.c
+++ b/src/decode.c
@@ -466,9 +466,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
 				pc->sampleRate = dc->audioFormat.sampleRate;
 				pc->bits = dc->audioFormat.bits;
 				pc->channels = dc->audioFormat.channels;
-				sizeToTime = 8.0/cb->audioFormat.bits/
+				sizeToTime = audioFormatSizeToTime(&cb->audioFormat);
-					cb->audioFormat.channels/
-					cb->audioFormat.sampleRate;
 			}
 			else if(dc->state!=DECODE_STATE_START) {
 				/* the decoder failed */