aboutsummaryrefslogtreecommitdiffstats
path: root/src/pcm/PcmConvert.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-07-29 07:56:40 +0200
committerMax Kellermann <max@duempel.org>2013-07-29 07:56:40 +0200
commitcac3c159bc84d5163c87a40383d3eda64a4c9f69 (patch)
tree06e9e4f965ba69b1a415ec1941e238b8a11565cb /src/pcm/PcmConvert.cxx
parent43166130b51e995ada4130f6400efbb5d38eeb47 (diff)
downloadmpd-cac3c159bc84d5163c87a40383d3eda64a4c9f69.tar.gz
mpd-cac3c159bc84d5163c87a40383d3eda64a4c9f69.tar.xz
mpd-cac3c159bc84d5163c87a40383d3eda64a4c9f69.zip
pcm_dsd: convert to C++
Diffstat (limited to 'src/pcm/PcmConvert.cxx')
-rw-r--r--src/pcm/PcmConvert.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/pcm/PcmConvert.cxx b/src/pcm/PcmConvert.cxx
index 9618b9642..383df9156 100644
--- a/src/pcm/PcmConvert.cxx
+++ b/src/pcm/PcmConvert.cxx
@@ -36,7 +36,6 @@ PcmConvert::PcmConvert()
{
memset(this, 0, sizeof(*this));
- pcm_dsd_init(&dsd);
pcm_resample_init(&resample);
pcm_buffer_init(&format_buffer);
@@ -45,7 +44,6 @@ PcmConvert::PcmConvert()
PcmConvert::~PcmConvert()
{
- pcm_dsd_deinit(&dsd);
pcm_resample_deinit(&resample);
pcm_buffer_deinit(&format_buffer);
@@ -55,7 +53,7 @@ PcmConvert::~PcmConvert()
void
PcmConvert::Reset()
{
- pcm_dsd_reset(&dsd);
+ dsd.Reset();
pcm_resample_reset(&resample);
}
@@ -278,10 +276,9 @@ PcmConvert::Convert(const audio_format *src_format,
struct audio_format float_format;
if (src_format->format == SAMPLE_FORMAT_DSD) {
size_t f_size;
- const float *f = pcm_dsd_to_float(&dsd,
- src_format->channels,
- false, (const uint8_t *)src,
- src_size, &f_size);
+ const float *f = dsd.ToFloat(src_format->channels,
+ false, (const uint8_t *)src,
+ src_size, &f_size);
if (f == NULL) {
g_set_error_literal(error_r, pcm_convert_quark(), 0,
"DSD to PCM conversion failed");