diff options
| author | Max Kellermann <max@duempel.org> | 2013-11-30 14:10:31 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-11-30 14:10:31 +0100 |
| commit | e9127523db55a267f67532fd61e913f2879324fc (patch) | |
| tree | 24f65d0ce209b63137e59b8368436cc4ab5ceaf4 /src/pcm/PcmConvert.hxx | |
| parent | 92004f2e7e6ec8479805313b0bdac7258d53c74e (diff) | |
| download | mpd-e9127523db55a267f67532fd61e913f2879324fc.tar.gz mpd-e9127523db55a267f67532fd61e913f2879324fc.tar.xz mpd-e9127523db55a267f67532fd61e913f2879324fc.zip | |
pcm/PcmConvert: move code to new class GluePcmResampler
Diffstat (limited to 'src/pcm/PcmConvert.hxx')
| -rw-r--r-- | src/pcm/PcmConvert.hxx | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/pcm/PcmConvert.hxx b/src/pcm/PcmConvert.hxx index d6e113915..9835045d6 100644 --- a/src/pcm/PcmConvert.hxx +++ b/src/pcm/PcmConvert.hxx @@ -21,10 +21,10 @@ #define PCM_CONVERT_HXX #include "PcmDsd.hxx" -#include "PcmResample.hxx" #include "PcmBuffer.hxx" #include "FormatConverter.hxx" #include "ChannelsConverter.hxx" +#include "GlueResampler.hxx" #include "AudioFormat.hxx" #include <stddef.h> @@ -41,10 +41,9 @@ class Domain; class PcmConvert { PcmDsd dsd; - PcmResampler resampler; - PcmFormatConverter format_converter; PcmChannelsConverter channels_converter; + GluePcmResampler resampler; AudioFormat src_format, dest_format; @@ -79,20 +78,6 @@ public: const void *Convert(const void *src, size_t src_size, size_t *dest_size_r, Error &error); - -private: - ConstBuffer<int16_t> Convert16(ConstBuffer<int16_t> src, - AudioFormat format, - Error &error); - ConstBuffer<int32_t> Convert24(ConstBuffer<int32_t> src, - AudioFormat format, - Error &error); - ConstBuffer<int32_t> Convert32(ConstBuffer<int32_t> src, - AudioFormat format, - Error &error); - ConstBuffer<float> ConvertFloat(ConstBuffer<float> src, - AudioFormat format, - Error &error); }; extern const Domain pcm_convert_domain; |