From 407497c40a34ae299cca56de1bd7c92e5724c54a Mon Sep 17 00:00:00 2001
From: "J. Alexander Treuman" <jat@spatialrift.net>
Date: Tue, 22 May 2007 23:11:36 +0000
Subject: Split pcm_convertAudioFormat into separate functions for bitrate,
 channel, and samplerate conversion.  This makes the code much easier to read,
 and fixes a few bugs that were previously there.

git-svn-id: https://svn.musicpd.org/mpd/trunk@6224 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/audioOutput.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/audioOutput.c')

diff --git a/src/audioOutput.c b/src/audioOutput.c
index dd1635331..7a99dfd68 100644
--- a/src/audioOutput.c
+++ b/src/audioOutput.c
@@ -194,11 +194,9 @@ int openAudioOutput(AudioOutput * audioOutput, AudioFormat * audioFormat)
 static void convertAudioFormat(AudioOutput * audioOutput, char **chunkArgPtr,
 			       int *sizeArgPtr)
 {
-	int size =
-		pcm_sizeOfOutputBufferForAudioFormatConversion(
-				&(audioOutput->inAudioFormat),
-				*sizeArgPtr,
-				&(audioOutput->outAudioFormat));
+	int size = pcm_sizeOfConvBuffer(&(audioOutput->inAudioFormat),
+                                        *sizeArgPtr,
+                                        &(audioOutput->outAudioFormat));
 
 	if (size > audioOutput->convBufferLen) {
 		audioOutput->convBuffer =
-- 
cgit v1.2.3