From d51b93f8697ef562f09c843df31aaeb773d3caff Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sun, 11 Sep 2011 07:42:23 -0700
Subject: Remove the union from the effect parameter types

---
 OpenAL32/Include/alEffect.h | 98 ++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 50 deletions(-)

(limited to 'OpenAL32/Include')

diff --git a/OpenAL32/Include/alEffect.h b/OpenAL32/Include/alEffect.h
index f5274d4a..c7b0062a 100644
--- a/OpenAL32/Include/alEffect.h
+++ b/OpenAL32/Include/alEffect.h
@@ -26,56 +26,54 @@ typedef struct ALeffect
     // Effect type (AL_EFFECT_NULL, ...)
     ALenum type;
 
-    union {
-        struct {
-            // Shared Reverb Properties
-            ALfloat Density;
-            ALfloat Diffusion;
-            ALfloat Gain;
-            ALfloat GainHF;
-            ALfloat DecayTime;
-            ALfloat DecayHFRatio;
-            ALfloat ReflectionsGain;
-            ALfloat ReflectionsDelay;
-            ALfloat LateReverbGain;
-            ALfloat LateReverbDelay;
-            ALfloat AirAbsorptionGainHF;
-            ALfloat RoomRolloffFactor;
-            ALboolean DecayHFLimit;
-
-            // Additional EAX Reverb Properties
-            ALfloat GainLF;
-            ALfloat DecayLFRatio;
-            ALfloat ReflectionsPan[3];
-            ALfloat LateReverbPan[3];
-            ALfloat EchoTime;
-            ALfloat EchoDepth;
-            ALfloat ModulationTime;
-            ALfloat ModulationDepth;
-            ALfloat HFReference;
-            ALfloat LFReference;
-        } Reverb;
-
-        struct {
-            ALfloat Delay;
-            ALfloat LRDelay;
-
-            ALfloat Damping;
-            ALfloat Feedback;
-
-            ALfloat Spread;
-        } Echo;
-
-        struct {
-            ALfloat Frequency;
-            ALfloat HighPassCutoff;
-            ALint Waveform;
-        } Modulator;
-
-        struct {
-            ALfloat Gain;
-        } Dedicated;
-    } Params;
+    struct {
+        // Shared Reverb Properties
+        ALfloat Density;
+        ALfloat Diffusion;
+        ALfloat Gain;
+        ALfloat GainHF;
+        ALfloat DecayTime;
+        ALfloat DecayHFRatio;
+        ALfloat ReflectionsGain;
+        ALfloat ReflectionsDelay;
+        ALfloat LateReverbGain;
+        ALfloat LateReverbDelay;
+        ALfloat AirAbsorptionGainHF;
+        ALfloat RoomRolloffFactor;
+        ALboolean DecayHFLimit;
+
+        // Additional EAX Reverb Properties
+        ALfloat GainLF;
+        ALfloat DecayLFRatio;
+        ALfloat ReflectionsPan[3];
+        ALfloat LateReverbPan[3];
+        ALfloat EchoTime;
+        ALfloat EchoDepth;
+        ALfloat ModulationTime;
+        ALfloat ModulationDepth;
+        ALfloat HFReference;
+        ALfloat LFReference;
+    } Reverb;
+
+    struct {
+        ALfloat Delay;
+        ALfloat LRDelay;
+
+        ALfloat Damping;
+        ALfloat Feedback;
+
+        ALfloat Spread;
+    } Echo;
+
+    struct {
+        ALfloat Frequency;
+        ALfloat HighPassCutoff;
+        ALint Waveform;
+    } Modulator;
+
+    struct {
+        ALfloat Gain;
+    } Dedicated;
 
     // Index to itself
     ALuint effect;
-- 
cgit v1.2.3