oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm/ConfiguredResampler: convert boolean flag to enum

Browse Source 
Prepare for adding more resamplers.
This commit is contained in:
Max Kellermann 2013-12-01 13:11:19 +01:00
parent a698cc8112
commit 3ed80f3139
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/pcm/ConfiguredResampler.cxx
View File

@ -20,44 +20,62 @@
#include "config.h" #include "config.h"
#include "ConfiguredResampler.hxx" #include "ConfiguredResampler.hxx"
#include "FallbackResampler.hxx" #include "FallbackResampler.hxx"
#include "ConfigGlobal.hxx"
#include "ConfigOption.hxx"
#include "ConfigError.hxx"
#include "util/Error.hxx"
#ifdef HAVE_LIBSAMPLERATE #ifdef HAVE_LIBSAMPLERATE
#include "LibsamplerateResampler.hxx" #include "LibsamplerateResampler.hxx"
#include "ConfigGlobal.hxx"
#include "ConfigOption.hxx"
#endif #endif
#include <string.h> #include <string.h>
enum class SelectedResampler {
FALLBACK,
#ifdef HAVE_LIBSAMPLERATE #ifdef HAVE_LIBSAMPLERATE
static bool lsr_enabled; LIBSAMPLERATE,
#endif #endif
};
static SelectedResampler selected_resampler = SelectedResampler::FALLBACK;
bool bool
pcm_resampler_global_init(Error &error) pcm_resampler_global_init(Error &error)
{ {
#ifdef HAVE_LIBSAMPLERATE
const char *converter = const char *converter =
config_get_string(CONF_SAMPLERATE_CONVERTER, ""); config_get_string(CONF_SAMPLERATE_CONVERTER, "");
lsr_enabled = strcmp(converter, "internal") != 0; if (strcmp(converter, "internal") == 0)
if (lsr_enabled)
return pcm_resample_lsr_global_init(converter, error);
else
return true; return true;
#else
(void)error; #ifdef HAVE_LIBSAMPLERATE
return true; selected_resampler = SelectedResampler::LIBSAMPLERATE;
return pcm_resample_lsr_global_init(converter, error);
#endif #endif
if (*converter == 0)
return true;
error.Format(config_domain,
"The samplerate_converter '%s' is not available",
converter);
return false;
} }
PcmResampler * PcmResampler *
pcm_resampler_create() pcm_resampler_create()
{ {
switch (selected_resampler) {
case SelectedResampler::FALLBACK:
return new FallbackPcmResampler();
#ifdef HAVE_LIBSAMPLERATE #ifdef HAVE_LIBSAMPLERATE
if (lsr_enabled) case SelectedResampler::LIBSAMPLERATE:
return new LibsampleratePcmResampler(); return new LibsampleratePcmResampler();
#endif #endif
}
return new FallbackPcmResampler(); gcc_unreachable();
} }