From 20820fd01beb265722d8521ad725c3c479800273 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 25 Dec 2020 06:30:47 -0800
Subject: [PATCH] Move the ambdec loader to core

---
 CMakeLists.txt           | 4 ++--
 alc/bformatdec.cpp       | 2 +-
 alc/panning.cpp          | 2 +-
 {alc => core}/ambdec.cpp | 0
 {alc => core}/ambdec.h   | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename {alc => core}/ambdec.cpp (100%)
 rename {alc => core}/ambdec.h (93%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cbe7850..05d04201 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -584,6 +584,8 @@ set(COMMON_OBJS
 
 # Core library routines
 set(CORE_OBJS
+    core/ambdec.cpp
+    core/ambdec.h
     core/ambidefs.cpp
     core/ambidefs.h
     core/bs2b.cpp
@@ -659,8 +661,6 @@ set(ALC_OBJS
     alc/alconfig.cpp
     alc/alconfig.h
     alc/alcontext.h
-    alc/ambdec.cpp
-    alc/ambdec.h
     alc/async_event.h
     alc/bformatdec.cpp
     alc/bformatdec.h
diff --git a/alc/bformatdec.cpp b/alc/bformatdec.cpp
index c47a042f..b1bd8981 100644
--- a/alc/bformatdec.cpp
+++ b/alc/bformatdec.cpp
@@ -12,7 +12,7 @@
 
 #include "almalloc.h"
 #include "alu.h"
-#include "ambdec.h"
+#include "core/ambdec.h"
 #include "core/filters/splitter.h"
 #include "front_stablizer.h"
 #include "math_defs.h"
diff --git a/alc/panning.cpp b/alc/panning.cpp
index cb77199f..456f6bef 100644
--- a/alc/panning.cpp
+++ b/alc/panning.cpp
@@ -47,8 +47,8 @@
 #include "alspan.h"
 #include "alstring.h"
 #include "alu.h"
-#include "ambdec.h"
 #include "bformatdec.h"
+#include "core/ambdec.h"
 #include "core/ambidefs.h"
 #include "core/bs2b.h"
 #include "core/devformat.h"
diff --git a/alc/ambdec.cpp b/core/ambdec.cpp
similarity index 100%
rename from alc/ambdec.cpp
rename to core/ambdec.cpp
diff --git a/alc/ambdec.h b/core/ambdec.h
similarity index 93%
rename from alc/ambdec.h
rename to core/ambdec.h
index c96ded5b..9f0db6b5 100644
--- a/alc/ambdec.h
+++ b/core/ambdec.h
@@ -1,5 +1,5 @@
-#ifndef AMBDEC_H
-#define AMBDEC_H
+#ifndef CORE_AMBDEC_H
+#define CORE_AMBDEC_H
 
 #include <array>
 #include <string>
@@ -45,4 +45,4 @@ struct AmbDecConf {
     int load(const char *fname) noexcept;
 };
 
-#endif /* AMBDEC_H */
+#endif /* CORE_AMBDEC_H */