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

configure.ac: add macro MPD_ENABLE_AUTO_PKG

Browse Source 
Simplify the definition of many build options.
This commit is contained in:
Max Kellermann
2014-11-21 22:19:57 +01:00
parent b3f5f2f75f
commit b3f5b4932c
19 changed files with 174 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pcm/ConfiguredResampler.cxx
View File

@@ -25,11 +25,11 @@
#include "config/ConfigError.hxx"
#include "util/Error.hxx"
#ifdef HAVE_LIBSAMPLERATE
#ifdef ENABLE_LIBSAMPLERATE
#include "LibsamplerateResampler.hxx"
#endif
#ifdef HAVE_SOXR
#ifdef ENABLE_SOXR
#include "SoxrResampler.hxx"
#endif
@@ -38,11 +38,11 @@
enum class SelectedResampler {
FALLBACK,
#ifdef HAVE_LIBSAMPLERATE
#ifdef ENABLE_LIBSAMPLERATE
LIBSAMPLERATE,
#endif
#ifdef HAVE_SOXR
#ifdef ENABLE_SOXR
SOXR,
#endif
};
@@ -58,14 +58,14 @@ pcm_resampler_global_init(Error &error)
if (strcmp(converter, "internal") == 0)
return true;
#ifdef HAVE_SOXR
#ifdef ENABLE_SOXR
if (memcmp(converter, "soxr", 4) == 0) {
selected_resampler = SelectedResampler::SOXR;
return pcm_resample_soxr_global_init(converter, error);
}
#endif
#ifdef HAVE_LIBSAMPLERATE
#ifdef ENABLE_LIBSAMPLERATE
selected_resampler = SelectedResampler::LIBSAMPLERATE;
return pcm_resample_lsr_global_init(converter, error);
#endif
@@ -86,12 +86,12 @@ pcm_resampler_create()
case SelectedResampler::FALLBACK:
return new FallbackPcmResampler();
#ifdef HAVE_LIBSAMPLERATE
#ifdef ENABLE_LIBSAMPLERATE
case SelectedResampler::LIBSAMPLERATE:
return new LibsampleratePcmResampler();
#endif
#ifdef HAVE_SOXR
#ifdef ENABLE_SOXR
case SelectedResampler::SOXR:
return new SoxrPcmResampler();
#endif