Update OpenAL-soft to 1.23.1-bc7cb17.

2026-08-18 03:34:25 +02:00 · 2024-03-20 11:06:03 +08:00
parent 4a512be715
commit 73a6fc9196
294 changed files with 44342 additions and 40077 deletions
@@ -8,145 +8,136 @@
 #include "effects.h"

 #ifdef ALSOFT_EAX
-#include "al/eax_exception.h"
+#include "al/eax/effect.h"
+#include "al/eax/exception.h"
 #endif // ALSOFT_EAX


 namespace {

-void Null_setParami(EffectProps* /*props*/, ALenum param, int /*val*/)
+constexpr EffectProps genDefaultProps() noexcept
 {
-    switch(param)
-    {
-    default:
-        throw effect_exception{AL_INVALID_ENUM, "Invalid null effect integer property 0x%04x",
-            param};
-    }
-}
-void Null_setParamiv(EffectProps *props, ALenum param, const int *vals)
-{
-    switch(param)
-    {
-    default:
-        Null_setParami(props, param, vals[0]);
-    }
-}
-void Null_setParamf(EffectProps* /*props*/, ALenum param, float /*val*/)
-{
-    switch(param)
-    {
-    default:
-        throw effect_exception{AL_INVALID_ENUM, "Invalid null effect float property 0x%04x",
-            param};
-    }
-}
-void Null_setParamfv(EffectProps *props, ALenum param, const float *vals)
-{
-    switch(param)
-    {
-    default:
-        Null_setParamf(props, param, vals[0]);
-    }
-}
-
-void Null_getParami(const EffectProps* /*props*/, ALenum param, int* /*val*/)
-{
-    switch(param)
-    {
-    default:
-        throw effect_exception{AL_INVALID_ENUM, "Invalid null effect integer property 0x%04x",
-            param};
-    }
-}
-void Null_getParamiv(const EffectProps *props, ALenum param, int *vals)
-{
-    switch(param)
-    {
-    default:
-        Null_getParami(props, param, vals);
-    }
-}
-void Null_getParamf(const EffectProps* /*props*/, ALenum param, float* /*val*/)
-{
-    switch(param)
-    {
-    default:
-        throw effect_exception{AL_INVALID_ENUM, "Invalid null effect float property 0x%04x",
-            param};
-    }
-}
-void Null_getParamfv(const EffectProps *props, ALenum param, float *vals)
-{
-    switch(param)
-    {
-    default:
-        Null_getParamf(props, param, vals);
-    }
-}
-
-EffectProps genDefaultProps() noexcept
-{
-    EffectProps props{};
-    return props;
+    return std::monostate{};
 }

 } // namespace

-DEFINE_ALEFFECT_VTABLE(Null);
-
 const EffectProps NullEffectProps{genDefaultProps()};

+void EffectHandler::SetParami(std::monostate& /*props*/, ALenum param, int /*val*/)
+{
+    switch(param)
+    {
+    default:
+        throw effect_exception{AL_INVALID_ENUM, "Invalid null effect integer property 0x%04x",
+            param};
+    }
+}
+void EffectHandler::SetParamiv(std::monostate &props, ALenum param, const int *vals)
+{
+    switch(param)
+    {
+    default:
+        SetParami(props, param, *vals);
+    }
+}
+void EffectHandler::SetParamf(std::monostate& /*props*/, ALenum param, float /*val*/)
+{
+    switch(param)
+    {
+    default:
+        throw effect_exception{AL_INVALID_ENUM, "Invalid null effect float property 0x%04x",
+            param};
+    }
+}
+void EffectHandler::SetParamfv(std::monostate &props, ALenum param, const float *vals)
+{
+    switch(param)
+    {
+    default:
+        SetParamf(props, param, *vals);
+    }
+}
+
+void EffectHandler::GetParami(const std::monostate& /*props*/, ALenum param, int* /*val*/)
+{
+    switch(param)
+    {
+    default:
+        throw effect_exception{AL_INVALID_ENUM, "Invalid null effect integer property 0x%04x",
+            param};
+    }
+}
+void EffectHandler::GetParamiv(const std::monostate &props, ALenum param, int *vals)
+{
+    switch(param)
+    {
+    default:
+        GetParami(props, param, vals);
+    }
+}
+void EffectHandler::GetParamf(const std::monostate& /*props*/, ALenum param, float* /*val*/)
+{
+    switch(param)
+    {
+    default:
+        throw effect_exception{AL_INVALID_ENUM, "Invalid null effect float property 0x%04x",
+            param};
+    }
+}
+void EffectHandler::GetParamfv(const std::monostate &props, ALenum param, float *vals)
+{
+    switch(param)
+    {
+    default:
+        GetParamf(props, param, vals);
+    }
+}
+

 #ifdef ALSOFT_EAX
 namespace {

-class EaxNullEffect final :
-    public EaxEffect
-{
-public:
-    EaxNullEffect();
-
-    void dispatch(const EaxEaxCall& eax_call) override;
-
-    // [[nodiscard]]
-    bool apply_deferred() override;
-}; // EaxNullEffect
-
-
-class EaxNullEffectException :
-    public EaxException
-{
-public:
-    explicit EaxNullEffectException(
-        const char* message)
-        :
-        EaxException{"EAX_NULL_EFFECT", message}
-    {
-    }
-}; // EaxNullEffectException
-
-
-EaxNullEffect::EaxNullEffect()
-    : EaxEffect{AL_EFFECT_NULL}
-{
-}
-
-void EaxNullEffect::dispatch(const EaxEaxCall& eax_call)
-{
-    if(eax_call.get_property_id() != 0)
-        throw EaxNullEffectException{"Unsupported property id."};
-}
-
-bool EaxNullEffect::apply_deferred()
-{
-    return false;
-}
+using NullCommitter = EaxCommitter<EaxNullCommitter>;

 } // namespace

-EaxEffectUPtr eax_create_eax_null_effect()
+template<>
+struct NullCommitter::Exception : public EaxException
 {
-    return std::make_unique<EaxNullEffect>();
+    explicit Exception(const char *message) : EaxException{"EAX_NULL_EFFECT", message}
+    { }
+};
+
+template<>
+[[noreturn]] void NullCommitter::fail(const char *message)
+{
+    throw Exception{message};
+}
+
+bool EaxNullCommitter::commit(const std::monostate &props)
+{
+    const bool ret{std::holds_alternative<std::monostate>(mEaxProps)};
+    mEaxProps = props;
+    mAlProps = std::monostate{};
+    return ret;
+}
+
+void EaxNullCommitter::SetDefaults(EaxEffectProps &props)
+{
+    props = std::monostate{};
+}
+
+void EaxNullCommitter::Get(const EaxCall &call, const std::monostate&)
+{
+    if(call.get_property_id() != 0)
+        fail_unknown_property_id();
+}
+
+void EaxNullCommitter::Set(const EaxCall &call, std::monostate&)
+{
+    if(call.get_property_id() != 0)
+        fail_unknown_property_id();
 }

 #endif // ALSOFT_EAX