diff options
| -rw-r--r-- | al/eax_utils.h | 34 | ||||
| -rw-r--r-- | al/listener.cpp | 34 |
2 files changed, 19 insertions, 49 deletions
diff --git a/al/eax_utils.h b/al/eax_utils.h index 68e35fcd..d3d4a196 100644 --- a/al/eax_utils.h +++ b/al/eax_utils.h @@ -1,17 +1,12 @@ #ifndef EAX_UTILS_INCLUDED #define EAX_UTILS_INCLUDED - -#include <cstdint> - #include <algorithm> +#include <cstdint> #include <string> #include <type_traits> -struct ALCcontext; - - struct EaxAlLowPassParam { float gain; @@ -19,33 +14,6 @@ struct EaxAlLowPassParam }; // EaxAlLowPassParam -// Required to call macro `DO_UPDATEPROPS`. -class EaxAlContextWrapper -{ -public: - explicit EaxAlContextWrapper( - ALCcontext& al_context) noexcept - : - al_context_{&al_context} - { - } - - constexpr ALCcontext* get() noexcept - { - return al_context_; - } - - constexpr ALCcontext* operator->() noexcept - { - return al_context_; - } - - -private: - ALCcontext* al_context_; -}; // EaxAlContextWrapper - - void eax_log_exception( const char* message = nullptr) noexcept; diff --git a/al/listener.cpp b/al/listener.cpp index 16c3f6a5..97652a9a 100644 --- a/al/listener.cpp +++ b/al/listener.cpp @@ -36,13 +36,17 @@ #include "opthelpers.h" -#define DO_UPDATEPROPS() do { \ - if(!context->mDeferUpdates.load(std::memory_order_acquire)) \ - UpdateListenerProps(context.get()); \ - else \ - listener.mPropsDirty.set(std::memory_order_release); \ -} while(0) +namespace { +inline void UpdateProps(ALlistener &listener, ALCcontext *context) +{ + if(!context->mDeferUpdates.load(std::memory_order_acquire)) + UpdateListenerProps(context); + else + listener.mPropsDirty.set(std::memory_order_release); +} + +} // namespace AL_API void AL_APIENTRY alListenerf(ALenum param, ALfloat value) START_API_FUNC @@ -58,14 +62,14 @@ START_API_FUNC if(!(value >= 0.0f && std::isfinite(value))) SETERR_RETURN(context, AL_INVALID_VALUE,, "Listener gain out of range"); listener.Gain = value; - DO_UPDATEPROPS(); + UpdateProps(listener, context.get()); break; case AL_METERS_PER_UNIT: if(!(value >= AL_MIN_METERS_PER_UNIT && value <= AL_MAX_METERS_PER_UNIT)) SETERR_RETURN(context, AL_INVALID_VALUE,, "Listener meters per unit out of range"); listener.mMetersPerUnit = value; - DO_UPDATEPROPS(); + UpdateProps(listener, context.get()); break; default: @@ -90,7 +94,7 @@ START_API_FUNC listener.Position[0] = value1; listener.Position[1] = value2; listener.Position[2] = value3; - DO_UPDATEPROPS(); + UpdateProps(listener, context.get()); break; case AL_VELOCITY: @@ -99,7 +103,7 @@ START_API_FUNC listener.Velocity[0] = value1; listener.Velocity[1] = value2; listener.Velocity[2] = value3; - DO_UPDATEPROPS(); + UpdateProps(listener, context.get()); break; default: @@ -146,7 +150,7 @@ START_API_FUNC listener.OrientUp[0] = values[3]; listener.OrientUp[1] = values[4]; listener.OrientUp[2] = values[5]; - DO_UPDATEPROPS(); + UpdateProps(listener, context.get()); break; default: @@ -457,18 +461,16 @@ void eax_set_al_listener_meters_per_unit( ALCcontext& al_context, ALfloat meters_per_unit) { - auto context = EaxAlContextWrapper{al_context}; - - auto& listener = context->mListener; + auto& listener = al_context.mListener; if (meters_per_unit < AL_MIN_METERS_PER_UNIT || meters_per_unit > AL_MAX_METERS_PER_UNIT) { - SETERR_RETURN(context, AL_INVALID_VALUE,, "Listener meters per unit out of range"); + SETERR_RETURN(&al_context, AL_INVALID_VALUE,, "Listener meters per unit out of range"); } listener.mMetersPerUnit = meters_per_unit; - DO_UPDATEPROPS(); + UpdateProps(listener, &al_context); } #endif // ALSOFT_EAX |