Make the AmbDec speaker and matrix arrays dynamic

1 files changed, 17 insertions, 14 deletions

diff --git a/Alc/ambdec.h b/Alc/ambdec.h
index 99caf9a2..5ec5eb0c 100644
--- a/Alc/ambdec.h
+++ b/Alc/ambdec.h
@@ -1,9 +1,11 @@
 #ifndef AMBDEC_H
 #define AMBDEC_H
 
+#include <array>
 #include <string>
 
 #include "alMain.h"
+#include "vector.h"
 
 /* Helpers to read .ambdec configuration files. */
 
@@ -14,30 +16,31 @@ enum class AmbDecScale {
 };
 struct AmbDecConf {
     std::string Description;
-    ALuint Version; /* Must be 3 */
+    int Version; /* Must be 3 */
 
-    ALuint ChanMask;
-    ALuint FreqBands; /* Must be 1 or 2 */
-    ALsizei NumSpeakers;
+    unsigned int ChanMask;
+    unsigned int FreqBands; /* Must be 1 or 2 */
     AmbDecScale CoeffScale;
 
-    ALfloat XOverFreq;
-    ALfloat XOverRatio;
+    float XOverFreq;
+    float XOverRatio;
 
     struct SpeakerConf {
         std::string Name;
-        ALfloat Distance;
-        ALfloat Azimuth;
-        ALfloat Elevation;
+        float Distance{0.0f};
+        float Azimuth{0.0f};
+        float Elevation{0.0f};
         std::string Connection;
-    } Speakers[MAX_OUTPUT_CHANNELS];
+    };
+    al::vector<SpeakerConf> Speakers;
 
+    using CoeffArray = std::array<float,MAX_AMBI_COEFFS>;
     /* Unused when FreqBands == 1 */
-    ALfloat LFOrderGain[MAX_AMBI_ORDER+1];
-    ALfloat LFMatrix[MAX_OUTPUT_CHANNELS][MAX_AMBI_COEFFS];
+    float LFOrderGain[MAX_AMBI_ORDER+1];
+    al::vector<CoeffArray> LFMatrix;
 
-    ALfloat HFOrderGain[MAX_AMBI_ORDER+1];
-    ALfloat HFMatrix[MAX_OUTPUT_CHANNELS][MAX_AMBI_COEFFS];
+    float HFOrderGain[MAX_AMBI_ORDER+1];
+    al::vector<CoeffArray> HFMatrix;
 
     int load(const char *fname) noexcept;
 };