Add EFX types and enums to alext.h

The types and enums are in efx.h, which is included by alext.h. It's done this
way because EFX has a lot if definitions which would polute alext.h

3 files changed, 0 insertions, 199 deletions

diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index 76a0f537..21202f69 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -9,12 +9,6 @@
 extern "C" {
 #endif
 
-#define AL_EFFECTSLOT_EFFECT                               0x0001
-#define AL_EFFECTSLOT_GAIN                                 0x0002
-#define AL_EFFECTSLOT_AUXILIARY_SEND_AUTO                  0x0003
-
-#define AL_EFFECTSLOT_NULL                                 0x0000
-
 typedef struct ALeffectState ALeffectState;
 
 typedef struct ALeffectslot
diff --git a/OpenAL32/Include/alEffect.h b/OpenAL32/Include/alEffect.h
index 59b81165..16b9af3a 100644
--- a/OpenAL32/Include/alEffect.h
+++ b/OpenAL32/Include/alEffect.h
@@ -9,189 +9,6 @@
 extern "C" {
 #endif
 
-#define AL_EFFECT_TYPE                                     0x8001
-
-#define AL_EFFECT_NULL                                     0x0000
-#define AL_EFFECT_REVERB                                   0x0001
-#define AL_EFFECT_CHORUS                                   0x0002
-#define AL_EFFECT_DISTORTION                               0x0003
-#define AL_EFFECT_ECHO                                     0x0004
-#define AL_EFFECT_FLANGER                                  0x0005
-#define AL_EFFECT_FREQUENCY_SHIFTER                        0x0006
-#define AL_EFFECT_VOCAL_MORPHER                            0x0007
-#define AL_EFFECT_PITCH_SHIFTER                            0x0008
-#define AL_EFFECT_RING_MODULATOR                           0x0009
-#define AL_EFFECT_AUTOWAH                                  0x000A
-#define AL_EFFECT_COMPRESSOR                               0x000B
-#define AL_EFFECT_EQUALIZER                                0x000C
-#define AL_EFFECT_EAXREVERB                                0x8000
-
-#define AL_REVERB_DENSITY                                  0x0001
-#define AL_REVERB_DIFFUSION                                0x0002
-#define AL_REVERB_GAIN                                     0x0003
-#define AL_REVERB_GAINHF                                   0x0004
-#define AL_REVERB_DECAY_TIME                               0x0005
-#define AL_REVERB_DECAY_HFRATIO                            0x0006
-#define AL_REVERB_REFLECTIONS_GAIN                         0x0007
-#define AL_REVERB_REFLECTIONS_DELAY                        0x0008
-#define AL_REVERB_LATE_REVERB_GAIN                         0x0009
-#define AL_REVERB_LATE_REVERB_DELAY                        0x000A
-#define AL_REVERB_AIR_ABSORPTION_GAINHF                    0x000B
-#define AL_REVERB_ROOM_ROLLOFF_FACTOR                      0x000C
-#define AL_REVERB_DECAY_HFLIMIT                            0x000D
-
-#define AL_REVERB_MIN_DENSITY                              (0.0f)
-#define AL_REVERB_MAX_DENSITY                              (1.0f)
-#define AL_REVERB_DEFAULT_DENSITY                          (1.0f)
-#define AL_REVERB_MIN_DIFFUSION                            (0.0f)
-#define AL_REVERB_MAX_DIFFUSION                            (1.0f)
-#define AL_REVERB_DEFAULT_DIFFUSION                        (1.0f)
-#define AL_REVERB_MIN_GAIN                                 (0.0f)
-#define AL_REVERB_MAX_GAIN                                 (1.0f)
-#define AL_REVERB_DEFAULT_GAIN                             (0.32f)
-#define AL_REVERB_MIN_GAINHF                               (0.0f)
-#define AL_REVERB_MAX_GAINHF                               (1.0f)
-#define AL_REVERB_DEFAULT_GAINHF                           (0.89f)
-#define AL_REVERB_MIN_DECAY_TIME                           (0.1f)
-#define AL_REVERB_MAX_DECAY_TIME                           (20.0f)
-#define AL_REVERB_DEFAULT_DECAY_TIME                       (1.49f)
-#define AL_REVERB_MIN_DECAY_HFRATIO                        (0.1f)
-#define AL_REVERB_MAX_DECAY_HFRATIO                        (2.0f)
-#define AL_REVERB_DEFAULT_DECAY_HFRATIO                    (0.83f)
-#define AL_REVERB_MIN_REFLECTIONS_GAIN                     (0.0f)
-#define AL_REVERB_MAX_REFLECTIONS_GAIN                     (3.16f)
-#define AL_REVERB_DEFAULT_REFLECTIONS_GAIN                 (0.05f)
-#define AL_REVERB_MIN_REFLECTIONS_DELAY                    (0.0f)
-#define AL_REVERB_MAX_REFLECTIONS_DELAY                    (0.3f)
-#define AL_REVERB_DEFAULT_REFLECTIONS_DELAY                (0.007f)
-#define AL_REVERB_MIN_LATE_REVERB_GAIN                     (0.0f)
-#define AL_REVERB_MAX_LATE_REVERB_GAIN                     (10.0f)
-#define AL_REVERB_DEFAULT_LATE_REVERB_GAIN                 (1.26f)
-#define AL_REVERB_MIN_LATE_REVERB_DELAY                    (0.0f)
-#define AL_REVERB_MAX_LATE_REVERB_DELAY                    (0.1f)
-#define AL_REVERB_DEFAULT_LATE_REVERB_DELAY                (0.011f)
-#define AL_REVERB_MIN_AIR_ABSORPTION_GAINHF                (0.892f)
-#define AL_REVERB_MAX_AIR_ABSORPTION_GAINHF                (1.0f)
-#define AL_REVERB_DEFAULT_AIR_ABSORPTION_GAINHF            (0.994f)
-#define AL_REVERB_MIN_ROOM_ROLLOFF_FACTOR                  (0.0f)
-#define AL_REVERB_MAX_ROOM_ROLLOFF_FACTOR                  (10.0f)
-#define AL_REVERB_DEFAULT_ROOM_ROLLOFF_FACTOR              (0.0f)
-#define AL_REVERB_MIN_DECAY_HFLIMIT                        (AL_FALSE)
-#define AL_REVERB_MAX_DECAY_HFLIMIT                        (AL_TRUE)
-#define AL_REVERB_DEFAULT_DECAY_HFLIMIT                    (AL_TRUE)
-
-#define AL_ECHO_DELAY                                      0x0001
-#define AL_ECHO_LRDELAY                                    0x0002
-#define AL_ECHO_DAMPING                                    0x0003
-#define AL_ECHO_FEEDBACK                                   0x0004
-#define AL_ECHO_SPREAD                                     0x0005
-
-#define AL_ECHO_MIN_DELAY                                  (0.0f)
-#define AL_ECHO_MAX_DELAY                                  (0.207f)
-#define AL_ECHO_DEFAULT_DELAY                              (0.1f)
-#define AL_ECHO_MIN_LRDELAY                                (0.0f)
-#define AL_ECHO_MAX_LRDELAY                                (0.404f)
-#define AL_ECHO_DEFAULT_LRDELAY                            (0.1f)
-#define AL_ECHO_MIN_DAMPING                                (0.0f)
-#define AL_ECHO_MAX_DAMPING                                (0.99f)
-#define AL_ECHO_DEFAULT_DAMPING                            (0.5f)
-#define AL_ECHO_MIN_FEEDBACK                               (0.0f)
-#define AL_ECHO_MAX_FEEDBACK                               (1.0f)
-#define AL_ECHO_DEFAULT_FEEDBACK                           (0.5f)
-#define AL_ECHO_MIN_SPREAD                                 (-1.0f)
-#define AL_ECHO_MAX_SPREAD                                 (1.0f)
-#define AL_ECHO_DEFAULT_SPREAD                             (-1.0f)
-
-#define AL_EAXREVERB_DENSITY                               0x0001
-#define AL_EAXREVERB_DIFFUSION                             0x0002
-#define AL_EAXREVERB_GAIN                                  0x0003
-#define AL_EAXREVERB_GAINHF                                0x0004
-#define AL_EAXREVERB_GAINLF                                0x0005
-#define AL_EAXREVERB_DECAY_TIME                            0x0006
-#define AL_EAXREVERB_DECAY_HFRATIO                         0x0007
-#define AL_EAXREVERB_DECAY_LFRATIO                         0x0008
-#define AL_EAXREVERB_REFLECTIONS_GAIN                      0x0009
-#define AL_EAXREVERB_REFLECTIONS_DELAY                     0x000A
-#define AL_EAXREVERB_REFLECTIONS_PAN                       0x000B
-#define AL_EAXREVERB_LATE_REVERB_GAIN                      0x000C
-#define AL_EAXREVERB_LATE_REVERB_DELAY                     0x000D
-#define AL_EAXREVERB_LATE_REVERB_PAN                       0x000E
-#define AL_EAXREVERB_ECHO_TIME                             0x000F
-#define AL_EAXREVERB_ECHO_DEPTH                            0x0010
-#define AL_EAXREVERB_MODULATION_TIME                       0x0011
-#define AL_EAXREVERB_MODULATION_DEPTH                      0x0012
-#define AL_EAXREVERB_AIR_ABSORPTION_GAINHF                 0x0013
-#define AL_EAXREVERB_HFREFERENCE                           0x0014
-#define AL_EAXREVERB_LFREFERENCE                           0x0015
-#define AL_EAXREVERB_ROOM_ROLLOFF_FACTOR                   0x0016
-#define AL_EAXREVERB_DECAY_HFLIMIT                         0x0017
-
-#define AL_EAXREVERB_MIN_DENSITY                           (0.0f)
-#define AL_EAXREVERB_MAX_DENSITY                           (1.0f)
-#define AL_EAXREVERB_DEFAULT_DENSITY                       (1.0f)
-#define AL_EAXREVERB_MIN_DIFFUSION                         (0.0f)
-#define AL_EAXREVERB_MAX_DIFFUSION                         (1.0f)
-#define AL_EAXREVERB_DEFAULT_DIFFUSION                     (1.0f)
-#define AL_EAXREVERB_MIN_GAIN                              (0.0f)
-#define AL_EAXREVERB_MAX_GAIN                              (1.0f)
-#define AL_EAXREVERB_DEFAULT_GAIN                          (0.32f)
-#define AL_EAXREVERB_MIN_GAINHF                            (0.0f)
-#define AL_EAXREVERB_MAX_GAINHF                            (1.0f)
-#define AL_EAXREVERB_DEFAULT_GAINHF                        (0.89f)
-#define AL_EAXREVERB_MIN_GAINLF                            (0.0f)
-#define AL_EAXREVERB_MAX_GAINLF                            (1.0f)
-#define AL_EAXREVERB_DEFAULT_GAINLF                        (1.0f)
-#define AL_EAXREVERB_MIN_DECAY_TIME                        (0.1f)
-#define AL_EAXREVERB_MAX_DECAY_TIME                        (20.0f)
-#define AL_EAXREVERB_DEFAULT_DECAY_TIME                    (1.49f)
-#define AL_EAXREVERB_MIN_DECAY_HFRATIO                     (0.1f)
-#define AL_EAXREVERB_MAX_DECAY_HFRATIO                     (2.0f)
-#define AL_EAXREVERB_DEFAULT_DECAY_HFRATIO                 (0.83f)
-#define AL_EAXREVERB_MIN_DECAY_LFRATIO                     (0.1f)
-#define AL_EAXREVERB_MAX_DECAY_LFRATIO                     (2.0f)
-#define AL_EAXREVERB_DEFAULT_DECAY_LFRATIO                 (1.0f)
-#define AL_EAXREVERB_MIN_REFLECTIONS_GAIN                  (0.0f)
-#define AL_EAXREVERB_MAX_REFLECTIONS_GAIN                  (3.16f)
-#define AL_EAXREVERB_DEFAULT_REFLECTIONS_GAIN              (0.05f)
-#define AL_EAXREVERB_MIN_REFLECTIONS_DELAY                 (0.0f)
-#define AL_EAXREVERB_MAX_REFLECTIONS_DELAY                 (0.3f)
-#define AL_EAXREVERB_DEFAULT_REFLECTIONS_DELAY             (0.007f)
-#define AL_EAXREVERB_DEFAULT_REFLECTIONS_PAN_XYZ           (0.0f)
-#define AL_EAXREVERB_MIN_LATE_REVERB_GAIN                  (0.0f)
-#define AL_EAXREVERB_MAX_LATE_REVERB_GAIN                  (10.0f)
-#define AL_EAXREVERB_DEFAULT_LATE_REVERB_GAIN              (1.26f)
-#define AL_EAXREVERB_MIN_LATE_REVERB_DELAY                 (0.0f)
-#define AL_EAXREVERB_MAX_LATE_REVERB_DELAY                 (0.1f)
-#define AL_EAXREVERB_DEFAULT_LATE_REVERB_DELAY             (0.011f)
-#define AL_EAXREVERB_DEFAULT_LATE_REVERB_PAN_XYZ           (0.0f)
-#define AL_EAXREVERB_MIN_ECHO_TIME                         (0.075f)
-#define AL_EAXREVERB_MAX_ECHO_TIME                         (0.25f)
-#define AL_EAXREVERB_DEFAULT_ECHO_TIME                     (0.25f)
-#define AL_EAXREVERB_MIN_ECHO_DEPTH                        (0.0f)
-#define AL_EAXREVERB_MAX_ECHO_DEPTH                        (1.0f)
-#define AL_EAXREVERB_DEFAULT_ECHO_DEPTH                    (0.0f)
-#define AL_EAXREVERB_MIN_MODULATION_TIME                   (0.04f)
-#define AL_EAXREVERB_MAX_MODULATION_TIME                   (4.0f)
-#define AL_EAXREVERB_DEFAULT_MODULATION_TIME               (0.25f)
-#define AL_EAXREVERB_MIN_MODULATION_DEPTH                  (0.0f)
-#define AL_EAXREVERB_MAX_MODULATION_DEPTH                  (1.0f)
-#define AL_EAXREVERB_DEFAULT_MODULATION_DEPTH              (0.0f)
-#define AL_EAXREVERB_MIN_AIR_ABSORPTION_GAINHF             (0.892f)
-#define AL_EAXREVERB_MAX_AIR_ABSORPTION_GAINHF             (1.0f)
-#define AL_EAXREVERB_DEFAULT_AIR_ABSORPTION_GAINHF         (0.994f)
-#define AL_EAXREVERB_MIN_HFREFERENCE                       (1000.0f)
-#define AL_EAXREVERB_MAX_HFREFERENCE                       (20000.0f)
-#define AL_EAXREVERB_DEFAULT_HFREFERENCE                   (5000.0f)
-#define AL_EAXREVERB_MIN_LFREFERENCE                       (20.0f)
-#define AL_EAXREVERB_MAX_LFREFERENCE                       (1000.0f)
-#define AL_EAXREVERB_DEFAULT_LFREFERENCE                   (250.0f)
-#define AL_EAXREVERB_MIN_ROOM_ROLLOFF_FACTOR               (0.0f)
-#define AL_EAXREVERB_MAX_ROOM_ROLLOFF_FACTOR               (10.0f)
-#define AL_EAXREVERB_DEFAULT_ROOM_ROLLOFF_FACTOR           (0.0f)
-#define AL_EAXREVERB_MIN_DECAY_HFLIMIT                     (AL_FALSE)
-#define AL_EAXREVERB_MAX_DECAY_HFLIMIT                     (AL_TRUE)
-#define AL_EAXREVERB_DEFAULT_DECAY_HFLIMIT                 (AL_TRUE)
-
 enum {
     EAXREVERB = 0,
     REVERB,
diff --git a/OpenAL32/Include/alFilter.h b/OpenAL32/Include/alFilter.h
index d5ca965a..260be322 100644
--- a/OpenAL32/Include/alFilter.h
+++ b/OpenAL32/Include/alFilter.h
@@ -78,16 +78,6 @@ static __inline ALfloat lpCoeffCalc(ALfloat g, ALfloat cw)
     return a;
 }
 
-#define AL_FILTER_TYPE                                     0x8001
-
-#define AL_FILTER_NULL                                     0x0000
-#define AL_FILTER_LOWPASS                                  0x0001
-#define AL_FILTER_HIGHPASS                                 0x0002
-#define AL_FILTER_BANDPASS                                 0x0003
-
-#define AL_LOWPASS_GAIN                                    0x0001
-#define AL_LOWPASS_GAINHF                                  0x0002
-
 
 typedef struct ALfilter
 {