OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

audio: waves: fix header include pathing 

Now that waves headers are published they should not be trying to
include local headers or modifying the global scope. Fixup headers so
they include like the rest of public headers.

Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
This commit is contained in:
Curtis Malainey 2023-07-12 18:21:05 -07:00 committed by Kai Vehmanen
parent 3bf8ffc7a0
commit 46a78b20b8
7 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/audio/module_adapter/CMakeLists.txt
View File

@ -70,7 +70,6 @@ if((NOT CONFIG_LIBRARY) OR CONFIG_LIBRARY_STATIC)
add_local_sources(sof module/waves.c)
sof_add_static_library(MaxxChrome ${CMAKE_CURRENT_LIST_DIR}/lib/release/libMaxxChrome.a)
# folder with Waves API must be among include directories
target_include_directories(sof PUBLIC ${CMAKE_CURRENT_LIST_DIR}/../../include/sof/audio/)
endif()
if(CONFIG_DTS_CODEC)

17
src/audio/module_adapter/module/waves.c
View File

@ -4,19 +4,16 @@
//
// Author: Oleksandr Strelchenko <oleksandr.strelchenko@waves.com>
//
#include <rtos/init.h>
#include <sof/audio/module_adapter/module/generic.h>
#include <sof/debug/debug.h>
#include <sof/compiler_attributes.h>
#include <rtos/init.h>
#include "MaxxEffect/MaxxEffect.h"
#include "MaxxEffect/MaxxStream.h"
#include "MaxxEffect/MaxxStatus.h"
#include "MaxxEffect/Initialize/MaxxEffect_Initialize.h"
#include "MaxxEffect/Process/MaxxEffect_Process.h"
#include "MaxxEffect/Process/MaxxEffect_Reset.h"
#include "MaxxEffect/Control/RPC/MaxxEffect_RPC_Server.h"
#include "MaxxEffect/Control/Direct/MaxxEffect_Revision.h"
#include <sof/audio/MaxxEffect/Initialize/MaxxEffect_Initialize.h>
#include <sof/audio/MaxxEffect/Process/MaxxEffect_Process.h>
#include <sof/audio/MaxxEffect/Process/MaxxEffect_Reset.h>
#include <sof/audio/MaxxEffect/Control/RPC/MaxxEffect_RPC_Server.h>
#include <sof/audio/MaxxEffect/Control/Direct/MaxxEffect_Revision.h>
#define MAX_CONFIG_SIZE_BYTES (8192)
#define NUM_IO_STREAMS (1)

4
src/include/sof/audio/MaxxEffect/Control/Direct/MaxxEffect_Revision.h
View File

@ -6,8 +6,8 @@
#define MAXX_EFFECT_REVISION_H
#include <stdint.h>
#include "MaxxEffect/MaxxEffect.h"
#include "MaxxEffect/MaxxStatus.h"
#include <sof/audio/MaxxEffect/MaxxEffect.h>
#include <sof/audio/MaxxEffect/MaxxStatus.h>
#ifdef __cplusplus
extern "C" {

4
src/include/sof/audio/MaxxEffect/Control/RPC/MaxxEffect_RPC_Server.h
View File

@ -6,8 +6,8 @@
#define MAXX_EFFECT_RPC_SERVER_H
#include <stdint.h>
#include "MaxxEffect/MaxxEffect.h"
#include "MaxxEffect/MaxxStatus.h"
#include <sof/audio/MaxxEffect/MaxxEffect.h>
#include <sof/audio/MaxxEffect/MaxxStatus.h>
#ifdef __cplusplus
extern "C" {

6
src/include/sof/audio/MaxxEffect/Initialize/MaxxEffect_Initialize.h
View File

@ -54,9 +54,9 @@
#define MAXX_EFFECT_INITIALIZE_H
#include <stdint.h>
#include "MaxxEffect/MaxxEffect.h"
#include "MaxxEffect/MaxxStatus.h"
#include "MaxxEffect/MaxxStream.h"
#include <sof/audio/MaxxEffect/MaxxEffect.h>
#include <sof/audio/MaxxEffect/MaxxStatus.h>
#include <sof/audio/MaxxEffect/MaxxStream.h>
#ifdef __cplusplus
extern "C" {

6
src/include/sof/audio/MaxxEffect/Process/MaxxEffect_Process.h
View File

@ -72,9 +72,9 @@
#ifndef MAXX_EFFECT_PROCESS_H
#define MAXX_EFFECT_PROCESS_H
#include "MaxxEffect/MaxxEffect.h"
#include "MaxxEffect/MaxxStatus.h"
#include "MaxxEffect/MaxxStream.h"
#include <sof/audio/MaxxEffect/MaxxEffect.h>
#include <sof/audio/MaxxEffect/MaxxStatus.h>
#include <sof/audio/MaxxEffect/MaxxStream.h>
#ifdef __cplusplus
extern "C" {

4
src/include/sof/audio/MaxxEffect/Process/MaxxEffect_Reset.h
View File

@ -5,8 +5,8 @@
#ifndef MAXX_EFFECT_RESET_H
#define MAXX_EFFECT_RESET_H
#include "MaxxEffect/MaxxEffect.h"
#include "MaxxEffect/MaxxStatus.h"
#include <sof/audio/MaxxEffect/MaxxEffect.h>
#include <sof/audio/MaxxEffect/MaxxStatus.h>
#ifdef __cplusplus
extern "C" {