From 85a8f965e56dadf6928ca66503391029d7965928 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Thu, 11 Jan 2018 09:34:01 -0800
Subject: Clean up the EffectList members and make the list size known

---
 OpenAL32/Include/alEffect.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'OpenAL32/Include')

diff --git a/OpenAL32/Include/alEffect.h b/OpenAL32/Include/alEffect.h
index 394500e0..dbbd8966 100644
--- a/OpenAL32/Include/alEffect.h
+++ b/OpenAL32/Include/alEffect.h
@@ -10,16 +10,16 @@ extern "C" {
 struct ALeffect;
 
 enum {
-    AL__EAXREVERB = 0,
-    AL__REVERB,
-    AL__CHORUS,
-    AL__COMPRESSOR,
-    AL__DISTORTION,
-    AL__ECHO,
-    AL__EQUALIZER,
-    AL__FLANGER,
-    AL__MODULATOR,
-    AL__DEDICATED,
+    EAXREVERB_EFFECT = 0,
+    REVERB_EFFECT,
+    CHORUS_EFFECT,
+    COMPRESSOR_EFFECT,
+    DISTORTION_EFFECT,
+    ECHO_EFFECT,
+    EQUALIZER_EFFECT,
+    FLANGER_EFFECT,
+    MODULATOR_EFFECT,
+    DEDICATED_EFFECT,
 
     MAX_EFFECTS
 };
@@ -28,12 +28,12 @@ extern ALboolean DisabledEffects[MAX_EFFECTS];
 extern ALfloat ReverbBoost;
 
 struct EffectList {
-    const char *name;
+    const char name[16];
     int type;
-    const char *ename;
     ALenum val;
 };
-extern const struct EffectList EffectList[];
+#define EFFECTLIST_SIZE 11
+extern const struct EffectList EffectList[EFFECTLIST_SIZE];
 
 
 struct ALeffectVtable {
-- 
cgit v1.2.3