1 files changed, 32 insertions, 51 deletions

diff --git a/src/pcm/PcmConvert.hxx b/src/pcm/PcmConvert.hxx
index 40f785179..26ab02923 100644
--- a/src/pcm/PcmConvert.hxx
+++ b/src/pcm/PcmConvert.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,15 +20,22 @@
 #ifndef PCM_CONVERT_HXX
 #define PCM_CONVERT_HXX
 
-#include "PcmDither.hxx"
-#include "PcmDsd.hxx"
-#include "PcmResample.hxx"
+#include "check.h"
 #include "PcmBuffer.hxx"
+#include "FormatConverter.hxx"
+#include "ChannelsConverter.hxx"
+#include "GlueResampler.hxx"
+#include "AudioFormat.hxx"
+
+#ifdef ENABLE_DSD
+#include "PcmDsd.hxx"
+#endif
 
 #include <stddef.h>
 
-struct AudioFormat;
+template<typename T> struct ConstBuffer;
 class Error;
+class Domain;
 
 /**
  * This object is statically allocated (within another struct), and
@@ -36,74 +43,48 @@ class Error;
  * conversions.
  */
 class PcmConvert {
+#ifdef ENABLE_DSD
 	PcmDsd dsd;
+#endif
 
-	PcmResampler resampler;
-
-	PcmDither dither;
+	GluePcmResampler resampler;
+	PcmFormatConverter format_converter;
+	PcmChannelsConverter channels_converter;
 
-	/** the buffer for converting the sample format */
-	PcmBuffer format_buffer;
+	AudioFormat src_format, dest_format;
 
-	/** the buffer for converting the channel count */
-	PcmBuffer channels_buffer;
+	bool enable_resampler, enable_format, enable_channels;
 
 public:
 	PcmConvert();
 	~PcmConvert();
 
+	/**
+	 * Prepare the object.  Call Close() when done.
+	 */
+	bool Open(AudioFormat _src_format, AudioFormat _dest_format,
+		  Error &error);
 
 	/**
-	 * Reset the pcm_convert_state object.  Use this at the
-	 * boundary between two distinct songs and each time the
-	 * format changes.
+	 * Close the object after it was prepared with Open().  After
+	 * that, it may be reused by calling Open() again.
 	 */
-	void Reset();
+	void Close();
 
 	/**
 	 * Converts PCM data between two audio formats.
 	 *
 	 * @param src_format the source audio format
 	 * @param src the source PCM buffer
-	 * @param src_size the size of #src in bytes
 	 * @param dest_format the requested destination audio format
-	 * @param dest_size_r returns the number of bytes of the destination buffer
-	 * @param error_r location to store the error occurring, or NULL to
+	 * @param error_r location to store the error occurring, or nullptr to
 	 * ignore errors
-	 * @return the destination buffer, or NULL on error
+	 * @return the destination buffer, or nullptr on error
 	 */
-	const void *Convert(AudioFormat src_format,
-			    const void *src, size_t src_size,
-			    AudioFormat dest_format,
-			    size_t *dest_size_r,
-			    Error &error);
-
-private:
-	const int16_t *Convert16(AudioFormat src_format,
-				 const void *src_buffer, size_t src_size,
-				 AudioFormat dest_format,
-				 size_t *dest_size_r,
-				 Error &error);
-
-	const int32_t *Convert24(AudioFormat src_format,
-				 const void *src_buffer, size_t src_size,
-				 AudioFormat dest_format,
-				 size_t *dest_size_r,
-				 Error &error);
-
-	const int32_t *Convert32(AudioFormat src_format,
-				 const void *src_buffer, size_t src_size,
-				 AudioFormat dest_format,
-				 size_t *dest_size_r,
-				 Error &error);
-
-	const float *ConvertFloat(AudioFormat src_format,
-				  const void *src_buffer, size_t src_size,
-				  AudioFormat dest_format,
-				  size_t *dest_size_r,
-				  Error &error);
+	ConstBuffer<void> Convert(ConstBuffer<void> src, Error &error);
 };
 
-extern const class Domain pcm_convert_domain;
+bool
+pcm_convert_global_init(Error &error);
 
 #endif