Skip to content

Audio: mixer: move mixer header file to module folder #8557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 1 commit into from
Dec 13, 2023
Merged

Audio: mixer: move mixer header file to module folder #8557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/audio/mixer/mixer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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 */
Expand Down
0 src/include/sof/audio/mixer.h → src/audio/mixer/mixer.h
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion src/audio/mixer/mixer_generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/audio/mixer/mixer_hifi3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/audio/mixin_mixout/mixin_mixout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions test/cmocka/src/audio/mixer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
3 changes: 2 additions & 1 deletion test/cmocka/src/audio/mixer/mixer_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down