Move mastering.cpp/h to core

CMakeLists.txt

@@ -630,6 +630,8 @@ set(ALC_OBJS
     core/bufferline.h
     core/devformat.cpp
     core/devformat.h
+    core/mastering.cpp
+    core/mastering.h
 
     alc/alc.cpp
     alc/alcmain.h
@@ -688,8 +690,6 @@ set(ALC_OBJS
     alc/hrtf.h
     alc/inprogext.h
     alc/logging.h
-    alc/mastering.cpp
-    alc/mastering.h
     alc/panning.cpp
     alc/ringbuffer.cpp
     alc/ringbuffer.h

alc/alc.cpp

@@ -81,6 +81,7 @@
 #include "bs2b.h"
 #include "compat.h"
 #include "core/devformat.h"
+#include "core/mastering.h"
 #include "cpu_caps.h"
 #include "effects/base.h"
 #include "filters/nfc.h"
@@ -91,7 +92,6 @@
 #include "inprogext.h"
 #include "intrusive_ptr.h"
 #include "logging.h"
-#include "mastering.h"
 #include "opthelpers.h"
 #include "pragmadefs.h"
 #include "ringbuffer.h"

alc/alu.cpp

@@ -60,6 +60,7 @@
 #include "bformatdec.h"
 #include "bs2b.h"
 #include "core/devformat.h"
+#include "core/mastering.h"
 #include "cpu_caps.h"
 #include "effects/base.h"
 #include "filters/biquad.h"
@@ -69,7 +70,6 @@
 #include "front_stablizer.h"
 #include "hrtf.h"
 #include "inprogext.h"
-#include "mastering.h"
 #include "math_defs.h"
 #include "mixer/defs.h"
 #include "opthelpers.h"

core/mastering.cpp

@@ -13,7 +13,7 @@
 
 #include "almalloc.h"
 #include "alnumeric.h"
-#include "alu.h"
+#include "alspan.h"
 #include "opthelpers.h"
 
 

core/mastering.h

@@ -1,10 +1,10 @@
-#ifndef MASTERING_H
+#ifndef CORE_MASTERING_H
-#define MASTERING_H
+#define CORE_MASTERING_H
 
 #include <memory>
 
 #include "almalloc.h"
-#include "core/bufferline.h"
+#include "bufferline.h"
 
 struct SlidingHold;
 
@@ -101,4 +101,4 @@ struct Compressor {
         const float ReleaseTime);
 };
 
-#endif /* MASTERING_H */
+#endif /* CORE_MASTERING_H */