Change EAX, UWP, and RTKIT feature defines to 0/1 macros

kcat · Nov 14, 2024 · 6a74714 · 6a74714
1 parent 5f2fe8b
commit 6a74714
Show file tree

Hide file tree

Showing 35 changed files with 141 additions and 126 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1493,8 +1493,8 @@ set_target_properties(${IMPL_TARGET} PROPERTIES ${DEFAULT_TARGET_PROPS}
     SOVERSION ${LIB_MAJOR_VERSION}
 )
 target_compile_definitions(${IMPL_TARGET}
-    PRIVATE AL_BUILD_LIBRARY AL_ALEXT_PROTOTYPES $<$<BOOL:${ALSOFT_EAX}>:ALSOFT_EAX>
-    "ALC_API=${EXPORT_DECL}" "AL_API=${EXPORT_DECL}" ${CPP_DEFS})
+    PRIVATE AL_BUILD_LIBRARY AL_ALEXT_PROTOTYPES  "ALC_API=${EXPORT_DECL}" "AL_API=${EXPORT_DECL}"
+    ${CPP_DEFS})
 target_compile_options(${IMPL_TARGET} PRIVATE ${C_FLAGS})
 
 if(TARGET alsoft.build_version)

diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp
@@ -62,7 +62,7 @@
 #include "flexarray.h"
 #include "opthelpers.h"
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 #include "eax/api.h"
 #include "eax/call.h"
 #include "eax/effect.h"
@@ -1004,7 +1004,7 @@ EffectSlotSubList::~EffectSlotSubList()
     EffectSlots = nullptr;
 }
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 void ALeffectslot::eax_initialize(ALCcontext& al_context, EaxFxSlotIndexValue index)
 {
     if(index >= EAX_MAX_FXSLOTS)

diff --git a/al/auxeffectslot.h b/al/auxeffectslot.h
@@ -1,6 +1,8 @@
 #ifndef AL_AUXEFFECTSLOT_H
 #define AL_AUXEFFECTSLOT_H
 
+#include "config.h"
+
 #include <array>
 #include <atomic>
 #include <cstdint>
@@ -16,7 +18,7 @@
 #include "core/effectslot.h"
 #include "intrusive_ptr.h"
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 #include <memory>
 #include "eax/api.h"
 #include "eax/call.h"
@@ -28,7 +30,7 @@
 
 struct ALbuffer;
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 class EaxFxSlotException : public EaxException {
 public:
 	explicit EaxFxSlotException(const char* message)
@@ -79,7 +81,7 @@ struct ALeffectslot {
     static void SetName(ALCcontext *context, ALuint id, std::string_view name);
 
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 public:
     void eax_initialize(ALCcontext& al_context, EaxFxSlotIndexValue index);
 
@@ -360,7 +362,7 @@ struct ALeffectslot {
 
 void UpdateAllEffectSlotProps(ALCcontext *context);
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 using EaxAlEffectSlotUPtr = std::unique_ptr<ALeffectslot, ALeffectslot::EaxDeleter>;
 
 EaxAlEffectSlotUPtr eax_create_al_effect_slot(ALCcontext& context);

diff --git a/al/buffer.cpp b/al/buffer.cpp
@@ -60,7 +60,7 @@
 #include "intrusive_ptr.h"
 #include "opthelpers.h"
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 #include <unordered_set>
 
 #include "eax/globals.h"
@@ -113,7 +113,7 @@ constexpr auto EnumFromAmbiScaling(AmbiScaling scale) -> ALenum
     throw std::runtime_error{"Invalid AmbiScaling: "+std::to_string(int(scale))};
 }
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 constexpr auto EaxStorageFromEnum(ALenum scale) noexcept -> std::optional<EaxStorage>
 {
     switch(scale)
@@ -220,7 +220,7 @@ ALbuffer *AllocBuffer(ALCdevice *device) noexcept
 
 void FreeBuffer(ALCdevice *device, ALbuffer *buffer)
 {
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
     eax_x_ram_clear(*device, *buffer);
 #endif // ALSOFT_EAX
 
@@ -333,7 +333,7 @@ void LoadData(ALCcontext *context [[maybe_unused]], ALbuffer *ALBuf, ALsizei fre
 
     const size_t newsize{static_cast<size_t>(blocks) * BlockSize};
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
     if(ALBuf->eax_x_ram_mode == EaxStorage::Hardware)
     {
         ALCdevice &device = *context->mALDevice;
@@ -360,7 +360,7 @@ void LoadData(ALCcontext *context [[maybe_unused]], ALbuffer *ALBuf, ALsizei fre
         newdata.swap(ALBuf->mDataStorage);
     }
     ALBuf->mData = ALBuf->mDataStorage;
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
     eax_x_ram_clear(*context->mALDevice, *ALBuf);
 #endif
 
@@ -384,7 +384,7 @@ void LoadData(ALCcontext *context [[maybe_unused]], ALbuffer *ALBuf, ALsizei fre
     ALBuf->mLoopStart = 0;
     ALBuf->mLoopEnd = ALBuf->mSampleLen;
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
     if(eax_g_is_enabled && ALBuf->eax_x_ram_mode == EaxStorage::Hardware)
         eax_x_ram_apply(*context->mALDevice, *ALBuf);
 #endif
@@ -426,7 +426,7 @@ void PrepareCallback(ALCcontext *context [[maybe_unused]], ALbuffer *ALBuf, ALsi
     BufferVectorType(line_blocks*BlockSize).swap(ALBuf->mDataStorage);
     ALBuf->mData = ALBuf->mDataStorage;
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
     eax_x_ram_clear(*context->mALDevice, *ALBuf);
 #endif
 
@@ -507,7 +507,7 @@ void PrepareUserPtr(ALCcontext *context [[maybe_unused]], ALbuffer *ALBuf, ALsiz
         throw al::context_error{AL_OUT_OF_MEMORY,
             "Buffer size overflow, %d frames x %d bytes per frame", blocks, BlockSize};
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
     if(ALBuf->eax_x_ram_mode == EaxStorage::Hardware)
     {
         ALCdevice &device = *context->mALDevice;
@@ -521,7 +521,7 @@ void PrepareUserPtr(ALCcontext *context [[maybe_unused]], ALbuffer *ALBuf, ALsiz
     decltype(ALBuf->mDataStorage){}.swap(ALBuf->mDataStorage);
     ALBuf->mData = al::span{sdata, sdatalen};
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
     eax_x_ram_clear(*context->mALDevice, *ALBuf);
 #endif
 
@@ -541,7 +541,7 @@ void PrepareUserPtr(ALCcontext *context [[maybe_unused]], ALbuffer *ALBuf, ALsiz
     ALBuf->mLoopStart = 0;
     ALBuf->mLoopEnd = ALBuf->mSampleLen;
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
     if(ALBuf->eax_x_ram_mode == EaxStorage::Hardware)
         eax_x_ram_apply(*context->mALDevice, *ALBuf);
 #endif
@@ -1532,7 +1532,7 @@ BufferSubList::~BufferSubList()
 }
 
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 FORCE_ALIGN DECL_FUNC3(ALboolean, EAXSetBufferMode, ALsizei,n, const ALuint*,buffers, ALint,value)
 FORCE_ALIGN ALboolean AL_APIENTRY EAXSetBufferModeDirect(ALCcontext *context, ALsizei n,
     const ALuint *buffers, ALint value) noexcept

diff --git a/al/buffer.h b/al/buffer.h
@@ -1,6 +1,8 @@
 #ifndef AL_BUFFER_H
 #define AL_BUFFER_H
 
+#include "config.h"
+
 #include <array>
 #include <atomic>
 #include <cstddef>
@@ -17,7 +19,7 @@
 #include "core/buffer_storage.h"
 #include "vector.h"
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 enum class EaxStorage : uint8_t {
     Automatic,
     Accessible,
@@ -54,7 +56,7 @@ struct ALbuffer : public BufferStorage {
 
     DISABLE_ALLOC
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
     EaxStorage eax_x_ram_mode{EaxStorage::Automatic};
     bool eax_x_ram_is_hardware{};
 #endif // ALSOFT_EAX

diff --git a/al/effects/autowah.cpp b/al/effects/autowah.cpp
@@ -11,7 +11,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 #include "alnumeric.h"
 #include "al/eax/effect.h"
 #include "al/eax/exception.h"
@@ -103,7 +103,7 @@ void AutowahEffectHandler::GetParamf(const AutowahProps &props, ALenum param, fl
 void AutowahEffectHandler::GetParamfv(const AutowahProps &props, ALenum param, float *vals)
 { GetParamf(props, param, vals); }
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 namespace {
 
 using AutowahCommitter = EaxCommitter<EaxAutowahCommitter>;

diff --git a/al/effects/chorus.cpp b/al/effects/chorus.cpp
@@ -9,7 +9,7 @@
 
 #include "effects.h"
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 #include <cassert>
 #include "al/eax/effect.h"
 #include "al/eax/exception.h"
@@ -250,7 +250,7 @@ void FlangerEffectHandler::GetParamfv(const ChorusProps &props, ALenum param, fl
 { GetParamf(props, param, vals); }
 
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 namespace {
 
 struct EaxChorusTraits {

diff --git a/al/effects/compressor.cpp b/al/effects/compressor.cpp
@@ -7,8 +7,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#ifdef ALSOFT_EAX
-#include "alnumeric.h"
+#if ALSOFT_EAX
 #include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
@@ -74,7 +73,7 @@ void CompressorEffectHandler::GetParamfv(const CompressorProps&, ALenum param, f
 }
 
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 namespace {
 
 using CompressorCommitter = EaxCommitter<EaxCompressorCommitter>;

diff --git a/al/effects/distortion.cpp b/al/effects/distortion.cpp
@@ -7,7 +7,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 #include "alnumeric.h"
 #include "al/eax/effect.h"
 #include "al/eax/exception.h"
@@ -105,7 +105,7 @@ void DistortionEffectHandler::GetParamfv(const DistortionProps &props, ALenum pa
 { GetParamf(props, param, vals); }
 
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 namespace {
 
 using DistortionCommitter = EaxCommitter<EaxDistortionCommitter>;

diff --git a/al/effects/echo.cpp b/al/effects/echo.cpp
@@ -7,7 +7,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 #include "alnumeric.h"
 #include "al/eax/effect.h"
 #include "al/eax/exception.h"
@@ -102,7 +102,7 @@ void EchoEffectHandler::GetParamfv(const EchoProps &props, ALenum param, float *
 { GetParamf(props, param, vals); }
 
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 namespace {
 
 using EchoCommitter = EaxCommitter<EaxEchoCommitter>;

diff --git a/al/effects/equalizer.cpp b/al/effects/equalizer.cpp
@@ -7,7 +7,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 #include "alnumeric.h"
 #include "al/eax/effect.h"
 #include "al/eax/exception.h"
@@ -145,7 +145,7 @@ void EqualizerEffectHandler::GetParamfv(const EqualizerProps &props, ALenum para
 { GetParamf(props, param, vals); }
 
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 namespace {
 
 using EqualizerCommitter = EaxCommitter<EaxEqualizerCommitter>;

diff --git a/al/effects/fshifter.cpp b/al/effects/fshifter.cpp
@@ -10,9 +10,9 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 #include <cassert>
-#include "alnumeric.h"
+
 #include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
@@ -137,7 +137,7 @@ void FshifterEffectHandler::GetParamfv(const FshifterProps &props, ALenum param,
 { GetParamf(props, param, vals); }
 
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 namespace {
 
 using FrequencyShifterCommitter = EaxCommitter<EaxFrequencyShifterCommitter>;

diff --git a/al/effects/modulator.cpp b/al/effects/modulator.cpp
@@ -10,9 +10,9 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 #include <cassert>
-#include "alnumeric.h"
+
 #include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
@@ -133,7 +133,7 @@ void ModulatorEffectHandler::GetParamfv(const ModulatorProps &props, ALenum para
 { GetParamf(props, param, vals); }
 
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 namespace {
 
 using ModulatorCommitter = EaxCommitter<EaxModulatorCommitter>;

diff --git a/al/effects/null.cpp b/al/effects/null.cpp
@@ -7,7 +7,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 #include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #endif // ALSOFT_EAX
@@ -95,7 +95,7 @@ void NullEffectHandler::GetParamfv(const std::monostate &props, ALenum param, fl
 }
 
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 namespace {
 
 using NullCommitter = EaxCommitter<EaxNullCommitter>;

diff --git a/al/effects/pshifter.cpp b/al/effects/pshifter.cpp
@@ -7,8 +7,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#ifdef ALSOFT_EAX
-#include "alnumeric.h"
+#if ALSOFT_EAX
 #include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
@@ -85,7 +84,7 @@ void PshifterEffectHandler::GetParamfv(const PshifterProps&, ALenum param, float
 }
 
 
-#ifdef ALSOFT_EAX
+#if ALSOFT_EAX
 namespace {
 
 using PitchShifterCommitter = EaxCommitter<EaxPitchShifterCommitter>;