diff --git a/README.md b/README.md index b20d761..dd7fa57 100644 --- a/README.md +++ b/README.md @@ -416,12 +416,8 @@ Intel IPP -Dfft=ipp -DHAVE_IPP Proprietary, can only be used with Library Build option CPP define Notes ---- ------------ ---------- ----- -libsamplerate -DHAVE_LIBSAMPLERATE - -Dresampler=libsamplerate Default when found. - Good choice in most cases. - Built-in -Dfft=builtin -DUSE_BQRESAMPLER - Default when libsamplerate not found. + Default. Can be distributed with either the Rubber Band GPL or commercial licence. Intended to @@ -430,6 +426,9 @@ Built-in -Dfft=builtin -DUSE_BQRESAMPLER Newer than, and not as well-tested as, libsamplerate. +libsamplerate -DHAVE_LIBSAMPLERATE + -Dresampler=libsamplerate Good choice in most cases. + Speex -DUSE_SPEEX -Dresampler=speex Can be distributed with either the Rubber Band GPL or diff --git a/meson.build b/meson.build index 601f197..42aa419 100644 --- a/meson.build +++ b/meson.build @@ -140,11 +140,7 @@ if fft == 'auto' endif if resampler == 'auto' - if samplerate_dep.found() - resampler = 'libsamplerate' - else - resampler = 'builtin' - endif + resampler = 'builtin' endif if fft == 'builtin' @@ -205,6 +201,9 @@ endif # fft if resampler == 'builtin' config_summary += { 'Resampler': 'Built-in' } message('For resampler: using built-in implementation') + if samplerate_dep.found() + message('(to use libsamplerate instead, reconfigure with -Dresampler=libsamplerate)') + endif library_sources += 'src/dsp/BQResampler.cpp' feature_defines += ['-DUSE_BQRESAMPLER'] diff --git a/meson_options.txt b/meson_options.txt index 76e7875..c820c20 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -9,7 +9,7 @@ option('resampler', type: 'combo', choices: ['auto', 'builtin', 'libsamplerate', 'speex', 'ipp'], value: 'auto', - description: 'Resampler library to use. The default (auto) will use libsamplerate if available, the builtin implementation otherwise.') + description: 'Resampler library to use. The default (auto) simply uses the builtin implementation.') option('ipp_path', type: 'string',