diff options
67 files changed, 72 insertions, 73 deletions
diff --git a/Alc/alc.cpp b/Alc/alc.cpp index 0bc099b4..00f90d91 100644 --- a/Alc/alc.cpp +++ b/Alc/alc.cpp @@ -52,11 +52,11 @@ #include "AL/efx.h" #include "alAuxEffectSlot.h" +#include "alcmain.h" #include "alEffect.h" #include "alError.h" #include "alFilter.h" #include "alListener.h" -#include "alMain.h" #include "alSource.h" #include "albyte.h" #include "alconfig.h" diff --git a/OpenAL32/Include/alMain.h b/Alc/alcmain.h index 85bc9cbc..a22e0e81 100644 --- a/OpenAL32/Include/alMain.h +++ b/Alc/alcmain.h @@ -1,5 +1,5 @@ -#ifndef AL_MAIN_H -#define AL_MAIN_H +#ifndef ALC_MAIN_H +#define ALC_MAIN_H #include <algorithm> #include <array> diff --git a/Alc/alconfig.cpp b/Alc/alconfig.cpp index 5f5f9149..b246a91d 100644 --- a/Alc/alconfig.cpp +++ b/Alc/alconfig.cpp @@ -28,6 +28,8 @@ #include "config.h" +#include "alconfig.h" + #include <cstdlib> #include <cctype> #include <cstring> @@ -43,8 +45,7 @@ #include <string> #include <algorithm> -#include "alMain.h" -#include "alconfig.h" +#include "alcmain.h" #include "logging.h" #include "compat.h" diff --git a/Alc/alu.cpp b/Alc/alu.cpp index 666cbb27..cc1a5a98 100644 --- a/Alc/alu.cpp +++ b/Alc/alu.cpp @@ -47,9 +47,9 @@ #include "alAuxEffectSlot.h" #include "alBuffer.h" +#include "alcmain.h" #include "alEffect.h" #include "alListener.h" -#include "alMain.h" #include "alcontext.h" #include "almalloc.h" #include "alnumeric.h" diff --git a/OpenAL32/Include/alu.h b/Alc/alu.h index 841e5c03..9acf904a 100644 --- a/OpenAL32/Include/alu.h +++ b/Alc/alu.h @@ -11,7 +11,7 @@ #include "AL/alext.h" #include "alBuffer.h" -#include "alMain.h" +#include "alcmain.h" #include "almalloc.h" #include "alspan.h" #include "ambidefs.h" diff --git a/Alc/backends/alsa.cpp b/Alc/backends/alsa.cpp index 698a4088..c133df68 100644 --- a/Alc/backends/alsa.cpp +++ b/Alc/backends/alsa.cpp @@ -37,8 +37,8 @@ #include "AL/al.h" -#include "alMain.h" #include "albyte.h" +#include "alcmain.h" #include "alconfig.h" #include "almalloc.h" #include "alnumeric.h" diff --git a/Alc/backends/base.cpp b/Alc/backends/base.cpp index 5748975e..a7d47c6d 100644 --- a/Alc/backends/base.cpp +++ b/Alc/backends/base.cpp @@ -5,7 +5,7 @@ #include <thread> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "backends/base.h" diff --git a/Alc/backends/base.h b/Alc/backends/base.h index 7a9232a6..437e31d9 100644 --- a/Alc/backends/base.h +++ b/Alc/backends/base.h @@ -6,7 +6,7 @@ #include <string> #include <mutex> -#include "alMain.h" +#include "alcmain.h" struct ClockLatency { diff --git a/Alc/backends/coreaudio.cpp b/Alc/backends/coreaudio.cpp index c6978505..b4b46382 100644 --- a/Alc/backends/coreaudio.cpp +++ b/Alc/backends/coreaudio.cpp @@ -26,7 +26,7 @@ #include <stdlib.h> #include <string.h> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "ringbuffer.h" #include "converter.h" diff --git a/Alc/backends/dsound.cpp b/Alc/backends/dsound.cpp index d4c1033c..5a156d54 100644 --- a/Alc/backends/dsound.cpp +++ b/Alc/backends/dsound.cpp @@ -44,7 +44,7 @@ #include <algorithm> #include <functional> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "ringbuffer.h" #include "compat.h" diff --git a/Alc/backends/jack.cpp b/Alc/backends/jack.cpp index 99e9019b..3f81d08c 100644 --- a/Alc/backends/jack.cpp +++ b/Alc/backends/jack.cpp @@ -29,7 +29,7 @@ #include <thread> #include <functional> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "alconfig.h" #include "ringbuffer.h" diff --git a/Alc/backends/loopback.cpp b/Alc/backends/loopback.cpp index 77606b89..4a1c641a 100644 --- a/Alc/backends/loopback.cpp +++ b/Alc/backends/loopback.cpp @@ -22,7 +22,7 @@ #include "backends/loopback.h" -#include "alMain.h" +#include "alcmain.h" #include "alu.h" diff --git a/Alc/backends/null.cpp b/Alc/backends/null.cpp index 00a37fda..ae58cb8b 100644 --- a/Alc/backends/null.cpp +++ b/Alc/backends/null.cpp @@ -30,7 +30,7 @@ #include <functional> #include <thread> -#include "alMain.h" +#include "alcmain.h" #include "almalloc.h" #include "alu.h" #include "logging.h" diff --git a/Alc/backends/opensl.cpp b/Alc/backends/opensl.cpp index 452028ea..b34dc0cb 100644 --- a/Alc/backends/opensl.cpp +++ b/Alc/backends/opensl.cpp @@ -31,7 +31,7 @@ #include <thread> #include <functional> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "ringbuffer.h" #include "threads.h" diff --git a/Alc/backends/oss.cpp b/Alc/backends/oss.cpp index 33075890..8cfe9e96 100644 --- a/Alc/backends/oss.cpp +++ b/Alc/backends/oss.cpp @@ -43,7 +43,7 @@ #include "AL/al.h" -#include "alMain.h" +#include "alcmain.h" #include "alconfig.h" #include "almalloc.h" #include "alnumeric.h" diff --git a/Alc/backends/portaudio.cpp b/Alc/backends/portaudio.cpp index 10c8261b..73e972c5 100644 --- a/Alc/backends/portaudio.cpp +++ b/Alc/backends/portaudio.cpp @@ -26,7 +26,7 @@ #include <cstdlib> #include <cstring> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "alconfig.h" #include "ringbuffer.h" diff --git a/Alc/backends/pulseaudio.cpp b/Alc/backends/pulseaudio.cpp index 97736253..da209c8d 100644 --- a/Alc/backends/pulseaudio.cpp +++ b/Alc/backends/pulseaudio.cpp @@ -34,7 +34,7 @@ #include <algorithm> #include <condition_variable> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "alconfig.h" #include "compat.h" diff --git a/Alc/backends/qsa.cpp b/Alc/backends/qsa.cpp index 074430ca..64ed53aa 100644 --- a/Alc/backends/qsa.cpp +++ b/Alc/backends/qsa.cpp @@ -33,7 +33,7 @@ #include <memory> #include <algorithm> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "threads.h" diff --git a/Alc/backends/sdl2.cpp b/Alc/backends/sdl2.cpp index a7a1752e..97547959 100644 --- a/Alc/backends/sdl2.cpp +++ b/Alc/backends/sdl2.cpp @@ -27,7 +27,7 @@ #include <string> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "threads.h" #include "compat.h" diff --git a/Alc/backends/sndio.cpp b/Alc/backends/sndio.cpp index e696cf55..587f67bb 100644 --- a/Alc/backends/sndio.cpp +++ b/Alc/backends/sndio.cpp @@ -29,7 +29,7 @@ #include <thread> #include <functional> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "threads.h" #include "vector.h" diff --git a/Alc/backends/solaris.cpp b/Alc/backends/solaris.cpp index 5c12ad72..584f6e66 100644 --- a/Alc/backends/solaris.cpp +++ b/Alc/backends/solaris.cpp @@ -38,7 +38,7 @@ #include <thread> #include <functional> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "alconfig.h" #include "threads.h" diff --git a/Alc/backends/wasapi.cpp b/Alc/backends/wasapi.cpp index 384aaba8..bd009463 100644 --- a/Alc/backends/wasapi.cpp +++ b/Alc/backends/wasapi.cpp @@ -54,7 +54,7 @@ #include <functional> #include <condition_variable> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "ringbuffer.h" #include "compat.h" diff --git a/Alc/backends/wave.cpp b/Alc/backends/wave.cpp index 77692686..67ed7e79 100644 --- a/Alc/backends/wave.cpp +++ b/Alc/backends/wave.cpp @@ -35,7 +35,7 @@ #include "AL/al.h" -#include "alMain.h" +#include "alcmain.h" #include "alconfig.h" #include "almalloc.h" #include "alnumeric.h" diff --git a/Alc/backends/winmm.cpp b/Alc/backends/winmm.cpp index 57abee06..cd32e95b 100644 --- a/Alc/backends/winmm.cpp +++ b/Alc/backends/winmm.cpp @@ -37,7 +37,7 @@ #include <algorithm> #include <functional> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "ringbuffer.h" #include "threads.h" diff --git a/Alc/bformatdec.h b/Alc/bformatdec.h index 31abc4fe..06974651 100644 --- a/Alc/bformatdec.h +++ b/Alc/bformatdec.h @@ -6,7 +6,7 @@ #include "AL/al.h" -#include "alMain.h" +#include "alcmain.h" #include "almalloc.h" #include "alspan.h" #include "ambidefs.h" diff --git a/Alc/converter.h b/Alc/converter.h index 04d94833..033e4d3f 100644 --- a/Alc/converter.h +++ b/Alc/converter.h @@ -3,7 +3,7 @@ #include <memory> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "almalloc.h" diff --git a/Alc/effects/autowah.cpp b/Alc/effects/autowah.cpp index 8545de1f..96292636 100644 --- a/Alc/effects/autowah.cpp +++ b/Alc/effects/autowah.cpp @@ -25,7 +25,7 @@ #include <algorithm> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alAuxEffectSlot.h" #include "alError.h" diff --git a/Alc/effects/base.h b/Alc/effects/base.h index 2b067f11..4f48de22 100644 --- a/Alc/effects/base.h +++ b/Alc/effects/base.h @@ -1,8 +1,7 @@ #ifndef EFFECTS_BASE_H #define EFFECTS_BASE_H -#include "alMain.h" - +#include "alcmain.h" #include "almalloc.h" #include "alspan.h" #include "atomic.h" diff --git a/Alc/effects/chorus.cpp b/Alc/effects/chorus.cpp index b9bf3f4c..d475b57a 100644 --- a/Alc/effects/chorus.cpp +++ b/Alc/effects/chorus.cpp @@ -31,8 +31,8 @@ #include "AL/efx.h" #include "alAuxEffectSlot.h" +#include "alcmain.h" #include "alError.h" -#include "alMain.h" #include "alcontext.h" #include "almalloc.h" #include "alnumeric.h" diff --git a/Alc/effects/compressor.cpp b/Alc/effects/compressor.cpp index 82f70317..4a487097 100644 --- a/Alc/effects/compressor.cpp +++ b/Alc/effects/compressor.cpp @@ -22,7 +22,7 @@ #include <cstdlib> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alu.h" #include "alAuxEffectSlot.h" diff --git a/Alc/effects/dedicated.cpp b/Alc/effects/dedicated.cpp index f31cc903..b31b3750 100644 --- a/Alc/effects/dedicated.cpp +++ b/Alc/effects/dedicated.cpp @@ -24,7 +24,7 @@ #include <cmath> #include <algorithm> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alAuxEffectSlot.h" #include "alError.h" diff --git a/Alc/effects/distortion.cpp b/Alc/effects/distortion.cpp index 94af9e11..59557395 100644 --- a/Alc/effects/distortion.cpp +++ b/Alc/effects/distortion.cpp @@ -25,7 +25,7 @@ #include <cmath> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alAuxEffectSlot.h" #include "alError.h" diff --git a/Alc/effects/echo.cpp b/Alc/effects/echo.cpp index 0211520b..c10f2eb2 100644 --- a/Alc/effects/echo.cpp +++ b/Alc/effects/echo.cpp @@ -25,7 +25,7 @@ #include <algorithm> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alFilter.h" #include "alAuxEffectSlot.h" diff --git a/Alc/effects/equalizer.cpp b/Alc/effects/equalizer.cpp index 961ae8fc..69ab5021 100644 --- a/Alc/effects/equalizer.cpp +++ b/Alc/effects/equalizer.cpp @@ -26,7 +26,7 @@ #include <algorithm> #include <functional> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alAuxEffectSlot.h" #include "alError.h" diff --git a/Alc/effects/fshifter.cpp b/Alc/effects/fshifter.cpp index 68e10cba..b47aa00e 100644 --- a/Alc/effects/fshifter.cpp +++ b/Alc/effects/fshifter.cpp @@ -26,7 +26,7 @@ #include <complex> #include <algorithm> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alAuxEffectSlot.h" #include "alError.h" diff --git a/Alc/effects/modulator.cpp b/Alc/effects/modulator.cpp index 8377aefe..086482d7 100644 --- a/Alc/effects/modulator.cpp +++ b/Alc/effects/modulator.cpp @@ -26,7 +26,7 @@ #include <cmath> #include <algorithm> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alAuxEffectSlot.h" #include "alError.h" diff --git a/Alc/effects/null.cpp b/Alc/effects/null.cpp index 3c27bae0..e55c8699 100644 --- a/Alc/effects/null.cpp +++ b/Alc/effects/null.cpp @@ -5,7 +5,7 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alAuxEffectSlot.h" #include "alError.h" diff --git a/Alc/effects/pshifter.cpp b/Alc/effects/pshifter.cpp index bade81e6..39d3cf1a 100644 --- a/Alc/effects/pshifter.cpp +++ b/Alc/effects/pshifter.cpp @@ -30,7 +30,7 @@ #include <complex> #include <algorithm> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alAuxEffectSlot.h" #include "alError.h" diff --git a/Alc/effects/reverb.cpp b/Alc/effects/reverb.cpp index 01f5c476..ac996b3f 100644 --- a/Alc/effects/reverb.cpp +++ b/Alc/effects/reverb.cpp @@ -29,7 +29,7 @@ #include <algorithm> #include <functional> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alu.h" #include "alAuxEffectSlot.h" diff --git a/Alc/effects/vmorpher.cpp b/Alc/effects/vmorpher.cpp index 6f7e22ae..eebba3f1 100644 --- a/Alc/effects/vmorpher.cpp +++ b/Alc/effects/vmorpher.cpp @@ -25,7 +25,7 @@ #include <algorithm> #include <functional> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alAuxEffectSlot.h" #include "alError.h" diff --git a/Alc/filters/nfc.cpp b/Alc/filters/nfc.cpp index e607dd56..1a567f2c 100644 --- a/Alc/filters/nfc.cpp +++ b/Alc/filters/nfc.cpp @@ -5,7 +5,7 @@ #include <algorithm> -#include "alMain.h" +#include "alcmain.h" /* Near-field control filters are the basis for handling the near-field effect. diff --git a/Alc/filters/splitter.h b/Alc/filters/splitter.h index 70fddd9e..927c4d17 100644 --- a/Alc/filters/splitter.h +++ b/Alc/filters/splitter.h @@ -1,7 +1,7 @@ #ifndef FILTER_SPLITTER_H #define FILTER_SPLITTER_H -#include "alMain.h" +#include "alcmain.h" #include "almalloc.h" diff --git a/Alc/helpers.cpp b/Alc/helpers.cpp index 9f6283a3..e86af6ce 100644 --- a/Alc/helpers.cpp +++ b/Alc/helpers.cpp @@ -103,7 +103,7 @@ DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_GUID, 0x1da5d803, 0xd492, 0x4edd, 0x8c, 0x #include <shlobj.h> #endif -#include "alMain.h" +#include "alcmain.h" #include "almalloc.h" #include "compat.h" #include "cpu_caps.h" diff --git a/Alc/hrtf.cpp b/Alc/hrtf.cpp index 73cdc24e..786c4c5d 100644 --- a/Alc/hrtf.cpp +++ b/Alc/hrtf.cpp @@ -40,7 +40,7 @@ #include "AL/al.h" -#include "alMain.h" +#include "alcmain.h" #include "alconfig.h" #include "almalloc.h" #include "alnumeric.h" diff --git a/Alc/mastering.h b/Alc/mastering.h index 1003fa6c..34dc8dcb 100644 --- a/Alc/mastering.h +++ b/Alc/mastering.h @@ -7,7 +7,7 @@ #include "almalloc.h" /* For FloatBufferLine/BUFFERSIZE. */ -#include "alMain.h" +#include "alcmain.h" struct SlidingHold; diff --git a/Alc/mixer/defs.h b/Alc/mixer/defs.h index 0e91e30e..3e5d1125 100644 --- a/Alc/mixer/defs.h +++ b/Alc/mixer/defs.h @@ -3,9 +3,9 @@ #include "AL/alc.h" #include "AL/al.h" -#include "alMain.h" -#include "alu.h" +#include "alcmain.h" +#include "alu.h" #include "alspan.h" diff --git a/Alc/mixer/mixer_c.cpp b/Alc/mixer/mixer_c.cpp index b9d51c9c..47c4a6f4 100644 --- a/Alc/mixer/mixer_c.cpp +++ b/Alc/mixer/mixer_c.cpp @@ -4,7 +4,7 @@ #include <limits> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "alSource.h" #include "alAuxEffectSlot.h" diff --git a/Alc/mixer/mixer_neon.cpp b/Alc/mixer/mixer_neon.cpp index 81d0ff67..fa487d97 100644 --- a/Alc/mixer/mixer_neon.cpp +++ b/Alc/mixer/mixer_neon.cpp @@ -6,7 +6,7 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "hrtf.h" #include "defs.h" diff --git a/Alc/mixer/mixer_sse.cpp b/Alc/mixer/mixer_sse.cpp index f407ac14..b763fdbd 100644 --- a/Alc/mixer/mixer_sse.cpp +++ b/Alc/mixer/mixer_sse.cpp @@ -6,7 +6,7 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "alSource.h" diff --git a/Alc/mixvoice.cpp b/Alc/mixvoice.cpp index 1020cc74..be872f6d 100644 --- a/Alc/mixvoice.cpp +++ b/Alc/mixvoice.cpp @@ -40,7 +40,7 @@ #include "AL/alc.h" #include "alBuffer.h" -#include "alMain.h" +#include "alcmain.h" #include "alSource.h" #include "albyte.h" #include "alconfig.h" diff --git a/Alc/panning.cpp b/Alc/panning.cpp index e8f80069..3a67e33a 100644 --- a/Alc/panning.cpp +++ b/Alc/panning.cpp @@ -32,7 +32,7 @@ #include <algorithm> #include <functional> -#include "alMain.h" +#include "alcmain.h" #include "alAuxEffectSlot.h" #include "alu.h" #include "alconfig.h" diff --git a/Alc/uhjfilter.h b/Alc/uhjfilter.h index 181e036a..53e4f89e 100644 --- a/Alc/uhjfilter.h +++ b/Alc/uhjfilter.h @@ -3,7 +3,7 @@ #include "AL/al.h" -#include "alMain.h" +#include "alcmain.h" #include "almalloc.h" diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a9d04ea..0bedc4f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -619,9 +619,6 @@ SET(COMMON_OBJS common/vecmat.h ) SET(OPENAL_OBJS - OpenAL32/Include/alMain.h - OpenAL32/Include/alu.h - OpenAL32/Include/alAuxEffectSlot.h OpenAL32/alAuxEffectSlot.cpp OpenAL32/Include/alBuffer.h @@ -642,7 +639,9 @@ SET(OPENAL_OBJS ) SET(ALC_OBJS Alc/alc.cpp + Alc/alcmain.h Alc/alu.cpp + Alc/alu.h Alc/alconfig.cpp Alc/alconfig.h Alc/alcontext.h diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h index 9956c432..b6976d13 100644 --- a/OpenAL32/Include/alAuxEffectSlot.h +++ b/OpenAL32/Include/alAuxEffectSlot.h @@ -3,7 +3,7 @@ #include <array> -#include "alMain.h" +#include "alcmain.h" #include "alEffect.h" #include "ambidefs.h" #include "effects/base.h" diff --git a/OpenAL32/Include/alEffect.h b/OpenAL32/Include/alEffect.h index d94317a4..d43aa206 100644 --- a/OpenAL32/Include/alEffect.h +++ b/OpenAL32/Include/alEffect.h @@ -1,7 +1,7 @@ #ifndef _AL_EFFECT_H_ #define _AL_EFFECT_H_ -#include "alMain.h" +#include "alcmain.h" #include "effects/base.h" diff --git a/OpenAL32/Include/alError.h b/OpenAL32/Include/alError.h index 7b64b302..0abd6b26 100644 --- a/OpenAL32/Include/alError.h +++ b/OpenAL32/Include/alError.h @@ -1,7 +1,7 @@ #ifndef _AL_ERROR_H_ #define _AL_ERROR_H_ -#include "alMain.h" +#include "alcmain.h" #include "logging.h" diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index 0343a943..330bb9f4 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -3,7 +3,7 @@ #include <array> -#include "alMain.h" +#include "alcmain.h" #include "alu.h" #include "hrtf.h" #include "almalloc.h" diff --git a/OpenAL32/alAuxEffectSlot.cpp b/OpenAL32/alAuxEffectSlot.cpp index 55fbc622..cc2893c3 100644 --- a/OpenAL32/alAuxEffectSlot.cpp +++ b/OpenAL32/alAuxEffectSlot.cpp @@ -29,7 +29,7 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alAuxEffectSlot.h" #include "alError.h" diff --git a/OpenAL32/alBuffer.cpp b/OpenAL32/alBuffer.cpp index c9a9d9f6..597f98cb 100644 --- a/OpenAL32/alBuffer.cpp +++ b/OpenAL32/alBuffer.cpp @@ -40,8 +40,8 @@ #include "AL/alc.h" #include "AL/alext.h" +#include "alcmain.h" #include "alError.h" -#include "alMain.h" #include "albyte.h" #include "alcontext.h" #include "alexcpt.h" diff --git a/OpenAL32/alEffect.cpp b/OpenAL32/alEffect.cpp index 2de61019..14353d1c 100644 --- a/OpenAL32/alEffect.cpp +++ b/OpenAL32/alEffect.cpp @@ -37,8 +37,8 @@ #include "AL/efx-presets.h" #include "AL/efx.h" +#include "alcmain.h" #include "alError.h" -#include "alMain.h" #include "alcontext.h" #include "alexcpt.h" #include "almalloc.h" diff --git a/OpenAL32/alError.cpp b/OpenAL32/alError.cpp index 5f98ae1d..782e10ec 100644 --- a/OpenAL32/alError.cpp +++ b/OpenAL32/alError.cpp @@ -37,7 +37,7 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alexcpt.h" #include "almalloc.h" diff --git a/OpenAL32/alExtension.cpp b/OpenAL32/alExtension.cpp index dda2a628..5abcf1cf 100644 --- a/OpenAL32/alExtension.cpp +++ b/OpenAL32/alExtension.cpp @@ -27,7 +27,7 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alError.h" #include "alexcpt.h" diff --git a/OpenAL32/alFilter.cpp b/OpenAL32/alFilter.cpp index 209ddc87..cac12581 100644 --- a/OpenAL32/alFilter.cpp +++ b/OpenAL32/alFilter.cpp @@ -24,7 +24,7 @@ #include <algorithm> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alu.h" #include "alFilter.h" diff --git a/OpenAL32/alListener.cpp b/OpenAL32/alListener.cpp index 419e38ad..067c0f55 100644 --- a/OpenAL32/alListener.cpp +++ b/OpenAL32/alListener.cpp @@ -22,7 +22,7 @@ #include <cmath> -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alu.h" #include "alError.h" diff --git a/OpenAL32/alSource.cpp b/OpenAL32/alSource.cpp index 22c9e2d2..b080f874 100644 --- a/OpenAL32/alSource.cpp +++ b/OpenAL32/alSource.cpp @@ -51,7 +51,7 @@ #include "alBuffer.h" #include "alError.h" #include "alFilter.h" -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alexcpt.h" #include "almalloc.h" diff --git a/OpenAL32/alState.cpp b/OpenAL32/alState.cpp index f2c38bb2..ee8d3a1c 100644 --- a/OpenAL32/alState.cpp +++ b/OpenAL32/alState.cpp @@ -33,7 +33,7 @@ #include "AL/alext.h" #include "alError.h" -#include "alMain.h" +#include "alcmain.h" #include "alcontext.h" #include "alexcpt.h" #include "almalloc.h" diff --git a/OpenAL32/event.cpp b/OpenAL32/event.cpp index dfffea9f..d50cef2e 100644 --- a/OpenAL32/event.cpp +++ b/OpenAL32/event.cpp @@ -15,8 +15,8 @@ #include "AL/alc.h" #include "alError.h" -#include "alMain.h" #include "albyte.h" +#include "alcmain.h" #include "alcontext.h" #include "alexcpt.h" #include "almalloc.h" |