diff options
74 files changed, 149 insertions, 153 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 11c3975b..8b286781 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1345,7 +1345,6 @@ target_include_directories(${IMPL_TARGET} ${INC_PATHS} ${OpenAL_BINARY_DIR} ${OpenAL_SOURCE_DIR} - ${OpenAL_SOURCE_DIR}/alc ${OpenAL_SOURCE_DIR}/common ) diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp index 3ee0a46e..eee274b1 100644 --- a/al/auxeffectslot.cpp +++ b/al/auxeffectslot.cpp @@ -36,18 +36,18 @@ #include "AL/efx.h" #include "albit.h" -#include "alcmain.h" -#include "alcontext.h" +#include "alc/alcmain.h" +#include "alc/alcontext.h" +#include "alc/alu.h" +#include "alc/inprogext.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" -#include "alu.h" #include "buffer.h" #include "core/except.h" #include "core/fpu_ctrl.h" #include "core/logging.h" #include "effect.h" -#include "inprogext.h" #include "opthelpers.h" diff --git a/al/auxeffectslot.h b/al/auxeffectslot.h index 8d7e396b..ca73c757 100644 --- a/al/auxeffectslot.h +++ b/al/auxeffectslot.h @@ -8,11 +8,11 @@ #include "AL/alc.h" #include "AL/efx.h" -#include "alcmain.h" +#include "alc/alcmain.h" +#include "alc/effectslot.h" +#include "alc/effects/base.h" #include "almalloc.h" #include "atomic.h" -#include "effectslot.h" -#include "effects/base.h" #include "intrusive_ptr.h" #include "vector.h" diff --git a/al/buffer.cpp b/al/buffer.cpp index 21f46fc8..aaffddf1 100644 --- a/al/buffer.cpp +++ b/al/buffer.cpp @@ -43,8 +43,9 @@ #include "albit.h" #include "albyte.h" -#include "alcmain.h" -#include "alcontext.h" +#include "alc/alcmain.h" +#include "alc/alcontext.h" +#include "alc/inprogext.h" #include "almalloc.h" #include "alnumeric.h" #include "aloptional.h" @@ -52,7 +53,6 @@ #include "core/except.h" #include "core/logging.h" #include "core/voice.h" -#include "inprogext.h" #include "opthelpers.h" diff --git a/al/buffer.h b/al/buffer.h index fe37b0af..a78c65c6 100644 --- a/al/buffer.h +++ b/al/buffer.h @@ -6,10 +6,10 @@ #include "AL/al.h" #include "albyte.h" +#include "alc/inprogext.h" #include "almalloc.h" #include "atomic.h" #include "core/buffer_storage.h" -#include "inprogext.h" #include "vector.h" diff --git a/al/effect.cpp b/al/effect.cpp index 645e41df..2c39394f 100644 --- a/al/effect.cpp +++ b/al/effect.cpp @@ -39,14 +39,14 @@ #include "AL/efx.h" #include "albit.h" -#include "alcmain.h" -#include "alcontext.h" +#include "alc/alcmain.h" +#include "alc/alcontext.h" +#include "alc/effects/base.h" #include "almalloc.h" #include "alnumeric.h" #include "alstring.h" #include "core/except.h" #include "core/logging.h" -#include "effects/base.h" #include "opthelpers.h" #include "vector.h" diff --git a/al/effects/autowah.cpp b/al/effects/autowah.cpp index 65d4b702..9abef1f7 100644 --- a/al/effects/autowah.cpp +++ b/al/effects/autowah.cpp @@ -8,7 +8,7 @@ #include "AL/efx.h" -#include "effects/base.h" +#include "alc/effects/base.h" #include "effects.h" namespace { diff --git a/al/effects/chorus.cpp b/al/effects/chorus.cpp index 60152755..704d7230 100644 --- a/al/effects/chorus.cpp +++ b/al/effects/chorus.cpp @@ -4,10 +4,10 @@ #include "AL/al.h" #include "AL/efx.h" +#include "alc/effects/base.h" #include "aloptional.h" #include "core/logging.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/effects/compressor.cpp b/al/effects/compressor.cpp index 94e07431..f5db2a6f 100644 --- a/al/effects/compressor.cpp +++ b/al/effects/compressor.cpp @@ -4,8 +4,8 @@ #include "AL/al.h" #include "AL/efx.h" +#include "alc/effects/base.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/effects/convolution.cpp b/al/effects/convolution.cpp index 4d87b1c4..8e850fd3 100644 --- a/al/effects/convolution.cpp +++ b/al/effects/convolution.cpp @@ -2,10 +2,10 @@ #include "config.h" #include "AL/al.h" -#include "inprogext.h" +#include "alc/inprogext.h" +#include "alc/effects/base.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/effects/dedicated.cpp b/al/effects/dedicated.cpp index 334d9e56..db57003c 100644 --- a/al/effects/dedicated.cpp +++ b/al/effects/dedicated.cpp @@ -4,10 +4,10 @@ #include <cmath> #include "AL/al.h" -#include "AL/efx.h" +#include "AL/alext.h" +#include "alc/effects/base.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/effects/distortion.cpp b/al/effects/distortion.cpp index 8961a4d9..f5d64a9a 100644 --- a/al/effects/distortion.cpp +++ b/al/effects/distortion.cpp @@ -4,8 +4,8 @@ #include "AL/al.h" #include "AL/efx.h" +#include "alc/effects/base.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/effects/echo.cpp b/al/effects/echo.cpp index 79a60521..65f691c6 100644 --- a/al/effects/echo.cpp +++ b/al/effects/echo.cpp @@ -4,8 +4,8 @@ #include "AL/al.h" #include "AL/efx.h" +#include "alc/effects/base.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/effects/equalizer.cpp b/al/effects/equalizer.cpp index 3a7c0a8f..3c039688 100644 --- a/al/effects/equalizer.cpp +++ b/al/effects/equalizer.cpp @@ -4,8 +4,8 @@ #include "AL/al.h" #include "AL/efx.h" +#include "alc/effects/base.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/effects/fshifter.cpp b/al/effects/fshifter.cpp index 444b0260..63621aa6 100644 --- a/al/effects/fshifter.cpp +++ b/al/effects/fshifter.cpp @@ -4,9 +4,9 @@ #include "AL/al.h" #include "AL/efx.h" +#include "alc/effects/base.h" #include "aloptional.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/effects/modulator.cpp b/al/effects/modulator.cpp index 89dcc209..4c4ee485 100644 --- a/al/effects/modulator.cpp +++ b/al/effects/modulator.cpp @@ -4,9 +4,9 @@ #include "AL/al.h" #include "AL/efx.h" +#include "alc/effects/base.h" #include "aloptional.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/effects/null.cpp b/al/effects/null.cpp index 0ac5278f..516446db 100644 --- a/al/effects/null.cpp +++ b/al/effects/null.cpp @@ -4,8 +4,8 @@ #include "AL/al.h" #include "AL/efx.h" +#include "alc/effects/base.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/effects/pshifter.cpp b/al/effects/pshifter.cpp index e6b0b3b0..56059a3c 100644 --- a/al/effects/pshifter.cpp +++ b/al/effects/pshifter.cpp @@ -4,8 +4,8 @@ #include "AL/al.h" #include "AL/efx.h" +#include "alc/effects/base.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/effects/reverb.cpp b/al/effects/reverb.cpp index caa0c81e..3f234b93 100644 --- a/al/effects/reverb.cpp +++ b/al/effects/reverb.cpp @@ -6,8 +6,8 @@ #include "AL/al.h" #include "AL/efx.h" +#include "alc/effects/base.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/effects/vmorpher.cpp b/al/effects/vmorpher.cpp index 03eb2c62..076776a9 100644 --- a/al/effects/vmorpher.cpp +++ b/al/effects/vmorpher.cpp @@ -4,9 +4,9 @@ #include "AL/al.h" #include "AL/efx.h" +#include "alc/effects/base.h" #include "aloptional.h" #include "effects.h" -#include "effects/base.h" namespace { diff --git a/al/error.cpp b/al/error.cpp index 444b55aa..b6489a86 100644 --- a/al/error.cpp +++ b/al/error.cpp @@ -35,7 +35,7 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alcontext.h" +#include "alc/alcontext.h" #include "almalloc.h" #include "core/except.h" #include "core/logging.h" diff --git a/al/event.cpp b/al/event.cpp index 843a90e1..5b6c1976 100644 --- a/al/event.cpp +++ b/al/event.cpp @@ -18,14 +18,14 @@ #include "AL/alc.h" #include "albyte.h" -#include "alcontext.h" +#include "alc/alcontext.h" +#include "alc/effects/base.h" +#include "alc/inprogext.h" #include "almalloc.h" #include "core/async_event.h" #include "core/except.h" #include "core/logging.h" #include "core/voice_change.h" -#include "effects/base.h" -#include "inprogext.h" #include "opthelpers.h" #include "ringbuffer.h" #include "threads.h" diff --git a/al/extension.cpp b/al/extension.cpp index 7346a5c6..bd903a6f 100644 --- a/al/extension.cpp +++ b/al/extension.cpp @@ -27,7 +27,7 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alcontext.h" +#include "alc/alcontext.h" #include "alstring.h" #include "core/except.h" #include "opthelpers.h" diff --git a/al/filter.cpp b/al/filter.cpp index c3391193..09249c81 100644 --- a/al/filter.cpp +++ b/al/filter.cpp @@ -37,8 +37,8 @@ #include "AL/efx.h" #include "albit.h" -#include "alcmain.h" -#include "alcontext.h" +#include "alc/alcmain.h" +#include "alc/alcontext.h" #include "almalloc.h" #include "alnumeric.h" #include "core/except.h" diff --git a/al/listener.cpp b/al/listener.cpp index edc1ed06..00626a20 100644 --- a/al/listener.cpp +++ b/al/listener.cpp @@ -29,7 +29,7 @@ #include "AL/alc.h" #include "AL/efx.h" -#include "alcontext.h" +#include "alc/alcontext.h" #include "almalloc.h" #include "atomic.h" #include "core/except.h" diff --git a/al/source.cpp b/al/source.cpp index ca234a05..25d84f9f 100644 --- a/al/source.cpp +++ b/al/source.cpp @@ -46,16 +46,17 @@ #include "AL/efx.h" #include "albit.h" -#include "alcmain.h" -#include "alcontext.h" +#include "alc/alcmain.h" +#include "alc/alcontext.h" +#include "alc/alu.h" +#include "alc/backends/base.h" +#include "alc/inprogext.h" #include "almalloc.h" #include "alnumeric.h" #include "aloptional.h" #include "alspan.h" -#include "alu.h" #include "atomic.h" #include "auxeffectslot.h" -#include "backends/base.h" #include "buffer.h" #include "core/ambidefs.h" #include "core/bformatdec.h" @@ -66,7 +67,6 @@ #include "core/voice_change.h" #include "event.h" #include "filter.h" -#include "inprogext.h" #include "math_defs.h" #include "opthelpers.h" #include "ringbuffer.h" diff --git a/al/source.h b/al/source.h index 2063068a..dd3f56a7 100644 --- a/al/source.h +++ b/al/source.h @@ -11,11 +11,11 @@ #include "AL/al.h" #include "AL/alc.h" -#include "alcontext.h" +#include "alc/alcontext.h" +#include "alc/alu.h" #include "aldeque.h" #include "almalloc.h" #include "alnumeric.h" -#include "alu.h" #include "atomic.h" #include "core/voice.h" #include "math_defs.h" diff --git a/al/state.cpp b/al/state.cpp index 950d64fc..b0b05972 100644 --- a/al/state.cpp +++ b/al/state.cpp @@ -32,17 +32,17 @@ #include "AL/alc.h" #include "AL/alext.h" -#include "alcmain.h" -#include "alcontext.h" +#include "alc/alcmain.h" +#include "alc/alcontext.h" +#include "alc/alu.h" +#include "alc/inprogext.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" -#include "alu.h" #include "atomic.h" #include "core/except.h" #include "core/voice.h" #include "event.h" -#include "inprogext.h" #include "opthelpers.h" #include "strutils.h" diff --git a/alc/backends/alsa.cpp b/alc/backends/alsa.cpp index a6c7e178..f6f318eb 100644 --- a/alc/backends/alsa.cpp +++ b/alc/backends/alsa.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "backends/alsa.h" +#include "alsa.h" #include <algorithm> #include <atomic> @@ -36,12 +36,11 @@ #include <utility> #include "albyte.h" -#include "alcmain.h" -#include "alconfig.h" +#include "alc/alconfig.h" #include "almalloc.h" #include "alnumeric.h" #include "aloptional.h" -#include "alu.h" +#include "core/device.h" #include "core/helpers.h" #include "core/logging.h" #include "dynload.h" diff --git a/alc/backends/alsa.h b/alc/backends/alsa.h index 1a28e6b9..b256dcf5 100644 --- a/alc/backends/alsa.h +++ b/alc/backends/alsa.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_ALSA_H #define BACKENDS_ALSA_H -#include "backends/base.h" +#include "base.h" struct AlsaBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/coreaudio.cpp b/alc/backends/coreaudio.cpp index 45c814bf..81ce32bc 100644 --- a/alc/backends/coreaudio.cpp +++ b/alc/backends/coreaudio.cpp @@ -20,23 +20,22 @@ #include "config.h" -#include "backends/coreaudio.h" +#include "coreaudio.h" -#include <inttypes.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include <cmath> -#include "alcmain.h" -#include "alu.h" -#include "ringbuffer.h" +#include "alnumeric.h" #include "core/converter.h" +#include "core/device.h" #include "core/logging.h" -#include "backends/base.h" +#include "ringbuffer.h" -#include <unistd.h> #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> diff --git a/alc/backends/coreaudio.h b/alc/backends/coreaudio.h index 19e50eab..1252edde 100644 --- a/alc/backends/coreaudio.h +++ b/alc/backends/coreaudio.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_COREAUDIO_H #define BACKENDS_COREAUDIO_H -#include "backends/base.h" +#include "base.h" struct CoreAudioBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/dsound.cpp b/alc/backends/dsound.cpp index 928ff507..401f8165 100644 --- a/alc/backends/dsound.cpp +++ b/alc/backends/dsound.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "backends/dsound.h" +#include "dsound.h" #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -44,9 +44,9 @@ #include <algorithm> #include <functional> -#include "alcmain.h" -#include "alu.h" +#include "alnumeric.h" #include "comptr.h" +#include "core/device.h" #include "core/helpers.h" #include "core/logging.h" #include "dynload.h" @@ -175,7 +175,7 @@ struct DSoundPlayback final : public BackendBase { int mixerProc(); - void open(const ALCchar *name) override; + void open(const char *name) override; bool reset() override; void start() override; void stop() override; diff --git a/alc/backends/dsound.h b/alc/backends/dsound.h index 3b5b344b..787f227a 100644 --- a/alc/backends/dsound.h +++ b/alc/backends/dsound.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_DSOUND_H #define BACKENDS_DSOUND_H -#include "backends/base.h" +#include "base.h" struct DSoundBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/jack.cpp b/alc/backends/jack.cpp index b7b35217..54bd19e6 100644 --- a/alc/backends/jack.cpp +++ b/alc/backends/jack.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "backends/jack.h" +#include "jack.h" #include <cstdlib> #include <cstdio> @@ -31,9 +31,9 @@ #include <thread> #include <functional> -#include "alcmain.h" -#include "alu.h" -#include "alconfig.h" +#include "alc/alconfig.h" +#include "alnumeric.h" +#include "core/device.h" #include "core/helpers.h" #include "core/logging.h" #include "dynload.h" diff --git a/alc/backends/jack.h b/alc/backends/jack.h index 6f81a209..b83f24dd 100644 --- a/alc/backends/jack.h +++ b/alc/backends/jack.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_JACK_H #define BACKENDS_JACK_H -#include "backends/base.h" +#include "base.h" struct JackBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/loopback.cpp b/alc/backends/loopback.cpp index bafe8cc8..bf4ab246 100644 --- a/alc/backends/loopback.cpp +++ b/alc/backends/loopback.cpp @@ -20,10 +20,9 @@ #include "config.h" -#include "backends/loopback.h" +#include "loopback.h" -#include "alcmain.h" -#include "alu.h" +#include "core/device.h" namespace { @@ -31,7 +30,7 @@ namespace { struct LoopbackBackend final : public BackendBase { LoopbackBackend(DeviceBase *device) noexcept : BackendBase{device} { } - void open(const ALCchar *name) override; + void open(const char *name) override; bool reset() override; void start() override; void stop() override; @@ -40,7 +39,7 @@ struct LoopbackBackend final : public BackendBase { }; -void LoopbackBackend::open(const ALCchar *name) +void LoopbackBackend::open(const char *name) { mDevice->DeviceName = name; } diff --git a/alc/backends/loopback.h b/alc/backends/loopback.h index 1a031a1f..cb42b3c8 100644 --- a/alc/backends/loopback.h +++ b/alc/backends/loopback.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_LOOPBACK_H #define BACKENDS_LOOPBACK_H -#include "backends/base.h" +#include "base.h" struct LoopbackBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/null.cpp b/alc/backends/null.cpp index 763d4d2e..5a8fc255 100644 --- a/alc/backends/null.cpp +++ b/alc/backends/null.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "backends/null.h" +#include "null.h" #include <exception> #include <atomic> @@ -30,9 +30,8 @@ #include <functional> #include <thread> -#include "alcmain.h" +#include "core/device.h" #include "almalloc.h" -#include "alu.h" #include "core/helpers.h" #include "threads.h" diff --git a/alc/backends/null.h b/alc/backends/null.h index c9d1b3b3..7048cad6 100644 --- a/alc/backends/null.h +++ b/alc/backends/null.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_NULL_H #define BACKENDS_NULL_H -#include "backends/base.h" +#include "base.h" struct NullBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/oboe.h b/alc/backends/oboe.h index 228ec807..a39c2445 100644 --- a/alc/backends/oboe.h +++ b/alc/backends/oboe.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_OBOE_H #define BACKENDS_OBOE_H -#include "backends/base.h" +#include "base.h" struct OboeBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/opensl.cpp b/alc/backends/opensl.cpp index af656470..7be7f031 100644 --- a/alc/backends/opensl.cpp +++ b/alc/backends/opensl.cpp @@ -21,7 +21,7 @@ #include "config.h" -#include "backends/opensl.h" +#include "opensl.h" #include <stdlib.h> #include <jni.h> @@ -33,8 +33,8 @@ #include <functional> #include "albit.h" -#include "alcmain.h" -#include "alu.h" +#include "alnumeric.h" +#include "core/device.h" #include "core/helpers.h" #include "core/logging.h" #include "opthelpers.h" diff --git a/alc/backends/opensl.h b/alc/backends/opensl.h index 36586bbb..b8162447 100644 --- a/alc/backends/opensl.h +++ b/alc/backends/opensl.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_OSL_H #define BACKENDS_OSL_H -#include "backends/base.h" +#include "base.h" struct OSLBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/oss.cpp b/alc/backends/oss.cpp index d769a1eb..6d4fa261 100644 --- a/alc/backends/oss.cpp +++ b/alc/backends/oss.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "backends/oss.h" +#include "oss.h" #include <fcntl.h> #include <poll.h> @@ -41,13 +41,12 @@ #include <thread> #include <utility> -#include "alcmain.h" -#include "alconfig.h" #include "albyte.h" +#include "alc/alconfig.h" #include "almalloc.h" #include "alnumeric.h" #include "aloptional.h" -#include "alu.h" +#include "core/device.h" #include "core/helpers.h" #include "core/logging.h" #include "ringbuffer.h" diff --git a/alc/backends/oss.h b/alc/backends/oss.h index 798da456..4f2c00b9 100644 --- a/alc/backends/oss.h +++ b/alc/backends/oss.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_OSS_H #define BACKENDS_OSS_H -#include "backends/base.h" +#include "base.h" struct OSSBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/portaudio.cpp b/alc/backends/portaudio.cpp index 8f41b12a..2d5cd36d 100644 --- a/alc/backends/portaudio.cpp +++ b/alc/backends/portaudio.cpp @@ -20,15 +20,15 @@ #include "config.h" -#include "backends/portaudio.h" +#include "portaudio.h" #include <cstdio> #include <cstdlib> #include <cstring> -#include "alcmain.h" -#include "alu.h" -#include "alconfig.h" +#include "alc/alconfig.h" +#include "alnumeric.h" +#include "core/device.h" #include "core/logging.h" #include "dynload.h" #include "ringbuffer.h" diff --git a/alc/backends/portaudio.h b/alc/backends/portaudio.h index 34bb8d1b..c35ccff2 100644 --- a/alc/backends/portaudio.h +++ b/alc/backends/portaudio.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_PORTAUDIO_H #define BACKENDS_PORTAUDIO_H -#include "backends/base.h" +#include "base.h" struct PortBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp index da1ffcb0..23bcecad 100644 --- a/alc/backends/pulseaudio.cpp +++ b/alc/backends/pulseaudio.cpp @@ -21,7 +21,7 @@ #include "config.h" -#include "backends/pulseaudio.h" +#include "pulseaudio.h" #include <algorithm> #include <array> @@ -43,7 +43,7 @@ #include <utility> #include "albyte.h" -#include "alconfig.h" +#include "alc/alconfig.h" #include "almalloc.h" #include "alnumeric.h" #include "aloptional.h" diff --git a/alc/backends/pulseaudio.h b/alc/backends/pulseaudio.h index 60ebbc36..6690fe8a 100644 --- a/alc/backends/pulseaudio.h +++ b/alc/backends/pulseaudio.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_PULSEAUDIO_H #define BACKENDS_PULSEAUDIO_H -#include "backends/base.h" +#include "base.h" class PulseBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/sndio.cpp b/alc/backends/sndio.cpp index c7c42210..2d8b424c 100644 --- a/alc/backends/sndio.cpp +++ b/alc/backends/sndio.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "backends/sndio.h" +#include "sndio.h" #include <stdio.h> #include <stdlib.h> @@ -29,8 +29,8 @@ #include <thread> #include <functional> -#include "alcmain.h" -#include "alu.h" +#include "alnumeric.h" +#include "core/device.h" #include "core/helpers.h" #include "core/logging.h" #include "ringbuffer.h" diff --git a/alc/backends/sndio.h b/alc/backends/sndio.h index 9b93199f..d9433191 100644 --- a/alc/backends/sndio.h +++ b/alc/backends/sndio.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_SNDIO_H #define BACKENDS_SNDIO_H -#include "backends/base.h" +#include "base.h" struct SndIOBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp index 114c69e0..d38fc25d 100644 --- a/alc/backends/wasapi.cpp +++ b/alc/backends/wasapi.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "backends/wasapi.h" +#include "wasapi.h" #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -56,10 +56,10 @@ #include <vector> #include "albit.h" -#include "alcmain.h" -#include "alu.h" +#include "alnumeric.h" #include "comptr.h" #include "core/converter.h" +#include "core/device.h" #include "core/helpers.h" #include "core/logging.h" #include "ringbuffer.h" diff --git a/alc/backends/wasapi.h b/alc/backends/wasapi.h index fa4b811e..bb2671ee 100644 --- a/alc/backends/wasapi.h +++ b/alc/backends/wasapi.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_WASAPI_H #define BACKENDS_WASAPI_H -#include "backends/base.h" +#include "base.h" struct WasapiBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/wave.cpp b/alc/backends/wave.cpp index 434a5fb1..259cbc62 100644 --- a/alc/backends/wave.cpp +++ b/alc/backends/wave.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "backends/wave.h" +#include "wave.h" #include <algorithm> #include <atomic> @@ -35,11 +35,10 @@ #include "albit.h" #include "albyte.h" -#include "alcmain.h" -#include "alconfig.h" +#include "alc/alconfig.h" #include "almalloc.h" #include "alnumeric.h" -#include "alu.h" +#include "core/device.h" #include "core/helpers.h" #include "core/logging.h" #include "opthelpers.h" diff --git a/alc/backends/wave.h b/alc/backends/wave.h index 926e2198..e768d336 100644 --- a/alc/backends/wave.h +++ b/alc/backends/wave.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_WAVE_H #define BACKENDS_WAVE_H -#include "backends/base.h" +#include "base.h" struct WaveBackendFactory final : public BackendFactory { public: diff --git a/alc/backends/winmm.cpp b/alc/backends/winmm.cpp index c346a828..42aee313 100644 --- a/alc/backends/winmm.cpp +++ b/alc/backends/winmm.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "backends/winmm.h" +#include "winmm.h" #include <stdlib.h> #include <stdio.h> @@ -38,8 +38,8 @@ #include <algorithm> #include <functional> -#include "alcmain.h" -#include "alu.h" +#include "alnumeric.h" +#include "core/device.h" #include "core/helpers.h" #include "core/logging.h" #include "ringbuffer.h" diff --git a/alc/backends/winmm.h b/alc/backends/winmm.h index a376b8a4..45a706aa 100644 --- a/alc/backends/winmm.h +++ b/alc/backends/winmm.h @@ -1,7 +1,7 @@ #ifndef BACKENDS_WINMM_H #define BACKENDS_WINMM_H -#include "backends/base.h" +#include "base.h" struct WinMMBackendFactory final : public BackendFactory { public: diff --git a/alc/effects/autowah.cpp b/alc/effects/autowah.cpp index 6016b8ab..9c2ec335 100644 --- a/alc/effects/autowah.cpp +++ b/alc/effects/autowah.cpp @@ -26,6 +26,8 @@ #include <iterator> #include <utility> +#include "alc/effects/base.h" +#include "alc/effectslot.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" @@ -35,8 +37,6 @@ #include "core/devformat.h" #include "core/device.h" #include "core/mixer.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" #include "math_defs.h" diff --git a/alc/effects/base.h b/alc/effects/base.h index 6c31ae0c..1fb339aa 100644 --- a/alc/effects/base.h +++ b/alc/effects/base.h @@ -1,18 +1,21 @@ #ifndef EFFECTS_BASE_H #define EFFECTS_BASE_H -#include <cstddef> +#include <stddef.h> #include "albyte.h" -#include "alcmain.h" #include "almalloc.h" #include "alspan.h" #include "atomic.h" +#include "core/bufferline.h" #include "intrusive_ptr.h" +struct BufferStorage; struct ContextBase; +struct DeviceBase; struct EffectSlot; -struct BufferStorage; +struct MixParams; +struct RealMixParams; /** Target gain for the reverb decay feedback reaching the decay time. */ diff --git a/alc/effects/chorus.cpp b/alc/effects/chorus.cpp index 50cf1e40..3a1b9ae4 100644 --- a/alc/effects/chorus.cpp +++ b/alc/effects/chorus.cpp @@ -26,6 +26,8 @@ #include <cstdlib> #include <iterator> +#include "alc/effects/base.h" +#include "alc/effectslot.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" @@ -36,8 +38,6 @@ #include "core/mixer.h" #include "core/mixer/defs.h" #include "core/resampler_limits.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" #include "math_defs.h" #include "opthelpers.h" diff --git a/alc/effects/compressor.cpp b/alc/effects/compressor.cpp index 9a6f9b5d..030bfe08 100644 --- a/alc/effects/compressor.cpp +++ b/alc/effects/compressor.cpp @@ -37,6 +37,8 @@ #include <iterator> #include <utility> +#include "alc/effects/base.h" +#include "alc/effectslot.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" @@ -46,8 +48,6 @@ #include "core/device.h" #include "core/mixer.h" #include "core/mixer/defs.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" struct ContextBase; diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp index fd68ea41..ca5a7321 100644 --- a/alc/effects/convolution.cpp +++ b/alc/effects/convolution.cpp @@ -19,9 +19,11 @@ #include "albyte.h" #include "alcomplex.h" +#include "alc/effectslot.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" +#include "base.h" #include "core/ambidefs.h" #include "core/bufferline.h" #include "core/buffer_storage.h" @@ -31,8 +33,6 @@ #include "core/filters/splitter.h" #include "core/fmt_traits.h" #include "core/mixer.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" #include "math_defs.h" #include "polyphase_resampler.h" diff --git a/alc/effects/dedicated.cpp b/alc/effects/dedicated.cpp index 6afd7baa..e7ea89e0 100644 --- a/alc/effects/dedicated.cpp +++ b/alc/effects/dedicated.cpp @@ -25,14 +25,14 @@ #include <cstdlib> #include <iterator> +#include "alc/effects/base.h" +#include "alc/effectslot.h" #include "almalloc.h" #include "alspan.h" #include "core/bufferline.h" #include "core/devformat.h" #include "core/device.h" #include "core/mixer.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" struct ContextBase; diff --git a/alc/effects/distortion.cpp b/alc/effects/distortion.cpp index a3f287c0..26b4df8e 100644 --- a/alc/effects/distortion.cpp +++ b/alc/effects/distortion.cpp @@ -25,6 +25,8 @@ #include <cstdlib> #include <iterator> +#include "alc/effects/base.h" +#include "alc/effectslot.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" @@ -35,8 +37,6 @@ #include "core/filters/biquad.h" #include "core/mixer.h" #include "core/mixer/defs.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" #include "math_defs.h" diff --git a/alc/effects/echo.cpp b/alc/effects/echo.cpp index 4fccabfe..4cdef37c 100644 --- a/alc/effects/echo.cpp +++ b/alc/effects/echo.cpp @@ -26,6 +26,8 @@ #include <iterator> #include <tuple> +#include "alc/effects/base.h" +#include "alc/effectslot.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" @@ -35,8 +37,6 @@ #include "core/device.h" #include "core/filters/biquad.h" #include "core/mixer.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" #include "opthelpers.h" #include "vector.h" diff --git a/alc/effects/equalizer.cpp b/alc/effects/equalizer.cpp index aedf537e..800330a3 100644 --- a/alc/effects/equalizer.cpp +++ b/alc/effects/equalizer.cpp @@ -27,6 +27,8 @@ #include <iterator> #include <utility> +#include "alc/effects/base.h" +#include "alc/effectslot.h" #include "almalloc.h" #include "alspan.h" #include "core/ambidefs.h" @@ -36,8 +38,6 @@ #include "core/device.h" #include "core/filters/biquad.h" #include "core/mixer.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" diff --git a/alc/effects/fshifter.cpp b/alc/effects/fshifter.cpp index e19809bb..c25aab82 100644 --- a/alc/effects/fshifter.cpp +++ b/alc/effects/fshifter.cpp @@ -27,6 +27,8 @@ #include <cstdlib> #include <iterator> +#include "alc/effects/base.h" +#include "alc/effectslot.h" #include "alcomplex.h" #include "almalloc.h" #include "alnumeric.h" @@ -37,8 +39,6 @@ #include "core/device.h" #include "core/mixer.h" #include "core/mixer/defs.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" #include "math_defs.h" diff --git a/alc/effects/modulator.cpp b/alc/effects/modulator.cpp index ded35805..a518ff63 100644 --- a/alc/effects/modulator.cpp +++ b/alc/effects/modulator.cpp @@ -25,6 +25,8 @@ #include <cstdlib> #include <iterator> +#include "alc/effects/base.h" +#include "alc/effectslot.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" @@ -35,8 +37,6 @@ #include "core/device.h" #include "core/filters/biquad.h" #include "core/mixer.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" #include "math_defs.h" diff --git a/alc/effects/null.cpp b/alc/effects/null.cpp index 1413909f..cda1420e 100644 --- a/alc/effects/null.cpp +++ b/alc/effects/null.cpp @@ -5,8 +5,8 @@ #include "almalloc.h" #include "alspan.h" +#include "base.h" #include "core/bufferline.h" -#include "effects/base.h" #include "intrusive_ptr.h" struct ContextBase; diff --git a/alc/effects/pshifter.cpp b/alc/effects/pshifter.cpp index 5bf813e5..26115605 100644 --- a/alc/effects/pshifter.cpp +++ b/alc/effects/pshifter.cpp @@ -27,6 +27,8 @@ #include <cstdlib> #include <iterator> +#include "alc/effects/base.h" +#include "alc/effectslot.h" #include "alcomplex.h" #include "almalloc.h" #include "alnumeric.h" @@ -36,8 +38,6 @@ #include "core/device.h" #include "core/mixer.h" #include "core/mixer/defs.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" #include "math_defs.h" diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp index 0db27210..d6f1dbbf 100644 --- a/alc/effects/reverb.cpp +++ b/alc/effects/reverb.cpp @@ -28,6 +28,8 @@ #include <numeric> #include <stdint.h> +#include "alc/effects/base.h" +#include "alc/effectslot.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" @@ -40,8 +42,6 @@ #include "core/filters/splitter.h" #include "core/mixer.h" #include "core/mixer/defs.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" #include "math_defs.h" #include "opthelpers.h" diff --git a/alc/effects/vmorpher.cpp b/alc/effects/vmorpher.cpp index c3790e30..6c419ba2 100644 --- a/alc/effects/vmorpher.cpp +++ b/alc/effects/vmorpher.cpp @@ -38,6 +38,8 @@ #include <functional> #include <iterator> +#include "alc/effects/base.h" +#include "alc/effectslot.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" @@ -47,8 +49,6 @@ #include "core/devformat.h" #include "core/device.h" #include "core/mixer.h" -#include "effects/base.h" -#include "effectslot.h" #include "intrusive_ptr.h" #include "math_defs.h" diff --git a/alc/effectslot.h b/alc/effectslot.h index c1eb1cc3..cbb1a2f5 100644 --- a/alc/effectslot.h +++ b/alc/effectslot.h @@ -1,14 +1,13 @@ #ifndef EFFECTSLOT_H #define EFFECTSLOT_H -#include <atomic.h> +#include <atomic> #include "almalloc.h" -#include "alcmain.h" +#include "core/device.h" #include "effects/base.h" #include "intrusive_ptr.h" - struct EffectSlot; struct WetBuffer; diff --git a/core/helpers.cpp b/core/helpers.cpp index a2f1a6c9..94219544 100644 --- a/core/helpers.cpp +++ b/core/helpers.cpp @@ -10,9 +10,9 @@ #include <cstdio> #include <cstring> #include <mutex> +#include <limits> #include <string> -#include "alcmain.h" #include "almalloc.h" #include "alfstream.h" #include "aloptional.h" @@ -199,7 +199,8 @@ void SetRTPriority(void) #include <sys/time.h> #include <sys/resource.h> -#include "core/rtkit.h" +#include "dbus_wrap.h" +#include "rtkit.h" #ifndef RLIMIT_RTTIME #define RLIMIT_RTTIME 15 #endif |