Use an ALeffectProps union to store the effect properties

2 files changed, 11 insertions, 6 deletions

diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index d7062ff7..24614fa4 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -73,7 +73,8 @@ static const struct ALeffectStateFactoryVtable T##_ALeffectStateFactory_vtable =
 
 struct ALeffectslot
 {
-    ALeffect effect;
+    ALenum EffectType;
+    ALeffectProps EffectProps;
 
     volatile ALfloat   Gain;
     volatile ALboolean AuxSendAuto;
diff --git a/OpenAL32/Include/alEffect.h b/OpenAL32/Include/alEffect.h
index cea785dc..c0bbb40a 100644
--- a/OpenAL32/Include/alEffect.h
+++ b/OpenAL32/Include/alEffect.h
@@ -59,11 +59,7 @@ extern const struct ALeffectVtable ALnull_vtable;
 extern const struct ALeffectVtable ALdedicated_vtable;
 
 
-struct ALeffect
-{
-    // Effect type (AL_EFFECT_NULL, ...)
-    ALenum type;
-
+typedef union ALeffectProps {
     struct {
         // Shared Reverb Properties
         ALfloat Density;
@@ -152,6 +148,14 @@ struct ALeffect
         ALfloat EQCenter;
         ALfloat EQBandwidth;
     } Distortion;
+} ALeffectProps;
+
+struct ALeffect
+{
+    // Effect type (AL_EFFECT_NULL, ...)
+    ALenum type;
+
+    ALeffectProps Props;
 
     const struct ALeffectVtable *vtbl;