Restructure some voice fields

1 files changed, 8 insertions, 6 deletions

diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 44083688..642aeddc 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -247,15 +247,17 @@ struct ALvoice {
 
     ResamplerFunc mResampler;
 
+    InterpState mResampleState;
+
     ALuint mFlags;
 
-    using ResamplePaddingArray = std::array<ALfloat,MAX_RESAMPLE_PADDING*2>;
-    alignas(16) std::array<ResamplePaddingArray,MAX_INPUT_CHANNELS> mPrevSamples;
+    struct ResampleData {
+        alignas(16) std::array<ALfloat,MAX_RESAMPLE_PADDING*2> mPrevSamples;
 
-    InterpState mResampleState;
-
-    std::array<ALfloat,MAX_INPUT_CHANNELS> mAmbiScales;
-    std::array<BandSplitter,MAX_INPUT_CHANNELS> mAmbiSplitter;
+        ALfloat mAmbiScale;
+        BandSplitter mAmbiSplitter;
+    };
+    std::array<ResampleData,MAX_INPUT_CHANNELS> mResampleData;
 
     struct {
         int FilterType;