Merge remote-tracking branch 'upstream/master'

1 files changed, 6 insertions, 1 deletions

diff --git a/al/auxeffectslot.h b/al/auxeffectslot.h
index 3e9a2a4e..1ad0ffc4 100644
--- a/al/auxeffectslot.h
+++ b/al/auxeffectslot.h
@@ -3,6 +3,7 @@
 
 #include <atomic>
 #include <cstddef>
+#include <string_view>
 
 #include "AL/al.h"
 #include "AL/alc.h"
@@ -45,6 +46,7 @@ enum class SlotState : ALenum {
 };
 
 struct ALeffectslot {
+    ALuint EffectId{};
     float Gain{1.0f};
     bool  AuxSendAuto{true};
     ALeffectslot *Target{nullptr};
@@ -73,9 +75,12 @@ struct ALeffectslot {
     ALeffectslot& operator=(const ALeffectslot&) = delete;
     ~ALeffectslot();
 
-    ALenum initEffect(ALenum effectType, const EffectProps &effectProps, ALCcontext *context);
+    ALenum initEffect(ALuint effectId, ALenum effectType, const EffectProps &effectProps,
+        ALCcontext *context);
     void updateProps(ALCcontext *context);
 
+    static void SetName(ALCcontext *context, ALuint id, std::string_view name);
+
     /* This can be new'd for the context's default effect slot. */
     DEF_NEWDEL(ALeffectslot)