diff options
| -rw-r--r-- | CMakeLists.txt | 34 | ||||
| -rw-r--r-- | al/auxeffectslot.cpp (renamed from al/alAuxEffectSlot.cpp) | 6 | ||||
| -rw-r--r-- | al/auxeffectslot.h (renamed from al/alAuxEffectSlot.h) | 0 | ||||
| -rw-r--r-- | al/buffer.cpp (renamed from al/alBuffer.cpp) | 4 | ||||
| -rw-r--r-- | al/buffer.h (renamed from al/alBuffer.h) | 0 | ||||
| -rw-r--r-- | al/effect.cpp (renamed from al/alEffect.cpp) | 4 | ||||
| -rw-r--r-- | al/effect.h (renamed from al/alEffect.h) | 0 | ||||
| -rw-r--r-- | al/error.cpp (renamed from al/alError.cpp) | 2 | ||||
| -rw-r--r-- | al/error.h (renamed from al/alError.h) | 0 | ||||
| -rw-r--r-- | al/event.cpp | 2 | ||||
| -rw-r--r-- | al/extension.cpp (renamed from al/alExtension.cpp) | 2 | ||||
| -rw-r--r-- | al/filter.cpp (renamed from al/alFilter.cpp) | 4 | ||||
| -rw-r--r-- | al/filter.h (renamed from al/alFilter.h) | 0 | ||||
| -rw-r--r-- | al/listener.cpp (renamed from al/alListener.cpp) | 4 | ||||
| -rw-r--r-- | al/listener.h (renamed from al/alListener.h) | 0 | ||||
| -rw-r--r-- | al/source.cpp (renamed from al/alSource.cpp) | 10 | ||||
| -rw-r--r-- | al/source.h (renamed from al/alSource.h) | 0 | ||||
| -rw-r--r-- | al/state.cpp (renamed from al/alState.cpp) | 2 | ||||
| -rw-r--r-- | alc/alc.cpp | 14 | ||||
| -rw-r--r-- | alc/alcontext.h | 2 | ||||
| -rw-r--r-- | alc/alu.cpp | 10 | ||||
| -rw-r--r-- | alc/alu.h | 2 | ||||
| -rw-r--r-- | alc/effects/autowah.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/chorus.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/compressor.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/dedicated.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/distortion.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/echo.cpp | 6 | ||||
| -rw-r--r-- | alc/effects/equalizer.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/fshifter.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/modulator.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/null.cpp | 4 | ||||
| -rw-r--r-- | alc/effects/pshifter.cpp | 7 | ||||
| -rw-r--r-- | alc/effects/reverb.cpp | 6 | ||||
| -rw-r--r-- | alc/effects/vmorpher.cpp | 4 | ||||
| -rw-r--r-- | alc/mixer/mixer_c.cpp | 3 | ||||
| -rw-r--r-- | alc/mixer/mixer_sse.cpp | 2 | ||||
| -rw-r--r-- | alc/mixvoice.cpp | 6 | ||||
| -rw-r--r-- | alc/panning.cpp | 2 |
39 files changed, 85 insertions, 89 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 315f1752..db43215d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -605,22 +605,22 @@ SET(COMMON_OBJS common/vecmat.h ) SET(OPENAL_OBJS - al/alAuxEffectSlot.cpp - al/alAuxEffectSlot.h - al/alBuffer.cpp - al/alBuffer.h - al/alEffect.cpp - al/alEffect.h - al/alError.cpp - al/alError.h - al/alExtension.cpp - al/alFilter.cpp - al/alFilter.h - al/alListener.cpp - al/alListener.h - al/alSource.cpp - al/alSource.h - al/alState.cpp + al/auxeffectslot.cpp + al/auxeffectslot.h + al/buffer.cpp + al/buffer.h + al/effect.cpp + al/effect.h + al/error.cpp + al/error.h + al/extension.cpp + al/filter.cpp + al/filter.h + al/listener.cpp + al/listener.h + al/source.cpp + al/source.h + al/state.cpp al/event.cpp al/event.h ) @@ -1299,8 +1299,8 @@ TARGET_INCLUDE_DIRECTORIES(${IMPL_TARGET} PRIVATE ${INC_PATHS} ${OpenAL_BINARY_DIR} + ${OpenAL_SOURCE_DIR} ${OpenAL_SOURCE_DIR}/alc - ${OpenAL_SOURCE_DIR}/al ${OpenAL_SOURCE_DIR}/common ) diff --git a/al/alAuxEffectSlot.cpp b/al/auxeffectslot.cpp index 42966bf2..605923dd 100644 --- a/al/alAuxEffectSlot.cpp +++ b/al/auxeffectslot.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "alAuxEffectSlot.h" +#include "auxeffectslot.h" #include <algorithm> #include <cstdint> @@ -32,8 +32,6 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alEffect.h" -#include "alError.h" #include "alcmain.h" #include "alcontext.h" #include "alexcpt.h" @@ -41,6 +39,8 @@ #include "alnumeric.h" #include "alspan.h" #include "alu.h" +#include "effect.h" +#include "error.h" #include "fpu_modes.h" #include "inprogext.h" #include "logging.h" diff --git a/al/alAuxEffectSlot.h b/al/auxeffectslot.h index 369638a0..369638a0 100644 --- a/al/alAuxEffectSlot.h +++ b/al/auxeffectslot.h diff --git a/al/alBuffer.cpp b/al/buffer.cpp index 505b9dab..8b9c67e0 100644 --- a/al/alBuffer.cpp +++ b/al/buffer.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "alBuffer.h" +#include "buffer.h" #include <algorithm> #include <array> @@ -40,7 +40,6 @@ #include "AL/alc.h" #include "AL/alext.h" -#include "alError.h" #include "albyte.h" #include "alcmain.h" #include "alcontext.h" @@ -49,6 +48,7 @@ #include "alnumeric.h" #include "aloptional.h" #include "atomic.h" +#include "error.h" #include "inprogext.h" #include "opthelpers.h" diff --git a/al/alBuffer.h b/al/buffer.h index 1d5873e5..1d5873e5 100644 --- a/al/alBuffer.h +++ b/al/buffer.h diff --git a/al/alEffect.cpp b/al/effect.cpp index 4a75f69f..b6cd5463 100644 --- a/al/alEffect.cpp +++ b/al/effect.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "alEffect.h" +#include "effect.h" #include <algorithm> #include <cstdint> @@ -37,13 +37,13 @@ #include "AL/efx-presets.h" #include "AL/efx.h" -#include "alError.h" #include "alcmain.h" #include "alcontext.h" #include "alexcpt.h" #include "almalloc.h" #include "alnumeric.h" #include "effects/base.h" +#include "error.h" #include "logging.h" #include "opthelpers.h" #include "vector.h" diff --git a/al/alEffect.h b/al/effect.h index 270b8e20..270b8e20 100644 --- a/al/alEffect.h +++ b/al/effect.h diff --git a/al/alError.cpp b/al/error.cpp index bff92444..f5f0801e 100644 --- a/al/alError.cpp +++ b/al/error.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "alError.h" +#include "error.h" #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/al/alError.h b/al/error.h index 6408b60c..6408b60c 100644 --- a/al/alError.h +++ b/al/error.h diff --git a/al/event.cpp b/al/event.cpp index ae2825d0..b103d0da 100644 --- a/al/event.cpp +++ b/al/event.cpp @@ -16,12 +16,12 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alError.h" #include "albyte.h" #include "alcontext.h" #include "alexcpt.h" #include "almalloc.h" #include "effects/base.h" +#include "error.h" #include "inprogext.h" #include "logging.h" #include "opthelpers.h" diff --git a/al/alExtension.cpp b/al/extension.cpp index 80681090..e38d4382 100644 --- a/al/alExtension.cpp +++ b/al/extension.cpp @@ -27,9 +27,9 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alError.h" #include "alcontext.h" #include "alexcpt.h" +#include "error.h" #include "opthelpers.h" diff --git a/al/alFilter.cpp b/al/filter.cpp index 31fbaf21..405842f3 100644 --- a/al/alFilter.cpp +++ b/al/filter.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "alFilter.h" +#include "filter.h" #include <algorithm> #include <cstdint> @@ -31,12 +31,12 @@ #include "AL/efx.h" -#include "alError.h" #include "alcmain.h" #include "alcontext.h" #include "alexcpt.h" #include "almalloc.h" #include "alnumeric.h" +#include "error.h" #include "opthelpers.h" #include "vector.h" diff --git a/al/alFilter.h b/al/filter.h index db098d70..db098d70 100644 --- a/al/alFilter.h +++ b/al/filter.h diff --git a/al/alListener.cpp b/al/listener.cpp index d3bf3aaa..d67bf072 100644 --- a/al/alListener.cpp +++ b/al/listener.cpp @@ -20,18 +20,18 @@ #include "config.h" -#include "alListener.h" +#include "listener.h" #include <cmath> #include <mutex> #include "AL/efx.h" -#include "alError.h" #include "alcontext.h" #include "alexcpt.h" #include "almalloc.h" #include "atomic.h" +#include "error.h" #include "opthelpers.h" diff --git a/al/alListener.h b/al/listener.h index a71db9f8..a71db9f8 100644 --- a/al/alListener.h +++ b/al/listener.h diff --git a/al/alSource.cpp b/al/source.cpp index fdd063ac..b4582e6b 100644 --- a/al/alSource.cpp +++ b/al/source.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "alSource.h" +#include "source.h" #include <algorithm> #include <array> @@ -45,10 +45,6 @@ #include "AL/alext.h" #include "AL/efx.h" -#include "alAuxEffectSlot.h" -#include "alBuffer.h" -#include "alError.h" -#include "alFilter.h" #include "alcmain.h" #include "alcontext.h" #include "alexcpt.h" @@ -57,9 +53,13 @@ #include "alu.h" #include "ambidefs.h" #include "atomic.h" +#include "auxeffectslot.h" #include "backends/base.h" #include "bformatdec.h" +#include "buffer.h" +#include "error.h" #include "event.h" +#include "filter.h" #include "filters/nfc.h" #include "filters/splitter.h" #include "inprogext.h" diff --git a/al/alSource.h b/al/source.h index c9892398..c9892398 100644 --- a/al/alSource.h +++ b/al/source.h diff --git a/al/alState.cpp b/al/state.cpp index 001412a8..cbb43685 100644 --- a/al/alState.cpp +++ b/al/state.cpp @@ -32,13 +32,13 @@ #include "AL/alc.h" #include "AL/alext.h" -#include "alError.h" #include "alcontext.h" #include "alexcpt.h" #include "almalloc.h" #include "alspan.h" #include "alu.h" #include "atomic.h" +#include "error.h" #include "event.h" #include "inprogext.h" #include "opthelpers.h" diff --git a/alc/alc.cpp b/alc/alc.cpp index de0038a2..538bea9f 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -51,13 +51,14 @@ #include "AL/alext.h" #include "AL/efx.h" -#include "alAuxEffectSlot.h" +#include "al/auxeffectslot.h" +#include "al/effect.h" +#include "al/error.h" +#include "al/event.h" +#include "al/filter.h" +#include "al/listener.h" +#include "al/source.h" #include "alcmain.h" -#include "alEffect.h" -#include "alError.h" -#include "alFilter.h" -#include "alListener.h" -#include "alSource.h" #include "albyte.h" #include "alconfig.h" #include "alcontext.h" @@ -74,7 +75,6 @@ #include "compat.h" #include "cpu_caps.h" #include "effects/base.h" -#include "event.h" #include "filters/nfc.h" #include "filters/splitter.h" #include "fpu_modes.h" diff --git a/alc/alcontext.h b/alc/alcontext.h index cf956079..a2da77b0 100644 --- a/alc/alcontext.h +++ b/alc/alcontext.h @@ -17,7 +17,7 @@ #include "almalloc.h" #include "alnumeric.h" -#include "alListener.h" +#include "al/listener.h" #include "alu.h" diff --git a/alc/alu.cpp b/alc/alu.cpp index 31689997..b2e1effa 100644 --- a/alc/alu.cpp +++ b/alc/alu.cpp @@ -45,11 +45,12 @@ #include "AL/alc.h" #include "AL/efx.h" -#include "alAuxEffectSlot.h" -#include "alBuffer.h" +#include "al/auxeffectslot.h" +#include "al/buffer.h" +#include "al/effect.h" +#include "al/event.h" +#include "al/listener.h" #include "alcmain.h" -#include "alEffect.h" -#include "alListener.h" #include "alcontext.h" #include "almalloc.h" #include "alnumeric.h" @@ -60,7 +61,6 @@ #include "bs2b.h" #include "cpu_caps.h" #include "effects/base.h" -#include "event.h" #include "filters/biquad.h" #include "filters/nfc.h" #include "filters/splitter.h" @@ -10,7 +10,7 @@ #include "AL/alc.h" #include "AL/alext.h" -#include "alBuffer.h" +#include "al/buffer.h" #include "alcmain.h" #include "almalloc.h" #include "alspan.h" diff --git a/alc/effects/autowah.cpp b/alc/effects/autowah.cpp index 96292636..298d5c96 100644 --- a/alc/effects/autowah.cpp +++ b/alc/effects/autowah.cpp @@ -25,10 +25,10 @@ #include <algorithm> +#include "al/auxeffectslot.h" +#include "al/error.h" #include "alcmain.h" #include "alcontext.h" -#include "alAuxEffectSlot.h" -#include "alError.h" #include "alu.h" #include "filters/biquad.h" #include "vecmat.h" diff --git a/alc/effects/chorus.cpp b/alc/effects/chorus.cpp index d475b57a..28514a9b 100644 --- a/alc/effects/chorus.cpp +++ b/alc/effects/chorus.cpp @@ -30,9 +30,9 @@ #include "AL/alc.h" #include "AL/efx.h" -#include "alAuxEffectSlot.h" +#include "al/auxeffectslot.h" +#include "al/error.h" #include "alcmain.h" -#include "alError.h" #include "alcontext.h" #include "almalloc.h" #include "alnumeric.h" diff --git a/alc/effects/compressor.cpp b/alc/effects/compressor.cpp index 4a487097..86e2e02b 100644 --- a/alc/effects/compressor.cpp +++ b/alc/effects/compressor.cpp @@ -22,11 +22,11 @@ #include <cstdlib> +#include "al/auxeffectslot.h" +#include "al/error.h" #include "alcmain.h" #include "alcontext.h" #include "alu.h" -#include "alAuxEffectSlot.h" -#include "alError.h" #include "vecmat.h" diff --git a/alc/effects/dedicated.cpp b/alc/effects/dedicated.cpp index b31b3750..c05df772 100644 --- a/alc/effects/dedicated.cpp +++ b/alc/effects/dedicated.cpp @@ -24,10 +24,10 @@ #include <cmath> #include <algorithm> +#include "al/auxeffectslot.h" +#include "al/error.h" #include "alcmain.h" #include "alcontext.h" -#include "alAuxEffectSlot.h" -#include "alError.h" #include "alu.h" diff --git a/alc/effects/distortion.cpp b/alc/effects/distortion.cpp index 59557395..a74575d4 100644 --- a/alc/effects/distortion.cpp +++ b/alc/effects/distortion.cpp @@ -25,10 +25,10 @@ #include <cmath> +#include "al/auxeffectslot.h" +#include "al/error.h" #include "alcmain.h" #include "alcontext.h" -#include "alAuxEffectSlot.h" -#include "alError.h" #include "alu.h" #include "filters/biquad.h" diff --git a/alc/effects/echo.cpp b/alc/effects/echo.cpp index c10f2eb2..8e309cbb 100644 --- a/alc/effects/echo.cpp +++ b/alc/effects/echo.cpp @@ -25,11 +25,11 @@ #include <algorithm> +#include "al/auxeffectslot.h" +#include "al/error.h" +#include "al/filter.h" #include "alcmain.h" #include "alcontext.h" -#include "alFilter.h" -#include "alAuxEffectSlot.h" -#include "alError.h" #include "alu.h" #include "filters/biquad.h" #include "vector.h" diff --git a/alc/effects/equalizer.cpp b/alc/effects/equalizer.cpp index 69ab5021..0ae3a25f 100644 --- a/alc/effects/equalizer.cpp +++ b/alc/effects/equalizer.cpp @@ -26,10 +26,10 @@ #include <algorithm> #include <functional> +#include "al/auxeffectslot.h" +#include "al/error.h" #include "alcmain.h" #include "alcontext.h" -#include "alAuxEffectSlot.h" -#include "alError.h" #include "alu.h" #include "filters/biquad.h" #include "vecmat.h" diff --git a/alc/effects/fshifter.cpp b/alc/effects/fshifter.cpp index b47aa00e..b36c53a1 100644 --- a/alc/effects/fshifter.cpp +++ b/alc/effects/fshifter.cpp @@ -26,10 +26,10 @@ #include <complex> #include <algorithm> +#include "al/auxeffectslot.h" +#include "al/error.h" #include "alcmain.h" #include "alcontext.h" -#include "alAuxEffectSlot.h" -#include "alError.h" #include "alu.h" #include "alcomplex.h" diff --git a/alc/effects/modulator.cpp b/alc/effects/modulator.cpp index 086482d7..5f28e1da 100644 --- a/alc/effects/modulator.cpp +++ b/alc/effects/modulator.cpp @@ -26,10 +26,10 @@ #include <cmath> #include <algorithm> +#include "al/auxeffectslot.h" +#include "al/error.h" #include "alcmain.h" #include "alcontext.h" -#include "alAuxEffectSlot.h" -#include "alError.h" #include "alu.h" #include "filters/biquad.h" #include "vecmat.h" diff --git a/alc/effects/null.cpp b/alc/effects/null.cpp index e55c8699..b4799077 100644 --- a/alc/effects/null.cpp +++ b/alc/effects/null.cpp @@ -5,10 +5,10 @@ #include "AL/al.h" #include "AL/alc.h" +#include "al/auxeffectslot.h" +#include "al/error.h" #include "alcmain.h" #include "alcontext.h" -#include "alAuxEffectSlot.h" -#include "alError.h" namespace { diff --git a/alc/effects/pshifter.cpp b/alc/effects/pshifter.cpp index 39d3cf1a..eac5894b 100644 --- a/alc/effects/pshifter.cpp +++ b/alc/effects/pshifter.cpp @@ -30,14 +30,13 @@ #include <complex> #include <algorithm> +#include "al/auxeffectslot.h" +#include "al/error.h" #include "alcmain.h" +#include "alcomplex.h" #include "alcontext.h" -#include "alAuxEffectSlot.h" -#include "alError.h" #include "alu.h" -#include "alcomplex.h" - namespace { diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp index ac996b3f..82b04436 100644 --- a/alc/effects/reverb.cpp +++ b/alc/effects/reverb.cpp @@ -29,12 +29,12 @@ #include <algorithm> #include <functional> +#include "al/auxeffectslot.h" +#include "al/error.h" +#include "al/listener.h" #include "alcmain.h" #include "alcontext.h" #include "alu.h" -#include "alAuxEffectSlot.h" -#include "alListener.h" -#include "alError.h" #include "bformatdec.h" #include "filters/biquad.h" #include "vector.h" diff --git a/alc/effects/vmorpher.cpp b/alc/effects/vmorpher.cpp index eebba3f1..d1bf8587 100644 --- a/alc/effects/vmorpher.cpp +++ b/alc/effects/vmorpher.cpp @@ -25,10 +25,10 @@ #include <algorithm> #include <functional> +#include "al/auxeffectslot.h" +#include "al/error.h" #include "alcmain.h" #include "alcontext.h" -#include "alAuxEffectSlot.h" -#include "alError.h" #include "alu.h" namespace { diff --git a/alc/mixer/mixer_c.cpp b/alc/mixer/mixer_c.cpp index 47c4a6f4..3513cf2b 100644 --- a/alc/mixer/mixer_c.cpp +++ b/alc/mixer/mixer_c.cpp @@ -6,8 +6,7 @@ #include "alcmain.h" #include "alu.h" -#include "alSource.h" -#include "alAuxEffectSlot.h" + #include "defs.h" #include "hrtfbase.h" diff --git a/alc/mixer/mixer_sse.cpp b/alc/mixer/mixer_sse.cpp index b763fdbd..516dabac 100644 --- a/alc/mixer/mixer_sse.cpp +++ b/alc/mixer/mixer_sse.cpp @@ -9,8 +9,6 @@ #include "alcmain.h" #include "alu.h" -#include "alSource.h" -#include "alAuxEffectSlot.h" #include "defs.h" #include "hrtfbase.h" diff --git a/alc/mixvoice.cpp b/alc/mixvoice.cpp index aea04b15..0d7b2cee 100644 --- a/alc/mixvoice.cpp +++ b/alc/mixvoice.cpp @@ -39,9 +39,10 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alBuffer.h" +#include "al/buffer.h" +#include "al/event.h" +#include "al/source.h" #include "alcmain.h" -#include "alSource.h" #include "albyte.h" #include "alconfig.h" #include "alcontext.h" @@ -50,7 +51,6 @@ #include "alspan.h" #include "alu.h" #include "cpu_caps.h" -#include "event.h" #include "filters/biquad.h" #include "filters/nfc.h" #include "filters/splitter.h" diff --git a/alc/panning.cpp b/alc/panning.cpp index 3a67e33a..fd1e29ce 100644 --- a/alc/panning.cpp +++ b/alc/panning.cpp @@ -32,8 +32,8 @@ #include <algorithm> #include <functional> +#include "al/auxeffectslot.h" #include "alcmain.h" -#include "alAuxEffectSlot.h" #include "alu.h" #include "alconfig.h" #include "ambdec.h" |