Move some HRTF definitions to a separate header

1 files changed, 2 insertions, 31 deletions

diff --git a/alc/hrtf.h b/alc/hrtf.h
index e0e406dc..573cef53 100644
--- a/alc/hrtf.h
+++ b/alc/hrtf.h
@@ -13,26 +13,10 @@
 #include "core/bufferline.h"
 #include "core/filters/splitter.h"
 #include "intrusive_ptr.h"
+#include "mixer/hrtfdefs.h"
 #include "vector.h"
 
 
-#define HRTF_HISTORY_BITS   6
-#define HRTF_HISTORY_LENGTH (1<<HRTF_HISTORY_BITS)
-#define HRTF_HISTORY_MASK   (HRTF_HISTORY_LENGTH-1)
-
-#define HRIR_BITS   7
-#define HRIR_LENGTH (1<<HRIR_BITS)
-#define HRIR_MASK   (HRIR_LENGTH-1)
-
-#define MIN_IR_LENGTH 8
-
-using float2 = std::array<float,2>;
-using HrirArray = std::array<float2,HRIR_LENGTH>;
-using ubyte = unsigned char;
-using ubyte2 = std::array<ubyte,2>;
-using ushort = unsigned short;
-using uint = unsigned int;
-
 struct HrtfStore {
     RefCount mRef;
 
@@ -65,13 +49,6 @@ struct HrtfStore {
 using HrtfStorePtr = al::intrusive_ptr<HrtfStore>;
 
 
-struct HrtfFilter {
-    alignas(16) HrirArray Coeffs;
-    std::array<uint,2> Delay;
-    float Gain;
-};
-
-
 struct EvRadians { float value; };
 struct AzRadians { float value; };
 struct AngularPoint {
@@ -79,13 +56,7 @@ struct AngularPoint {
     AzRadians Azim;
 };
 
-#define HRTF_DIRECT_DELAY 192
-struct HrtfChannelState {
-    std::array<float,HRTF_DIRECT_DELAY> mDelay{};
-    BandSplitter mSplitter;
-    float mHfScale{};
-    alignas(16) HrirArray mCoeffs{};
-};
+
 struct DirectHrtfState {
     std::array<float,HRTF_DIRECT_DELAY+BufferLineSize> mTemp;