Audio: mixer: move mixer header file to module folder

This is a clean up, purpose is declutter headers, toml files, Readme.md etc per module basis, since today everything is scattered in current code base. Signed-off-by: Baofeng Tian <baofeng.tian@intel.com>
thesofproject · Dec 13, 2023 · ded7ed8 · ded7ed8
1 parent c3ba7e4
commit ded7ed8
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 5 deletions.
diff --git a/src/audio/mixer/mixer.c b/src/audio/mixer/mixer.c
@@ -9,7 +9,6 @@
 #include <sof/audio/component.h>
 #include <sof/audio/format.h>
 #include <sof/audio/module_adapter/module/generic.h>
-#include <sof/audio/mixer.h>
 #include <sof/audio/pipeline.h>
 #include <sof/audio/ipc-config.h>
 #include <sof/common.h>
@@ -32,6 +31,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "mixer.h"
+
 LOG_MODULE_REGISTER(mixer, CONFIG_SOF_LOG_LEVEL);
 
 /* bc06c037-12aa-417c-9a97-89282e321a76 */

diff --git a/src/include/sof/audio/mixer.h → src/audio/mixer/mixer.h b/src/include/sof/audio/mixer.h → src/audio/mixer/mixer.h
diff --git a/src/audio/mixer/mixer_generic.c b/src/audio/mixer/mixer_generic.c
@@ -4,9 +4,10 @@
 //
 // Author: Andrula Song <xiaoyuan.song@intel.com>
 
-#include <sof/audio/mixer.h>
 #include <sof/common.h>
 
+#include "mixer.h"
+
 #ifdef MIXER_GENERIC
 
 #if CONFIG_FORMAT_S16LE

diff --git a/src/audio/mixer/mixer_hifi3.c b/src/audio/mixer/mixer_hifi3.c
@@ -4,9 +4,10 @@
 //
 // Author: Andrula Song <xiaoyuan.song@intel.com>
 
-#include <sof/audio/mixer.h>
 #include <sof/common.h>
 
+#include "mixer.h"
+
 #if __XCC__ && (XCHAL_HAVE_HIFI3 || XCHAL_HAVE_HIFI4)
 
 #include <xtensa/tie/xt_hifi3.h>

diff --git a/src/audio/mixin_mixout/mixin_mixout.c b/src/audio/mixin_mixout/mixin_mixout.c
@@ -6,7 +6,6 @@
 #include <sof/audio/component.h>
 #include <sof/audio/format.h>
 #include <sof/audio/module_adapter/module/generic.h>
-#include <sof/audio/mixer.h>
 #include <sof/audio/pipeline.h>
 #include <sof/audio/ipc-config.h>
 #include <sof/common.h>

diff --git a/test/cmocka/src/audio/mixer/CMakeLists.txt b/test/cmocka/src/audio/mixer/CMakeLists.txt
@@ -28,4 +28,6 @@ cmocka_test(mixer
 	${PROJECT_SOURCE_DIR}/src/module/audio/sink_api.c
 	${PROJECT_SOURCE_DIR}/src/math/numbers.c
 )
+
+target_include_directories(mixer PRIVATE ${PROJECT_SOURCE_DIR}/src/audio)
 target_link_libraries(mixer PRIVATE -lm)
diff --git a/test/cmocka/src/audio/mixer/mixer_test.c b/test/cmocka/src/audio/mixer/mixer_test.c
@@ -18,8 +18,9 @@
 #include <sof/audio/buffer.h>
 #include <sof/audio/component.h>
 #include <sof/audio/format.h>
-#include <sof/audio/mixer.h>
 #include <sof/audio/module_adapter/module/generic.h>
+
+#include "mixer/mixer.h"
 #include "../module_adapter.h"
 
 #ifdef HAVE_MALLOC_H