Move ambidefs.h to core

14 files changed, 31 insertions, 26 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca776f4e..ea09bbe2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -629,6 +629,8 @@ set(OPENAL_OBJS
     al/state.cpp
 )
 set(ALC_OBJS
+    core/ambidefs.cpp
+    core/ambidefs.h
     core/bs2b.cpp
     core/bs2b.h
     core/bsinc_defs.h
@@ -657,7 +659,6 @@ set(ALC_OBJS
     alc/alcontext.h
     alc/ambdec.cpp
     alc/ambdec.h
-    alc/ambidefs.h
     alc/bformatdec.cpp
     alc/bformatdec.h
     alc/buffer_storage.cpp
diff --git a/al/source.cpp b/al/source.cpp
index 5dcd1cca..762c9c09 100644
--- a/al/source.cpp
+++ b/al/source.cpp
@@ -53,12 +53,12 @@
 #include "aloptional.h"
 #include "alspan.h"
 #include "alu.h"
-#include "ambidefs.h"
 #include "atomic.h"
 #include "auxeffectslot.h"
 #include "backends/base.h"
 #include "bformatdec.h"
 #include "buffer.h"
+#include "core/ambidefs.h"
 #include "core/filters/nfc.h"
 #include "core/filters/splitter.h"
 #include "event.h"
diff --git a/alc/alc.cpp b/alc/alc.cpp
index 2e416d00..70890186 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -75,10 +75,10 @@
 #include "alspan.h"
 #include "alstring.h"
 #include "alu.h"
-#include "ambidefs.h"
 #include "atomic.h"
 #include "bformatdec.h"
 #include "compat.h"
+#include "core/ambidefs.h"
 #include "core/bs2b.h"
 #include "core/devformat.h"
 #include "core/mastering.h"
diff --git a/alc/alcmain.h b/alc/alcmain.h
index d809f8ee..ef52afc7 100644
--- a/alc/alcmain.h
+++ b/alc/alcmain.h
@@ -21,8 +21,8 @@
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
-#include "ambidefs.h"
 #include "atomic.h"
+#include "core/ambidefs.h"
 #include "core/bufferline.h"
 #include "core/devformat.h"
 #include "core/filters/splitter.h"
diff --git a/alc/alu.cpp b/alc/alu.cpp
index 1824a5a9..5ea54f23 100644
--- a/alc/alu.cpp
+++ b/alc/alu.cpp
@@ -55,9 +55,9 @@
 #include "alnumeric.h"
 #include "alspan.h"
 #include "alstring.h"
-#include "ambidefs.h"
 #include "atomic.h"
 #include "bformatdec.h"
+#include "core/ambidefs.h"
 #include "core/bs2b.h"
 #include "core/bsinc_tables.h"
 #include "core/devformat.h"
diff --git a/alc/alu.h b/alc/alu.h
index fd1d0b37..1393b824 100644
--- a/alc/alu.h
+++ b/alc/alu.h
@@ -7,7 +7,7 @@
 #include <type_traits>
 
 #include "alspan.h"
-#include "ambidefs.h"
+#include "core/ambidefs.h"
 #include "core/bufferline.h"
 #include "core/devformat.h"
 
diff --git a/alc/ambdec.h b/alc/ambdec.h
index db662a76..c96ded5b 100644
--- a/alc/ambdec.h
+++ b/alc/ambdec.h
@@ -4,7 +4,7 @@
 #include <array>
 #include <string>
 
-#include "ambidefs.h"
+#include "core/ambidefs.h"
 #include "vector.h"
 
 /* Helpers to read .ambdec configuration files. */
diff --git a/alc/bformatdec.h b/alc/bformatdec.h
index d9cddf51..7715d364 100644
--- a/alc/bformatdec.h
+++ b/alc/bformatdec.h
@@ -7,7 +7,7 @@
 
 #include "almalloc.h"
 #include "alspan.h"
-#include "ambidefs.h"
+#include "core/ambidefs.h"
 #include "core/bufferline.h"
 #include "core/devformat.h"
 #include "core/filters/splitter.h"
diff --git a/alc/effects/chorus.cpp b/alc/effects/chorus.cpp
index 68a79fba..2006b163 100644
--- a/alc/effects/chorus.cpp
+++ b/alc/effects/chorus.cpp
@@ -37,7 +37,7 @@
 #include "alnumeric.h"
 #include "alspan.h"
 #include "alu.h"
-#include "ambidefs.h"
+#include "core/ambidefs.h"
 #include "effects/base.h"
 #include "math_defs.h"
 #include "opthelpers.h"
diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp
index 8914835a..b190e75e 100644
--- a/alc/effects/convolution.cpp
+++ b/alc/effects/convolution.cpp
@@ -13,9 +13,9 @@
 #include "alcontext.h"
 #include "almalloc.h"
 #include "alspan.h"
-#include "ambidefs.h"
 #include "bformatdec.h"
 #include "buffer_storage.h"
+#include "core/ambidefs.h"
 #include "core/filters/splitter.h"
 #include "effects/base.h"
 #include "effectslot.h"
diff --git a/alc/hrtf.h b/alc/hrtf.h
index 9bb7f65f..025bfa92 100644
--- a/alc/hrtf.h
+++ b/alc/hrtf.h
@@ -8,8 +8,8 @@
 
 #include "almalloc.h"
 #include "alspan.h"
-#include "ambidefs.h"
 #include "atomic.h"
+#include "core/ambidefs.h"
 #include "core/bufferline.h"
 #include "core/filters/splitter.h"
 #include "intrusive_ptr.h"
diff --git a/alc/panning.cpp b/alc/panning.cpp
index c8db28c2..ad297ef7 100644
--- a/alc/panning.cpp
+++ b/alc/panning.cpp
@@ -48,8 +48,8 @@
 #include "alstring.h"
 #include "alu.h"
 #include "ambdec.h"
-#include "ambidefs.h"
 #include "bformatdec.h"
+#include "core/ambidefs.h"
 #include "core/bs2b.h"
 #include "core/devformat.h"
 #include "core/uhjfilter.h"
@@ -60,17 +60,6 @@
 #include "opthelpers.h"
 
 
-constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromN3D;
-constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromSN3D;
-constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromFuMa;
-constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromFuMa;
-constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::FromFuMa2D;
-constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromACN;
-constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::From2D;
-constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::OrderFromChannel;
-constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::OrderFrom2DChannel;
-
-
 namespace {
 
 using namespace std::placeholders;
diff --git a/core/ambidefs.cpp b/core/ambidefs.cpp
new file mode 100644
index 00000000..ab36d50b
--- /dev/null
+++ b/core/ambidefs.cpp
@@ -0,0 +1,15 @@
+
+#include "config.h"
+
+#include "ambidefs.h"
+
+
+constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromN3D;
+constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromSN3D;
+constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromFuMa;
+constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromFuMa;
+constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::FromFuMa2D;
+constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromACN;
+constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::From2D;
+constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::OrderFromChannel;
+constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::OrderFrom2DChannel;
diff --git a/alc/ambidefs.h b/core/ambidefs.h
index 339b51f9..05e3f5c8 100644
--- a/alc/ambidefs.h
+++ b/core/ambidefs.h
@@ -1,5 +1,5 @@
-#ifndef AMBIDEFS_H
-#define AMBIDEFS_H
+#ifndef CORE_AMBIDEFS_H
+#define CORE_AMBIDEFS_H
 
 #include <array>
 #include <stddef.h>
@@ -132,4 +132,4 @@ struct AmbiIndex {
     }};
 };
 
-#endif /* AMBIDEFS_H */
+#endif /* CORE_AMBIDEFS_H */