aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/bformatdec.h
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-07-28 11:28:36 -0700
committerChris Robinson <[email protected]>2019-07-28 11:28:36 -0700
commit5428d6acc37e33802b0b66b2f9cdc0a37dd36429 (patch)
treee8e159f6b612e246a97e23d14f47a25f1996b35d /Alc/bformatdec.h
parent659b6d4245b92a7dba3a1b1693db6de8ddf999eb (diff)
Clean up includes a bit
Trying out the IWYU tool to only include what's necessary in a given file. Seems to work decently (it'll miss some headers, suggest unnecessary ones, and make nonsense suggestions for some things, but overall gives a good starting point), and helps clean out some headers.
Diffstat (limited to 'Alc/bformatdec.h')
-rw-r--r--Alc/bformatdec.h18
1 files changed, 12 insertions, 6 deletions
diff --git a/Alc/bformatdec.h b/Alc/bformatdec.h
index 1ec4a1bb..31abc4fe 100644
--- a/Alc/bformatdec.h
+++ b/Alc/bformatdec.h
@@ -1,11 +1,17 @@
#ifndef BFORMATDEC_H
#define BFORMATDEC_H
+#include <array>
+#include <cstddef>
+
+#include "AL/al.h"
+
#include "alMain.h"
-#include "filters/splitter.h"
-#include "ambidefs.h"
#include "almalloc.h"
-
+#include "alspan.h"
+#include "ambidefs.h"
+#include "filters/splitter.h"
+#include "vector.h"
struct AmbDecConf;
@@ -27,10 +33,10 @@ class BFormatDec {
/* NOTE: BandSplitter filters are unused with single-band decoding */
BandSplitter mXOver[MAX_AMBI_CHANNELS];
- al::vector<std::array<ALfloat,BUFFERSIZE>, 16> mSamples;
+ al::vector<FloatBufferLine, 16> mSamples;
/* These two alias into Samples */
- std::array<ALfloat,BUFFERSIZE> *mSamplesHF{nullptr};
- std::array<ALfloat,BUFFERSIZE> *mSamplesLF{nullptr};
+ FloatBufferLine *mSamplesHF{nullptr};
+ FloatBufferLine *mSamplesLF{nullptr};
ALuint mNumChannels{0u};
bool mDualBand{false};