aboutsummaryrefslogtreecommitdiffstats
path: root/OpenAL32
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2016-07-17 00:46:18 -0700
committerChris Robinson <[email protected]>2016-07-17 00:46:18 -0700
commit84ca38ba957d90b6b864cd50cc313e4a7fe1386c (patch)
tree46574d3d67e8d480ae0b5141d2734dfaebe59df1 /OpenAL32
parent35cbecabf91fe449bb7209aa98ba7461bfd078a2 (diff)
Make a MAX_AMBI2D_COEFFS macro instead of a magic number
Diffstat (limited to 'OpenAL32')
-rw-r--r--OpenAL32/Include/alMain.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 13aadef5..05abc0fa 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -485,7 +485,8 @@ enum RenderMode {
/* The maximum number of Ambisonics coefficients. For a given order (o), the
* size needed will be (o+1)**2, thus zero-order has 1, first-order has 4,
- * second-order has 9, third-order has 16, and fourth-order has 25. */
+ * second-order has 9, third-order has 16, and fourth-order has 25.
+ */
#define MAX_AMBI_ORDER 3
#define MAX_AMBI_COEFFS ((MAX_AMBI_ORDER+1) * (MAX_AMBI_ORDER+1))
@@ -497,6 +498,12 @@ enum RenderMode {
*/
#define AMBI_PERIPHONIC_MASK (0xfe7ce4)
+/* The maximum number of Ambisonic coefficients for 2D (non-periphonic)
+ * representation. This is 2 per each order above zero-order, plus 1 for zero-
+ * order. Or simply, o*2 + 1.
+ */
+#define MAX_AMBI2D_COEFFS (MAX_AMBI_ORDER*2 + 1)
+
typedef ALfloat ChannelConfig[MAX_AMBI_COEFFS];
typedef struct BFChannelConfig {