From 3a666702af9a57c7e8dc5e266b28eaaa5835f5e5 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 30 Nov 2013 13:00:41 +0100
Subject: pcm/PcmConvert: add AudioFormat parameters

Don't use src_format.  In the middle of Convert(), the current
AudioFormat has already been modified, it's now something in between
src_format and dest_format.  This simplifies keeping track of what
remains to be done.
---
 src/pcm/PcmConvert.hxx | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'src/pcm/PcmConvert.hxx')

diff --git a/src/pcm/PcmConvert.hxx b/src/pcm/PcmConvert.hxx
index 74f4e350c..12c4b26f3 100644
--- a/src/pcm/PcmConvert.hxx
+++ b/src/pcm/PcmConvert.hxx
@@ -52,13 +52,6 @@ class PcmConvert {
 
 	AudioFormat src_format, dest_format;
 
-	/**
-	 * Do we get DSD source data?  Then this flag is true and
-	 * src_format.format is set to SampleFormat::FLOAT, because
-	 * the #PcmDsd class will convert it to floating point.
-	 */
-	bool is_dsd;
-
 public:
 	PcmConvert();
 	~PcmConvert();
@@ -92,10 +85,18 @@ public:
 			    Error &error);
 
 private:
-	ConstBuffer<int16_t> Convert16(ConstBuffer<void> src, Error &error);
-	ConstBuffer<int32_t> Convert24(ConstBuffer<void> src, Error &error);
-	ConstBuffer<int32_t> Convert32(ConstBuffer<void> src, Error &error);
-	ConstBuffer<float> ConvertFloat(ConstBuffer<void> src, Error &error);
+	ConstBuffer<int16_t> Convert16(ConstBuffer<void> src,
+				       AudioFormat format,
+				       Error &error);
+	ConstBuffer<int32_t> Convert24(ConstBuffer<void> src,
+				       AudioFormat format,
+				       Error &error);
+	ConstBuffer<int32_t> Convert32(ConstBuffer<void> src,
+				       AudioFormat format,
+				       Error &error);
+	ConstBuffer<float> ConvertFloat(ConstBuffer<void> src,
+					AudioFormat format,
+					Error &error);
 };
 
 extern const Domain pcm_convert_domain;
-- 
cgit v1.2.3