Move the ambdec loader to core

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

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"

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"

core/ambdec.h

@@ -1,5 +1,5 @@
-#ifndef AMBDEC_H
+#ifndef CORE_AMBDEC_H
-#define 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 */