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

decoder/sidplay: drop support for libsidplayfp < 1.8

Browse Source
This commit is contained in:
Max Kellermann 2020-05-05 13:53:09 +02:00
parent e251fd0053
commit 1787aa5e00
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/decoder/plugins/SidplayDecoderPlugin.cxx
View File

@ -60,10 +60,6 @@
#include <string.h> #include <string.h>
#ifdef HAVE_SIDPLAYFP
#define LIBSIDPLAYFP_VERSION GCC_MAKE_VERSION(LIBSIDPLAYFP_VERSION_MAJ, LIBSIDPLAYFP_VERSION_MIN, LIBSIDPLAYFP_VERSION_LEV)
#endif
#define SUBTUNE_PREFIX "tune_" #define SUBTUNE_PREFIX "tune_"
static constexpr Domain sidplay_domain("sidplay"); static constexpr Domain sidplay_domain("sidplay");
@ -365,11 +361,7 @@ sidplay_file_decode(DecoderClient &client, Path path_fs)
#endif #endif
#ifdef HAVE_SIDPLAYFP #ifdef HAVE_SIDPLAYFP
#if LIBSIDPLAYFP_VERSION >= GCC_MAKE_VERSION(1,8,0)
const bool stereo = tune.getInfo()->sidChips() >= 2; const bool stereo = tune.getInfo()->sidChips() >= 2;
#else
const bool stereo = tune.getInfo()->isStereo();
#endif
#else #else
const bool stereo = tune.isStereo(); const bool stereo = tune.isStereo();
#endif #endif

2
src/decoder/plugins/meson.build
View File

@ -136,7 +136,7 @@ if wildmidi_dep.found()
endif endif
if not get_option('sidplay').disabled() if not get_option('sidplay').disabled()
libsidplayfp_dep = dependency('libsidplayfp', required: false) libsidplayfp_dep = dependency('libsidplayfp', version: '>= 1.8', required: false)
conf.set('HAVE_SIDPLAYFP', libsidplayfp_dep.found()) conf.set('HAVE_SIDPLAYFP', libsidplayfp_dep.found())
if libsidplayfp_dep.found() if libsidplayfp_dep.found()