aboutsummaryrefslogtreecommitdiffstats
path: root/alc/panning.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'alc/panning.cpp')
-rw-r--r--alc/panning.cpp13
1 files changed, 1 insertions, 12 deletions
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;