Move the mixer functions to core

CMakeLists.txt

@@ -615,7 +615,11 @@ set(CORE_OBJS
     core/mastering.cpp
     core/mastering.h
     core/uhjfilter.cpp
-    core/uhjfilter.h)
+    core/uhjfilter.h
+    core/mixer/defs.h
+    core/mixer/hrtfbase.h
+    core/mixer/hrtfdefs.h
+    core/mixer/mixer_c.cpp)
 
 # AL and related routines
 set(OPENAL_OBJS
@@ -702,11 +706,7 @@ set(ALC_OBJS
     alc/panning.cpp
     alc/uiddefs.cpp
     alc/voice.cpp
-    alc/voice.h
+    alc/voice.h)
-    alc/mixer/defs.h
-    alc/mixer/hrtfbase.h
-    alc/mixer/hrtfdefs.h
-    alc/mixer/mixer_c.cpp)
 
 
 set(CPU_EXTS "Default")
@@ -725,9 +725,9 @@ if(HAVE_XMMINTRIN_H AND HAVE_EMMINTRIN_H)
     if(ALSOFT_CPUEXT_SSE AND ALSOFT_CPUEXT_SSE2)
         set(HAVE_SSE 1)
         set(HAVE_SSE2 1)
-        set(ALC_OBJS  ${ALC_OBJS} alc/mixer/mixer_sse.cpp alc/mixer/mixer_sse2.cpp)
+        set(CORE_OBJS  ${CORE_OBJS} core/mixer/mixer_sse.cpp core/mixer/mixer_sse2.cpp)
         if(SSE2_SWITCH)
-            set_source_files_properties(alc/mixer/mixer_sse.cpp alc/mixer/mixer_sse2.cpp
+            set_source_files_properties(core/mixer/mixer_sse.cpp core/mixer/mixer_sse2.cpp
                 PROPERTIES COMPILE_FLAGS "${SSE2_SWITCH}")
         endif()
         set(CPU_EXTS "${CPU_EXTS}, SSE, SSE2")
@@ -745,9 +745,9 @@ if(HAVE_EMMINTRIN_H)
     option(ALSOFT_CPUEXT_SSE3 "Enable SSE3 support" ON)
     if(HAVE_SSE2 AND ALSOFT_CPUEXT_SSE3)
         set(HAVE_SSE3 1)
-        set(ALC_OBJS  ${ALC_OBJS} alc/mixer/mixer_sse3.cpp)
+        set(CORE_OBJS  ${CORE_OBJS} core/mixer/mixer_sse3.cpp)
         if(SSE2_SWITCH)
-            set_source_files_properties(alc/mixer/mixer_sse3.cpp PROPERTIES
+            set_source_files_properties(core/mixer/mixer_sse3.cpp PROPERTIES
                 COMPILE_FLAGS "${SSE3_SWITCH}")
         endif()
         set(CPU_EXTS "${CPU_EXTS}, SSE3")
@@ -762,9 +762,9 @@ if(HAVE_SMMINTRIN_H)
     option(ALSOFT_CPUEXT_SSE4_1 "Enable SSE4.1 support" ON)
     if(HAVE_SSE3 AND ALSOFT_CPUEXT_SSE4_1)
         set(HAVE_SSE4_1 1)
-        set(ALC_OBJS  ${ALC_OBJS} alc/mixer/mixer_sse41.cpp)
+        set(CORE_OBJS  ${CORE_OBJS} core/mixer/mixer_sse41.cpp)
         if(SSE4_1_SWITCH)
-            set_source_files_properties(alc/mixer/mixer_sse41.cpp PROPERTIES
+            set_source_files_properties(core/mixer/mixer_sse41.cpp PROPERTIES
                 COMPILE_FLAGS "${SSE4_1_SWITCH}")
         endif()
         set(CPU_EXTS "${CPU_EXTS}, SSE4.1")
@@ -780,9 +780,9 @@ if(HAVE_ARM_NEON_H)
     option(ALSOFT_CPUEXT_NEON "Enable ARM Neon support" ON)
     if(ALSOFT_CPUEXT_NEON)
         set(HAVE_NEON 1)
-        set(ALC_OBJS  ${ALC_OBJS} alc/mixer/mixer_neon.cpp)
+        set(CORE_OBJS  ${CORE_OBJS} core/mixer/mixer_neon.cpp)
         if(FPU_NEON_SWITCH)
-            set_source_files_properties(alc/mixer/mixer_neon.cpp PROPERTIES
+            set_source_files_properties(core/mixer/mixer_neon.cpp PROPERTIES
                 COMPILE_FLAGS "${FPU_NEON_SWITCH}")
         endif()
         set(CPU_EXTS "${CPU_EXTS}, Neon")

alc/alcmain.h

@@ -26,10 +26,10 @@
 #include "core/bufferline.h"
 #include "core/devformat.h"
 #include "core/filters/splitter.h"
+#include "core/mixer/defs.h"
 #include "hrtf.h"
 #include "inprogext.h"
 #include "intrusive_ptr.h"
-#include "mixer/defs.h"
 #include "vector.h"
 
 class BFormatDec;

alc/alu.cpp

@@ -65,6 +65,7 @@
 #include "core/filters/nfc.h"
 #include "core/filters/splitter.h"
 #include "core/mastering.h"
+#include "core/mixer/defs.h"
 #include "core/uhjfilter.h"
 #include "cpu_caps.h"
 #include "effects/base.h"
@@ -73,7 +74,6 @@
 #include "hrtf.h"
 #include "inprogext.h"
 #include "math_defs.h"
-#include "mixer/defs.h"
 #include "opthelpers.h"
 #include "ringbuffer.h"
 #include "strutils.h"

alc/converter.cpp

@@ -12,7 +12,6 @@
 #include "albyte.h"
 #include "alnumeric.h"
 #include "fpu_ctrl.h"
-#include "mixer/defs.h"
 
 struct CTag;
 struct CopyTag;

alc/converter.h

@@ -6,7 +6,7 @@
 
 #include "almalloc.h"
 #include "core/devformat.h"
-#include "mixer/defs.h"
+#include "core/mixer/defs.h"
 
 using uint = unsigned int;
 

alc/hrtf.h

@@ -12,8 +12,8 @@
 #include "core/ambidefs.h"
 #include "core/bufferline.h"
 #include "core/filters/splitter.h"
+#include "core/mixer/hrtfdefs.h"
 #include "intrusive_ptr.h"
-#include "mixer/hrtfdefs.h"
 #include "vector.h"
 
 

alc/voice.cpp

@@ -50,13 +50,13 @@
 #include "core/filters/biquad.h"
 #include "core/filters/nfc.h"
 #include "core/filters/splitter.h"
+#include "core/mixer/defs.h"
+#include "core/mixer/hrtfdefs.h"
 #include "cpu_caps.h"
 #include "fmt_traits.h"
 #include "hrtf.h"
 #include "inprogext.h"
 #include "logging.h"
-#include "mixer/defs.h"
-#include "mixer/hrtfdefs.h"
 #include "opthelpers.h"
 #include "ringbuffer.h"
 #include "threads.h"

alc/voice.h

@@ -11,8 +11,8 @@
 #include "core/filters/biquad.h"
 #include "core/filters/nfc.h"
 #include "core/filters/splitter.h"
+#include "core/mixer/defs.h"
 #include "hrtf.h"
-#include "mixer/defs.h"
 
 struct EffectSlot;
 struct BufferlistItem;

core/mixer/defs.h

@@ -1,5 +1,5 @@
-#ifndef MIXER_DEFS_H
+#ifndef CORE_MIXER_DEFS_H
-#define MIXER_DEFS_H
+#define CORE_MIXER_DEFS_H
 
 #include <array>
 #include <stdlib.h>
@@ -97,4 +97,4 @@ inline void InitPosArrays(uint frac, uint increment, uint *frac_arr, uint *pos_a
     }
 }
 
-#endif /* MIXER_DEFS_H */
+#endif /* CORE_MIXER_DEFS_H */

core/mixer/hrtfbase.h

@@ -1,5 +1,5 @@
-#ifndef MIXER_HRTFBASE_H
+#ifndef CORE_MIXER_HRTFBASE_H
-#define MIXER_HRTFBASE_H
+#define CORE_MIXER_HRTFBASE_H
 
 #include <algorithm>
 #include <cmath>
@@ -156,4 +156,4 @@ inline void MixDirectHrtfBase(FloatBufferLine &LeftOut, FloatBufferLine &RightOu
     std::fill_n(accum_iter, BufferSize, float2{});
 }
 
-#endif /* MIXER_HRTFBASE_H */
+#endif /* CORE_MIXER_HRTFBASE_H */

core/mixer/hrtfdefs.h

@@ -1,5 +1,5 @@
-#ifndef MIXER_HRTFDEFS_H
+#ifndef CORE_MIXER_HRTFDEFS_H
-#define MIXER_HRTFDEFS_H
+#define CORE_MIXER_HRTFDEFS_H
 
 #include <array>
 
@@ -49,4 +49,4 @@ struct HrtfChannelState {
     alignas(16) HrirArray mCoeffs{};
 };
 
-#endif /* MIXER_HRTFDEFS_H */
+#endif /* CORE_MIXER_HRTFDEFS_H */