diff options
Diffstat (limited to 'alc')
| -rw-r--r-- | alc/alc.cpp | 8 | ||||
| -rw-r--r-- | alc/context.cpp | 12 | ||||
| -rw-r--r-- | alc/context.h | 28 | ||||
| -rw-r--r-- | alc/device.h | 4 |
4 files changed, 24 insertions, 28 deletions
diff --git a/alc/alc.cpp b/alc/alc.cpp index b9f322a3..4effcc67 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -155,7 +155,7 @@ #include "backends/wave.h" #endif -#if ALSOFT_EAX +#ifdef ALSOFT_EAX #include "al/eax_globals.h" #include "al/eax_x_ram.h" #endif // ALSOFT_EAX @@ -881,7 +881,7 @@ constexpr struct { DECL(AL_STOP_SOURCES_ON_DISCONNECT_SOFT), -#if ALSOFT_EAX +#ifdef ALSOFT_EAX DECL(AL_EAX_RAM_SIZE), DECL(AL_EAX_RAM_FREE), DECL(AL_STORAGE_AUTOMATIC), @@ -1258,7 +1258,7 @@ void alc_initconfig(void) if(defrevopt || (defrevopt=ConfigValueStr(nullptr, nullptr, "default-reverb"))) LoadReverbPreset(defrevopt->c_str(), &ALCcontext::sDefaultEffect); -#if ALSOFT_EAX +#ifdef ALSOFT_EAX { constexpr auto eax_block_name = "eax"; @@ -3223,7 +3223,7 @@ START_API_FUNC device->AuxiliaryEffectSlotMax = 64; device->NumAuxSends = DEFAULT_SENDS; -#if ALSOFT_EAX +#ifdef ALSOFT_EAX if (eax_g_is_enabled) { device->NumAuxSends = EAX_MAX_FXSLOTS; diff --git a/alc/context.cpp b/alc/context.cpp index d5fd94b2..33e9e7e0 100644 --- a/alc/context.cpp +++ b/alc/context.cpp @@ -29,7 +29,7 @@ #include "ringbuffer.h" #include "vecmat.h" -#if ALSOFT_EAX +#ifdef ALSOFT_EAX #include <cassert> #include <cstring> @@ -129,7 +129,7 @@ ALCcontext::~ALCcontext() mSourceList.clear(); mNumSources = 0; -#if ALSOFT_EAX +#ifdef ALSOFT_EAX eax_uninitialize(); #endif // ALSOFT_EAX @@ -172,7 +172,7 @@ void ALCcontext::init() mExtensionList = alExtList; -#if ALSOFT_EAX +#ifdef ALSOFT_EAX eax_initialize_extensions(); #endif // ALSOFT_EAX @@ -274,10 +274,8 @@ void ALCcontext::processUpdates() } } -#if ALSOFT_EAX -namespace -{ - +#ifdef ALSOFT_EAX +namespace { class ContextException : public EaxException diff --git a/alc/context.h b/alc/context.h index b34807b8..b964d813 100644 --- a/alc/context.h +++ b/alc/context.h @@ -19,17 +19,15 @@ #include "intrusive_ptr.h" #include "vector.h" -#if ALSOFT_EAX +#ifdef ALSOFT_EAX #include "al/filter.h" #include "al/eax_eax_call.h" #include "al/eax_fx_slot_index.h" #include "al/eax_fx_slots.h" #include "al/eax_utils.h" -#endif // ALSOFT_EAX -#if ALSOFT_EAX using EaxContextSharedDirtyFlagsValue = std::uint_least8_t; struct EaxContextSharedDirtyFlags @@ -206,7 +204,7 @@ public: DEF_NEWDEL(ALCcontext) -#if ALSOFT_EAX +#ifdef ALSOFT_EAX public: bool has_eax() const noexcept; @@ -549,20 +547,20 @@ void UpdateContextProps(ALCcontext *context); extern bool TrapALError; -#if ALSOFT_EAX +#ifdef ALSOFT_EAX ALenum AL_APIENTRY EAXSet( - const GUID* property_set_id, - ALuint property_id, - ALuint property_source_id, - ALvoid* property_value, - ALuint property_value_size) noexcept; + const GUID* property_set_id, + ALuint property_id, + ALuint property_source_id, + ALvoid* property_value, + ALuint property_value_size) noexcept; ALenum AL_APIENTRY EAXGet( - const GUID* property_set_id, - ALuint property_id, - ALuint property_source_id, - ALvoid* property_value, - ALuint property_value_size) noexcept; + const GUID* property_set_id, + ALuint property_id, + ALuint property_source_id, + ALvoid* property_value, + ALuint property_value_size) noexcept; #endif // ALSOFT_EAX #endif /* ALC_CONTEXT_H */ diff --git a/alc/device.h b/alc/device.h index e4eb76ea..daade87a 100644 --- a/alc/device.h +++ b/alc/device.h @@ -18,7 +18,7 @@ #include "intrusive_ptr.h" #include "vector.h" -#if ALSOFT_EAX +#ifdef ALSOFT_EAX #include "al/eax_x_ram.h" #endif // ALSOFT_EAX @@ -110,7 +110,7 @@ struct ALCdevice : public al::intrusive_ref<ALCdevice>, DeviceBase { std::mutex FilterLock; al::vector<FilterSubList> FilterList; -#if ALSOFT_EAX +#ifdef ALSOFT_EAX ALsizei eax_x_ram_free_size{eax_x_ram_max_size}; #endif // ALSOFT_EAX |