diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | alc/alc.cpp | 4 | ||||
| -rw-r--r-- | alc/alu.cpp | 4 | ||||
| -rw-r--r-- | alc/ambidefs.h | 3 | ||||
| -rw-r--r-- | alc/panning.cpp | 4 | ||||
| -rw-r--r-- | core/bs2b.cpp (renamed from alc/bs2b.cpp) | 0 | ||||
| -rw-r--r-- | core/bs2b.h (renamed from alc/bs2b.h) | 6 | ||||
| -rw-r--r-- | core/uhjfilter.cpp (renamed from alc/uhjfilter.cpp) | 2 | ||||
| -rw-r--r-- | core/uhjfilter.h (renamed from alc/uhjfilter.h) | 8 |
9 files changed, 19 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c08af6b..d74c3f75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -627,6 +627,8 @@ set(OPENAL_OBJS al/state.cpp ) set(ALC_OBJS + core/bs2b.cpp + core/bs2b.h core/bsinc_defs.h core/bsinc_tables.cpp core/bsinc_tables.h @@ -641,6 +643,8 @@ set(ALC_OBJS core/filters/splitter.h core/mastering.cpp core/mastering.h + core/uhjfilter.cpp + core/uhjfilter.h alc/alc.cpp alc/alcmain.h @@ -654,8 +658,6 @@ set(ALC_OBJS alc/ambidefs.h alc/bformatdec.cpp alc/bformatdec.h - alc/bs2b.cpp - alc/bs2b.h alc/buffer_storage.cpp alc/buffer_storage.h alc/compat.h @@ -693,8 +695,6 @@ set(ALC_OBJS alc/panning.cpp alc/ringbuffer.cpp alc/ringbuffer.h - alc/uhjfilter.cpp - alc/uhjfilter.h alc/uiddefs.cpp alc/voice.cpp alc/voice.h diff --git a/alc/alc.cpp b/alc/alc.cpp index 87c0578e..00008a81 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -78,12 +78,13 @@ #include "ambidefs.h" #include "atomic.h" #include "bformatdec.h" -#include "bs2b.h" #include "compat.h" +#include "core/bs2b.h" #include "core/devformat.h" #include "core/mastering.h" #include "core/filters/nfc.h" #include "core/filters/splitter.h" +#include "core/uhjfilter.h" #include "cpu_caps.h" #include "effects/base.h" #include "fpu_ctrl.h" @@ -97,7 +98,6 @@ #include "ringbuffer.h" #include "strutils.h" #include "threads.h" -#include "uhjfilter.h" #include "vecmat.h" #include "vector.h" diff --git a/alc/alu.cpp b/alc/alu.cpp index c13365ec..62938b2a 100644 --- a/alc/alu.cpp +++ b/alc/alu.cpp @@ -58,13 +58,14 @@ #include "ambidefs.h" #include "atomic.h" #include "bformatdec.h" -#include "bs2b.h" +#include "core/bs2b.h" #include "core/bsinc_tables.h" #include "core/devformat.h" #include "core/filters/biquad.h" #include "core/filters/nfc.h" #include "core/filters/splitter.h" #include "core/mastering.h" +#include "core/uhjfilter.h" #include "cpu_caps.h" #include "effects/base.h" #include "fpu_ctrl.h" @@ -77,7 +78,6 @@ #include "ringbuffer.h" #include "strutils.h" #include "threads.h" -#include "uhjfilter.h" #include "vecmat.h" #include "voice.h" diff --git a/alc/ambidefs.h b/alc/ambidefs.h index 8d4b96ca..79c0f1cf 100644 --- a/alc/ambidefs.h +++ b/alc/ambidefs.h @@ -2,7 +2,8 @@ #define AMBIDEFS_H #include <array> -#include <cstdint> +#include <stddef.h> +#include <stdint.h> /* The maximum number of Ambisonics channels. For a given order (o), the size * needed will be (o+1)**2, thus zero-order has 1, first-order has 4, second- diff --git a/alc/panning.cpp b/alc/panning.cpp index 86a71a24..bfc640c0 100644 --- a/alc/panning.cpp +++ b/alc/panning.cpp @@ -50,14 +50,14 @@ #include "ambdec.h" #include "ambidefs.h" #include "bformatdec.h" -#include "bs2b.h" +#include "core/bs2b.h" #include "core/devformat.h" +#include "core/uhjfilter.h" #include "front_stablizer.h" #include "hrtf.h" #include "logging.h" #include "math_defs.h" #include "opthelpers.h" -#include "uhjfilter.h" constexpr std::array<float,MAX_AMBI_CHANNELS> AmbiScale::FromN3D; diff --git a/alc/bs2b.cpp b/core/bs2b.cpp index 00207bc0..00207bc0 100644 --- a/alc/bs2b.cpp +++ b/core/bs2b.cpp diff --git a/alc/bs2b.h b/core/bs2b.h index df717cd4..4d0b9dd8 100644 --- a/alc/bs2b.h +++ b/core/bs2b.h @@ -21,8 +21,8 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef BS2B_H -#define BS2B_H +#ifndef CORE_BS2B_H +#define CORE_BS2B_H #include "almalloc.h" @@ -86,4 +86,4 @@ void bs2b_clear(bs2b *bs2b); void bs2b_cross_feed(bs2b *bs2b, float *Left, float *Right, size_t SamplesToDo); -#endif /* BS2B_H */ +#endif /* CORE_BS2B_H */ diff --git a/alc/uhjfilter.cpp b/core/uhjfilter.cpp index 09edba84..a415f07c 100644 --- a/alc/uhjfilter.cpp +++ b/core/uhjfilter.cpp @@ -10,8 +10,6 @@ #include <algorithm> #include <iterator> -#include "AL/al.h" - #include "alcomplex.h" #include "alnumeric.h" #include "opthelpers.h" diff --git a/alc/uhjfilter.h b/core/uhjfilter.h index 4984bcab..c2cb8722 100644 --- a/alc/uhjfilter.h +++ b/core/uhjfilter.h @@ -1,10 +1,10 @@ -#ifndef UHJFILTER_H -#define UHJFILTER_H +#ifndef CORE_UHJFILTER_H +#define CORE_UHJFILTER_H #include <array> #include "almalloc.h" -#include "core/bufferline.h" +#include "bufferline.h" struct Uhj2Encoder { @@ -36,4 +36,4 @@ struct Uhj2Encoder { DEF_NEWDEL(Uhj2Encoder) }; -#endif /* UHJFILTER_H */ +#endif /* CORE_UHJFILTER_H */ |