From 24df52c0420128ec9808cd65efa1aad7fd6827ec Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Wed, 5 Jun 2019 23:00:28 -0700
Subject: Remove the per-voice ChannelsPerOrder field

---
 OpenAL32/Include/alMain.h | 2 +-
 OpenAL32/Include/alu.h    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenAL32/Include')

diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 0534751f..e0639825 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -411,7 +411,7 @@ struct ALCdevice {
 
     /* The "dry" path corresponds to the main output. */
     MixParams Dry;
-    ALsizei NumChannelsPerOrder[MAX_AMBI_ORDER+1]{};
+    ALuint NumChannelsPerOrder[MAX_AMBI_ORDER+1]{};
 
     /* "Real" output, which will be written to the device buffer. May alias the
      * dry buffer.
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 25a1d422..3e18f857 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -256,7 +256,6 @@ struct ALvoice {
     struct DirectData {
         int FilterType;
         al::span<FloatBufferLine> Buffer;
-        ALsizei ChannelsPerOrder[MAX_AMBI_ORDER+1];
     };
     DirectData mDirect;
 
-- 
cgit v1.2.3