diff options
| author | Max Kellermann <max@musicpd.org> | 2020-01-17 19:11:10 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2020-01-17 19:11:10 +0100 |
| commit | 8db86e282058dedae5837402370a3921b7e677c9 (patch) | |
| tree | 457c8462b9808c00b3b23eb74d7a4834d9b20156 /src | |
| parent | c84bae739a29ec27790c5534b7fc777d6f40a02f (diff) | |
Revert "pcm/Convert: add option to enable the integer-only dsd2pcm implementation"
This reverts commit c84bae739a29ec27790c5534b7fc777d6f40a02f. A
configuration option is not necessary, because the PcmConvert
constructor knows already whether integer or floating point is needed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/Option.hxx | 1 | ||||
| -rw-r--r-- | src/config/Templates.cxx | 1 | ||||
| -rw-r--r-- | src/pcm/Convert.cxx | 19 |
3 files changed, 0 insertions, 21 deletions
diff --git a/src/config/Option.hxx b/src/config/Option.hxx index f8994124e..0344b6695 100644 --- a/src/config/Option.hxx +++ b/src/config/Option.hxx @@ -79,7 +79,6 @@ enum class ConfigOption { DESPOTIFY_USER, DESPOTIFY_PASSWORD, DESPOTIFY_HIGH_BITRATE, - DSD2PCM_CONVERTER, MAX }; diff --git a/src/config/Templates.cxx b/src/config/Templates.cxx index 48a680242..01205c3d0 100644 --- a/src/config/Templates.cxx +++ b/src/config/Templates.cxx @@ -75,7 +75,6 @@ const ConfigTemplate config_param_templates[] = { { "despotify_user", false, true }, { "despotify_password", false, true }, { "despotify_high_bitrate", false, true }, - { "dsd2pcm_converter" }, }; static constexpr unsigned n_config_param_templates = diff --git a/src/pcm/Convert.cxx b/src/pcm/Convert.cxx index 9cc2e0cec..1cfd186d8 100644 --- a/src/pcm/Convert.cxx +++ b/src/pcm/Convert.cxx @@ -19,35 +19,16 @@ #include "Convert.hxx" #include "ConfiguredResampler.hxx" -#include "config/Data.hxx" #include "util/ConstBuffer.hxx" -#include "util/StringAPI.hxx" #include <stdexcept> #include <assert.h> -#ifdef ENABLE_DSD -static bool dsd2pcm_integer = false; -#endif - void pcm_convert_global_init(const ConfigData &config) { pcm_resampler_global_init(config); - -#ifdef ENABLE_DSD - dsd2pcm_integer = config.With(ConfigOption::DSD2PCM_CONVERTER, [](const char *s){ - if (s == nullptr) - return false; - else if (StringIsEqual(s, "float")) - return false; - else if (StringIsEqual(s, "integer")) - return true; - else - throw std::runtime_error("Unrecognized value"); - }); -#endif } PcmConvert::PcmConvert(const AudioFormat _src_format, |