diff options
Diffstat (limited to 'alc')
-rw-r--r-- | alc/alu.h | 4 | ||||
-rw-r--r-- | alc/converter.cpp | 3 | ||||
-rw-r--r-- | alc/converter.h | 7 | ||||
-rw-r--r-- | alc/hrtf.h | 2 | ||||
-rw-r--r-- | alc/mastering.cpp | 16 | ||||
-rw-r--r-- | alc/mastering.h | 4 | ||||
-rw-r--r-- | alc/ringbuffer.cpp | 10 | ||||
-rw-r--r-- | alc/uhjfilter.cpp | 5 |
8 files changed, 32 insertions, 19 deletions
@@ -1,5 +1,5 @@ -#ifndef _ALU_H_ -#define _ALU_H_ +#ifndef ALU_H +#define ALU_H #include <array> #include <atomic> diff --git a/alc/converter.cpp b/alc/converter.cpp index 0f8e8941..2e357fb8 100644 --- a/alc/converter.cpp +++ b/alc/converter.cpp @@ -4,7 +4,10 @@ #include "converter.h" #include <algorithm> +#include <cstdint> +#include <iterator> +#include "albyte.h" #include "fpu_modes.h" #include "mixer/defs.h" diff --git a/alc/converter.h b/alc/converter.h index 033e4d3f..bc51e46a 100644 --- a/alc/converter.h +++ b/alc/converter.h @@ -1,11 +1,16 @@ #ifndef CONVERTER_H #define CONVERTER_H +#include <cstddef> #include <memory> +#include "AL/al.h" + #include "alcmain.h" -#include "alu.h" #include "almalloc.h" +#include "alnumeric.h" +#include "alu.h" + struct SampleConverter { DevFmtType mSrcType{}; @@ -13,9 +13,9 @@ #include "atomic.h" #include "vector.h" - struct HrtfHandle; + #define HRTF_HISTORY_BITS (6) #define HRTF_HISTORY_LENGTH (1<<HRTF_HISTORY_BITS) #define HRTF_HISTORY_MASK (HRTF_HISTORY_LENGTH-1) diff --git a/alc/mastering.cpp b/alc/mastering.cpp index 551fdcdf..ec40001b 100644 --- a/alc/mastering.cpp +++ b/alc/mastering.cpp @@ -1,14 +1,20 @@ + #include "config.h" -#include <cmath> -#include <limits> +#include "mastering.h" + #include <algorithm> +#include <cmath> +#include <cstddef> #include <functional> +#include <iterator> +#include <limits> +#include <new> -#include "mastering.h" -#include "alu.h" #include "almalloc.h" -#include "math_defs.h" +#include "alnumeric.h" +#include "alu.h" +#include "opthelpers.h" /* These structures assume BUFFERSIZE is a power of 2. */ diff --git a/alc/mastering.h b/alc/mastering.h index 34dc8dcb..5be769ac 100644 --- a/alc/mastering.h +++ b/alc/mastering.h @@ -5,13 +5,13 @@ #include "AL/al.h" -#include "almalloc.h" /* For FloatBufferLine/BUFFERSIZE. */ #include "alcmain.h" - +#include "almalloc.h" struct SlidingHold; + /* General topology and basic automation was based on the following paper: * * D. Giannoulis, M. Massberg and J. D. Reiss, diff --git a/alc/ringbuffer.cpp b/alc/ringbuffer.cpp index 6ef576a5..d99676b8 100644 --- a/alc/ringbuffer.cpp +++ b/alc/ringbuffer.cpp @@ -20,17 +20,13 @@ #include "config.h" -#include <cstring> -#include <cstdlib> -#include <climits> +#include "ringbuffer.h" #include <algorithm> +#include <climits> +#include <cstdint> -#include "ringbuffer.h" -#include "atomic.h" -#include "threads.h" #include "almalloc.h" -#include "compat.h" RingBufferPtr CreateRingBuffer(size_t sz, size_t elem_sz, int limit_writes) diff --git a/alc/uhjfilter.cpp b/alc/uhjfilter.cpp index 55999647..b2cdf328 100644 --- a/alc/uhjfilter.cpp +++ b/alc/uhjfilter.cpp @@ -4,8 +4,11 @@ #include "uhjfilter.h" #include <algorithm> +#include <iterator> + +#include "alnumeric.h" +#include "opthelpers.h" -#include "alu.h" namespace { |