Use a span for MixParams

2 files changed, 3 insertions, 4 deletions

diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index d7c22546..2237d3c8 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -308,10 +308,9 @@ using FloatBufferLine = std::array<float,BUFFERSIZE>;
 
 struct MixParams {
     /* Coefficient channel mapping for mixing to the buffer. */
-    std::array<BFChannelConfig,MAX_OUTPUT_CHANNELS> AmbiMap;
+    std::array<BFChannelConfig,MAX_OUTPUT_CHANNELS> AmbiMap{};
 
-    FloatBufferLine *Buffer{nullptr};
-    ALuint NumChannels{0u};
+    al::span<FloatBufferLine> Buffer;
 };
 
 struct RealMixParams {
diff --git a/OpenAL32/alAuxEffectSlot.cpp b/OpenAL32/alAuxEffectSlot.cpp
index 249f7cf3..55fbc622 100644
--- a/OpenAL32/alAuxEffectSlot.cpp
+++ b/OpenAL32/alAuxEffectSlot.cpp
@@ -643,7 +643,7 @@ ALenum InitializeEffect(ALCcontext *Context, ALeffectslot *EffectSlot, ALeffect
         FPUCtl mixer_mode{};
         ALCdevice *Device{Context->Device};
         std::unique_lock<std::mutex> statelock{Device->StateLock};
-        State->mOutTarget = {Device->Dry.Buffer, Device->Dry.NumChannels};
+        State->mOutTarget = Device->Dry.Buffer;
         if(State->deviceUpdate(Device) == AL_FALSE)
         {
             statelock.unlock();