From 52810a3f9c995f35c54d6a203a21faa373c35e91 Mon Sep 17 00:00:00 2001 From: Mike Oliphant Date: Mon, 2 Oct 2023 08:12:33 -0700 Subject: [PATCH] Switched to AudioDSPTools for highpass filter implementation --- .gitmodules | 3 +++ CMakeLists.txt | 2 +- deps/AudioDSPTools | 1 + deps/NeuralAmpModelerCore | 2 +- src/CMakeLists.txt | 8 ++++---- 5 files changed, 10 insertions(+), 6 deletions(-) create mode 160000 deps/AudioDSPTools diff --git a/.gitmodules b/.gitmodules index 022893f..8e64535 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,3 +8,6 @@ path = deps/NeuralAmpModelerCore url = https://github.com/mikeoliphant/NeuralAmpModelerCore branch = devel +[submodule "deps/AudioDSPTools"] + path = deps/AudioDSPTools + url = https://github.com/sdatkinson/AudioDSPTools diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dfdb83..7640deb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ set(NAM_LV2_ID http://github.com/mikeoliphant/neural-amp-modeler-lv2) include_directories(SYSTEM deps/eigen) include_directories(SYSTEM deps/lv2/include) include_directories(SYSTEM deps/NeuralAmpModelerCore) -include_directories(SYSTEM deps/NeuralAmpModelerCore) +include_directories(SYSTEM deps/AudioDSPTools) include_directories(SYSTEM deps/json) include_directories(SYSTEM deps/denormal) diff --git a/deps/AudioDSPTools b/deps/AudioDSPTools new file mode 160000 index 0000000..37f73d9 --- /dev/null +++ b/deps/AudioDSPTools @@ -0,0 +1 @@ +Subproject commit 37f73d9ea6698b1b56c5a54fbdfa453a84fbd0b9 diff --git a/deps/NeuralAmpModelerCore b/deps/NeuralAmpModelerCore index 885a535..2dcd64e 160000 --- a/deps/NeuralAmpModelerCore +++ b/deps/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 885a535d29022138f3efcbfd73aed4743f750b68 +Subproject commit 2dcd64efce5e7011f82739d0556537dcb0091585 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a538127..1dbc5ad 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,10 +17,10 @@ set(NAM_SOURCES ../deps/NeuralAmpModelerCore/NAM/activations.h ../deps/NeuralAmpModelerCore/NAM/convnet.cpp ../deps/NeuralAmpModelerCore/NAM/convnet.h) -set(DSP_SOURCES ../deps/NeuralAmpModelerCore/dsp/dsp.h - ../deps/NeuralAmpModelerCore/dsp/dsp.cpp - ../deps/NeuralAmpModelerCore/dsp/RecursiveLinearFilter.h - ../deps/NeuralAmpModelerCore/dsp/RecursiveLinearFilter.cpp) +set(DSP_SOURCES ../deps/AudioDSPTools/dsp/dsp.h + ../deps/AudioDSPTools/dsp/dsp.cpp + ../deps/AudioDSPTools/dsp/RecursiveLinearFilter.h + ../deps/AudioDSPTools/dsp/RecursiveLinearFilter.cpp) add_library(neural_amp_modeler MODULE ${SOURCES} ${NAM_SOURCES} ${DSP_SOURCES})