From 90c3fe22f538cb4fd9fb441fffa0b21cff5c5ed5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 21 Apr 2023 17:28:19 +0200 Subject: [PATCH] decoder/openmpt: check libopenmpt version at compile time, not at configure time --- src/decoder/plugins/OpenmptDecoderPlugin.cxx | 7 +++---- src/decoder/plugins/meson.build | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/decoder/plugins/OpenmptDecoderPlugin.cxx b/src/decoder/plugins/OpenmptDecoderPlugin.cxx index 0b3d3eca4..49e8d0dc0 100644 --- a/src/decoder/plugins/OpenmptDecoderPlugin.cxx +++ b/src/decoder/plugins/OpenmptDecoderPlugin.cxx @@ -2,7 +2,6 @@ // Copyright The Music Player Daemon Project #include "OpenmptDecoderPlugin.hxx" -#include "decoder/Features.h" #include "ModCommon.hxx" #include "../DecoderAPI.hxx" #include "input/InputStream.hxx" @@ -28,7 +27,7 @@ static int openmpt_volume_ramping; static bool openmpt_sync_samples; static std::string_view openmpt_at_end; static bool openmpt_emulate_amiga; -#ifdef HAVE_LIBOPENMPT_VERSION_0_5 +#if OPENMPT_API_VERSION_AT_LEAST(0,5,0) static std::string_view openmpt_emulate_amiga_type; #endif @@ -43,7 +42,7 @@ openmpt_decoder_init(const ConfigBlock &block) openmpt_sync_samples = block.GetBlockValue("sync_samples", true); openmpt_at_end = block.GetBlockValue("at_end", "fadeout"); openmpt_emulate_amiga = block.GetBlockValue("emulate_amiga", true); -#ifdef HAVE_LIBOPENMPT_VERSION_0_5 +#if OPENMPT_API_VERSION_AT_LEAST(0,5,0) openmpt_emulate_amiga_type = block.GetBlockValue("emulate_amiga_type", "auto"); #endif @@ -74,7 +73,7 @@ mod_decode(DecoderClient &client, InputStream &is) mod.set_render_param(mod.RENDER_INTERPOLATIONFILTER_LENGTH, 0); } mod.set_render_param(mod.RENDER_VOLUMERAMPING_STRENGTH, openmpt_volume_ramping); -#ifdef HAVE_LIBOPENMPT_VERSION_0_5 +#if OPENMPT_API_VERSION_AT_LEAST(0,5,0) mod.ctl_set_boolean("seek.sync_samples", openmpt_sync_samples); mod.ctl_set_boolean("render.resampler.emulate_amiga", openmpt_emulate_amiga); mod.ctl_set_text("render.resampler.emulate_amiga_type", openmpt_emulate_amiga_type); diff --git a/src/decoder/plugins/meson.build b/src/decoder/plugins/meson.build index 3a34b4049..bb874b1f6 100644 --- a/src/decoder/plugins/meson.build +++ b/src/decoder/plugins/meson.build @@ -109,7 +109,6 @@ endif libopenmpt_dep = dependency('libopenmpt', required: get_option('openmpt')) decoder_features.set('ENABLE_OPENMPT', libopenmpt_dep.found()) -decoder_features.set('HAVE_LIBOPENMPT_VERSION_0_5', libopenmpt_dep.version().version_compare('>= 0.5')) if libopenmpt_dep.found() decoder_plugins_sources += [ 'OpenmptDecoderPlugin.cxx',