From 58085f1c7b64992065e65858d98acfd2c2db3514 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Wed, 2 Oct 2019 19:13:07 -0700 Subject: Clean up some unnecessary includes --- alc/alc.cpp | 5 ++++- alc/alu.h | 16 ---------------- alc/voice.h | 3 +++ 3 files changed, 7 insertions(+), 17 deletions(-) (limited to 'alc') diff --git a/alc/alc.cpp b/alc/alc.cpp index fad43f7b..03ed35cc 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -877,6 +877,9 @@ ALeffect DefaultEffect; */ bool SuspendDefers{true}; +/* Initial seed for dithering. */ +constexpr ALuint DitherRNGSeed{22222u}; + /************************************************ * ALC information @@ -1861,7 +1864,7 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList) device->FixedLatency = nanoseconds::zero(); device->DitherDepth = 0.0f; - device->DitherSeed = DITHER_RNG_SEED; + device->DitherSeed = DitherRNGSeed; /************************************************************************* * Update device format request if HRTF is requested diff --git a/alc/alu.h b/alc/alu.h index e10bd7ab..f4d1e6b2 100644 --- a/alc/alu.h +++ b/alc/alu.h @@ -2,39 +2,23 @@ #define ALU_H #include -#include #include #include #include "AL/al.h" -#include "AL/alc.h" -#include "AL/alext.h" -#include "al/buffer.h" #include "alcmain.h" -#include "almalloc.h" #include "alspan.h" -#include "ambidefs.h" -#include "devformat.h" -#include "filters/biquad.h" -#include "filters/nfc.h" -#include "filters/splitter.h" -#include "hrtf.h" #include "logging.h" struct ALbufferlistitem; struct ALeffectslot; -enum class DistanceModel; - #define MAX_PITCH 255 #define MAX_SENDS 16 -#define DITHER_RNG_SEED 22222 - - using MixerFunc = void(*)(const al::span InSamples, const al::span OutBuffer, float *CurrentGains, const float *TargetGains, const size_t Counter, const size_t OutPos); diff --git a/alc/voice.h b/alc/voice.h index de77834e..3b1675e6 100644 --- a/alc/voice.h +++ b/alc/voice.h @@ -4,6 +4,7 @@ #include "AL/al.h" #include "AL/alext.h" +#include "al/buffer.h" #include "alspan.h" #include "alu.h" #include "filters/biquad.h" @@ -11,6 +12,8 @@ #include "filters/splitter.h" #include "hrtf.h" +enum class DistanceModel; + enum SpatializeMode { SpatializeOff = AL_FALSE, -- cgit v1.2.3