diff options
| author | Chris Robinson <[email protected]> | 2016-10-30 08:45:09 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2016-10-30 08:45:09 -0700 |
| commit | e46a92c220444db505d19e62c0d3e4ef886fb8ab (patch) | |
| tree | c1ecf47d89b482e66dffccab04202e72e4fb2644 | |
| parent | 9120e7987ee8b416c50486dfc292b5aefc72b0d9 (diff) | |
Workaround some systems having an ECHO macro
| -rw-r--r-- | OpenAL32/Include/alEffect.h | 20 | ||||
| -rw-r--r-- | OpenAL32/alEffect.c | 4 | ||||
| -rw-r--r-- | OpenAL32/alExtension.c | 22 |
3 files changed, 23 insertions, 23 deletions
diff --git a/OpenAL32/Include/alEffect.h b/OpenAL32/Include/alEffect.h index b97b0147..80f029a9 100644 --- a/OpenAL32/Include/alEffect.h +++ b/OpenAL32/Include/alEffect.h @@ -10,16 +10,16 @@ extern "C" { struct ALeffect; enum { - EAXREVERB = 0, - REVERB, - CHORUS, - COMPRESSOR, - DISTORTION, - ECHO, - EQUALIZER, - FLANGER, - MODULATOR, - DEDICATED, + AL__EAXREVERB = 0, + AL__REVERB, + AL__CHORUS, + AL__COMPRESSOR, + AL__DISTORTION, + AL__ECHO, + AL__EQUALIZER, + AL__FLANGER, + AL__MODULATOR, + AL__DEDICATED, MAX_EFFECTS }; diff --git a/OpenAL32/alEffect.c b/OpenAL32/alEffect.c index 65a4dcb6..6761e661 100644 --- a/OpenAL32/alEffect.c +++ b/OpenAL32/alEffect.c @@ -667,9 +667,9 @@ ALvoid LoadReverbPreset(const char *name, ALeffect *effect) return; } - if(!DisabledEffects[EAXREVERB]) + if(!DisabledEffects[AL__EAXREVERB]) InitEffectParams(effect, AL_EFFECT_EAXREVERB); - else if(!DisabledEffects[REVERB]) + else if(!DisabledEffects[AL__REVERB]) InitEffectParams(effect, AL_EFFECT_REVERB); else InitEffectParams(effect, AL_EFFECT_NULL); diff --git a/OpenAL32/alExtension.c b/OpenAL32/alExtension.c index 1a559d9c..c85e9007 100644 --- a/OpenAL32/alExtension.c +++ b/OpenAL32/alExtension.c @@ -36,17 +36,17 @@ const struct EffectList EffectList[] = { - { "eaxreverb", EAXREVERB, "AL_EFFECT_EAXREVERB", AL_EFFECT_EAXREVERB }, - { "reverb", REVERB, "AL_EFFECT_REVERB", AL_EFFECT_REVERB }, - { "chorus", CHORUS, "AL_EFFECT_CHORUS", AL_EFFECT_CHORUS }, - { "compressor", COMPRESSOR, "AL_EFFECT_COMPRESSOR", AL_EFFECT_COMPRESSOR }, - { "distortion", DISTORTION, "AL_EFFECT_DISTORTION", AL_EFFECT_DISTORTION }, - { "echo", ECHO, "AL_EFFECT_ECHO", AL_EFFECT_ECHO }, - { "equalizer", EQUALIZER, "AL_EFFECT_EQUALIZER", AL_EFFECT_EQUALIZER }, - { "flanger", FLANGER, "AL_EFFECT_FLANGER", AL_EFFECT_FLANGER }, - { "modulator", MODULATOR, "AL_EFFECT_RING_MODULATOR", AL_EFFECT_RING_MODULATOR }, - { "dedicated", DEDICATED, "AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT", AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT }, - { "dedicated", DEDICATED, "AL_EFFECT_DEDICATED_DIALOGUE", AL_EFFECT_DEDICATED_DIALOGUE }, + { "eaxreverb", AL__EAXREVERB, "AL_EFFECT_EAXREVERB", AL_EFFECT_EAXREVERB }, + { "reverb", AL__REVERB, "AL_EFFECT_REVERB", AL_EFFECT_REVERB }, + { "chorus", AL__CHORUS, "AL_EFFECT_CHORUS", AL_EFFECT_CHORUS }, + { "compressor", AL__COMPRESSOR, "AL_EFFECT_COMPRESSOR", AL_EFFECT_COMPRESSOR }, + { "distortion", AL__DISTORTION, "AL_EFFECT_DISTORTION", AL_EFFECT_DISTORTION }, + { "echo", AL__ECHO, "AL_EFFECT_ECHO", AL_EFFECT_ECHO }, + { "equalizer", AL__EQUALIZER, "AL_EFFECT_EQUALIZER", AL_EFFECT_EQUALIZER }, + { "flanger", AL__FLANGER, "AL_EFFECT_FLANGER", AL_EFFECT_FLANGER }, + { "modulator", AL__MODULATOR, "AL_EFFECT_RING_MODULATOR", AL_EFFECT_RING_MODULATOR }, + { "dedicated", AL__DEDICATED, "AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT", AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT }, + { "dedicated", AL__DEDICATED, "AL_EFFECT_DEDICATED_DIALOGUE", AL_EFFECT_DEDICATED_DIALOGUE }, { NULL, 0, NULL, (ALenum)0 } }; |