From e7f2827cd209a6c70cad6a3d5bf891d2ae18dab6 Mon Sep 17 00:00:00 2001 From: Thor Harald Johansen Date: Thu, 1 Jun 2023 14:07:28 +0200 Subject: [PATCH] Set unused modules aside and remove dependencies --- CMakeLists.txt | 1 - include/dsp/{ => unused}/delayline.h | 0 include/dsp/{ => unused}/fm.h | 0 include/dsp/{ => unused}/phys.h | 0 include/dsp/{ => unused}/reverb.h | 0 include/dsp/{ => unused}/stereodelayline.h | 0 include/dsp/{ => unused}/stereosap.h | 0 include/synth.h | 14 +++++++------- src/dsp/{ => unused}/reverb.cpp | 0 9 files changed, 7 insertions(+), 8 deletions(-) rename include/dsp/{ => unused}/delayline.h (100%) rename include/dsp/{ => unused}/fm.h (100%) rename include/dsp/{ => unused}/phys.h (100%) rename include/dsp/{ => unused}/reverb.h (100%) rename include/dsp/{ => unused}/stereodelayline.h (100%) rename include/dsp/{ => unused}/stereosap.h (100%) rename src/dsp/{ => unused}/reverb.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 060d47d..9ccb0d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,5 @@ add_library(synth src/dsp/oscillator.cpp src/dsp/filter.cpp src/dsp/adsr.cpp - src/dsp/reverb.cpp src/perf.cpp) target_include_directories(synth PUBLIC include) \ No newline at end of file diff --git a/include/dsp/delayline.h b/include/dsp/unused/delayline.h similarity index 100% rename from include/dsp/delayline.h rename to include/dsp/unused/delayline.h diff --git a/include/dsp/fm.h b/include/dsp/unused/fm.h similarity index 100% rename from include/dsp/fm.h rename to include/dsp/unused/fm.h diff --git a/include/dsp/phys.h b/include/dsp/unused/phys.h similarity index 100% rename from include/dsp/phys.h rename to include/dsp/unused/phys.h diff --git a/include/dsp/reverb.h b/include/dsp/unused/reverb.h similarity index 100% rename from include/dsp/reverb.h rename to include/dsp/unused/reverb.h diff --git a/include/dsp/stereodelayline.h b/include/dsp/unused/stereodelayline.h similarity index 100% rename from include/dsp/stereodelayline.h rename to include/dsp/unused/stereodelayline.h diff --git a/include/dsp/stereosap.h b/include/dsp/unused/stereosap.h similarity index 100% rename from include/dsp/stereosap.h rename to include/dsp/unused/stereosap.h diff --git a/include/synth.h b/include/synth.h index a569925..d18ad67 100644 --- a/include/synth.h +++ b/include/synth.h @@ -4,7 +4,7 @@ #include "voicemanager.h" #include "channel.h" #include "dsp/frame.h" -#include "dsp/reverb.h" +//#include "dsp/reverb.h" #include "luts.h" #include "perf.h" @@ -29,8 +29,8 @@ public: std::fill(out, out + bufferSize, 0.f); - float reverbBus[bufferSize]; - std::fill(reverbBus, reverbBus + bufferSize, 0.f); + //float reverbBus[bufferSize]; + //std::fill(reverbBus, reverbBus + bufferSize, 0.f); for(auto& channel : channels) { float chOut[bufferSize]; @@ -42,9 +42,9 @@ public: out[i] += chOut[i]; } - for(size_t i = 0; i < bufferSize; ++i) { - reverbBus[i] += channel.settings.reverb * chOut[i]; - } + //for(size_t i = 0; i < bufferSize; ++i) { + // reverbBus[i] += channel.settings.reverb * chOut[i]; + //} } /* @@ -67,7 +67,7 @@ public: private: VoiceManager voiceManager{}; Channel channels[16]; - Reverb reverb; + //Reverb reverb; }; #endif \ No newline at end of file diff --git a/src/dsp/reverb.cpp b/src/dsp/unused/reverb.cpp similarity index 100% rename from src/dsp/reverb.cpp rename to src/dsp/unused/reverb.cpp