From 2d19311269571c99bcd42cc91a6bbf9e81d48374 Mon Sep 17 00:00:00 2001 From: Javier Nonis Date: Mon, 22 Jul 2024 19:59:15 -0300 Subject: [PATCH] Refactor Effect directory --- src/Makefile | 29 +++++++++++++------ src/{ => effect_audio}/effect_3bandeq.h | 0 src/{ => effect_audio}/effect_base.cpp | 0 src/{ => effect_audio}/effect_base.h | 0 src/{ => effect_audio}/effect_bigmuff.cpp | 0 src/{ => effect_audio}/effect_bigmuff.h | 0 src/{ => effect_audio}/effect_chorus.cpp | 0 src/{ => effect_audio}/effect_chorus.h | 0 src/{ => effect_audio}/effect_delay.cpp | 0 src/{ => effect_audio}/effect_delay.h | 0 src/{ => effect_audio}/effect_ds1.cpp | 0 src/{ => effect_audio}/effect_ds1.h | 0 src/{ => effect_audio}/effect_lpf.h | 0 src/{ => effect_audio}/effect_mverb.cpp | 0 src/{ => effect_audio}/effect_mverb.h | 0 .../effect_platervbstereo.cpp | 0 .../effect_platervbstereo.h | 2 +- src/{ => effect_audio}/effect_talreverb3.cpp | 0 src/{ => effect_audio}/effect_talreverb3.h | 0 src/{ => effect_audio}/moddistortion/ASinh.h | 0 src/{ => effect_audio}/moddistortion/Cosh.h | 0 .../moddistortion/Distortion_BigMuff.cpp | 0 .../moddistortion/Distortion_BigMuff.h | 0 .../moddistortion/Distortion_DS1.cpp | 0 .../moddistortion/Distortion_DS1.h | 0 .../moddistortion/HyperbolicTables.cpp | 0 .../moddistortion/HyperbolicTables.h | 0 .../moddistortion/OverSample.cpp | 0 .../moddistortion/OverSample.h | 0 src/{ => effect_audio}/moddistortion/Sinh.h | 0 src/{ => effect_audio}/mverb/MVerb.h | 0 .../tal-reverb-3/AllPassFilter.h | 0 .../tal-reverb-3/AudioUtils.h | 0 .../tal-reverb-3/CombFilter.h | 0 src/{ => effect_audio}/tal-reverb-3/Filter.h | 0 .../tal-reverb-3/HighShelf.h | 0 .../tal-reverb-3/LowShelf.h | 0 .../tal-reverb-3/NoiseGenerator.h | 0 .../tal-reverb-3/ParamChangeUtil.h | 0 src/{ => effect_audio}/tal-reverb-3/Params.h | 0 src/{ => effect_audio}/tal-reverb-3/PeakEq.h | 0 .../tal-reverb-3/Reverb - Bestest.h | 0 .../tal-reverb-3/Reverb - Great Sound.h | 0 .../tal-reverb-3/Reverb - improvement.h | 0 src/{ => effect_audio}/tal-reverb-3/Reverb.h | 0 .../tal-reverb-3/ReverbEngine.h | 0 src/{ => effect_audio}/tal-reverb-3/TalEq.h | 0 src/{ => effect_audio}/ykchorus/Chorus.h | 0 .../ykchorus/ChorusEngine.h | 0 src/{ => effect_audio}/ykchorus/DCBlock.h | 0 src/{ => effect_audio}/ykchorus/OnePoleLP.h | 0 src/{ => effect_midi}/midi_arp.cpp | 0 src/{ => effect_midi}/midi_arp.h | 0 src/{ => effect_midi}/midi_effect_base.h | 2 +- .../modarpeggiator/arpeggiator.cpp | 0 .../modarpeggiator/arpeggiator.hpp | 0 .../modarpeggiator/common/clock.cpp | 0 .../modarpeggiator/common/clock.hpp | 0 .../modarpeggiator/common/commons.h | 0 .../modarpeggiator/common/midiHandler.cpp | 0 .../modarpeggiator/common/midiHandler.hpp | 0 .../modarpeggiator/common/pattern.cpp | 0 .../modarpeggiator/common/pattern.hpp | 0 .../modarpeggiator/plugin.cpp | 0 .../modarpeggiator/plugin.hpp | 0 .../modarpeggiator/utils.cpp | 0 .../modarpeggiator/utils.hpp | 0 src/effects.h | 20 ++++++------- src/midi_effects.h | 4 +-- src/minidexed.h | 1 - 70 files changed, 34 insertions(+), 24 deletions(-) rename src/{ => effect_audio}/effect_3bandeq.h (100%) rename src/{ => effect_audio}/effect_base.cpp (100%) rename src/{ => effect_audio}/effect_base.h (100%) rename src/{ => effect_audio}/effect_bigmuff.cpp (100%) rename src/{ => effect_audio}/effect_bigmuff.h (100%) rename src/{ => effect_audio}/effect_chorus.cpp (100%) rename src/{ => effect_audio}/effect_chorus.h (100%) rename src/{ => effect_audio}/effect_delay.cpp (100%) rename src/{ => effect_audio}/effect_delay.h (100%) rename src/{ => effect_audio}/effect_ds1.cpp (100%) rename src/{ => effect_audio}/effect_ds1.h (100%) rename src/{ => effect_audio}/effect_lpf.h (100%) rename src/{ => effect_audio}/effect_mverb.cpp (100%) rename src/{ => effect_audio}/effect_mverb.h (100%) rename src/{ => effect_audio}/effect_platervbstereo.cpp (100%) rename src/{ => effect_audio}/effect_platervbstereo.h (99%) rename src/{ => effect_audio}/effect_talreverb3.cpp (100%) rename src/{ => effect_audio}/effect_talreverb3.h (100%) rename src/{ => effect_audio}/moddistortion/ASinh.h (100%) rename src/{ => effect_audio}/moddistortion/Cosh.h (100%) rename src/{ => effect_audio}/moddistortion/Distortion_BigMuff.cpp (100%) rename src/{ => effect_audio}/moddistortion/Distortion_BigMuff.h (100%) rename src/{ => effect_audio}/moddistortion/Distortion_DS1.cpp (100%) rename src/{ => effect_audio}/moddistortion/Distortion_DS1.h (100%) rename src/{ => effect_audio}/moddistortion/HyperbolicTables.cpp (100%) rename src/{ => effect_audio}/moddistortion/HyperbolicTables.h (100%) rename src/{ => effect_audio}/moddistortion/OverSample.cpp (100%) rename src/{ => effect_audio}/moddistortion/OverSample.h (100%) rename src/{ => effect_audio}/moddistortion/Sinh.h (100%) rename src/{ => effect_audio}/mverb/MVerb.h (100%) rename src/{ => effect_audio}/tal-reverb-3/AllPassFilter.h (100%) rename src/{ => effect_audio}/tal-reverb-3/AudioUtils.h (100%) rename src/{ => effect_audio}/tal-reverb-3/CombFilter.h (100%) rename src/{ => effect_audio}/tal-reverb-3/Filter.h (100%) rename src/{ => effect_audio}/tal-reverb-3/HighShelf.h (100%) rename src/{ => effect_audio}/tal-reverb-3/LowShelf.h (100%) rename src/{ => effect_audio}/tal-reverb-3/NoiseGenerator.h (100%) rename src/{ => effect_audio}/tal-reverb-3/ParamChangeUtil.h (100%) rename src/{ => effect_audio}/tal-reverb-3/Params.h (100%) rename src/{ => effect_audio}/tal-reverb-3/PeakEq.h (100%) rename src/{ => effect_audio}/tal-reverb-3/Reverb - Bestest.h (100%) rename src/{ => effect_audio}/tal-reverb-3/Reverb - Great Sound.h (100%) rename src/{ => effect_audio}/tal-reverb-3/Reverb - improvement.h (100%) rename src/{ => effect_audio}/tal-reverb-3/Reverb.h (100%) rename src/{ => effect_audio}/tal-reverb-3/ReverbEngine.h (100%) rename src/{ => effect_audio}/tal-reverb-3/TalEq.h (100%) rename src/{ => effect_audio}/ykchorus/Chorus.h (100%) rename src/{ => effect_audio}/ykchorus/ChorusEngine.h (100%) rename src/{ => effect_audio}/ykchorus/DCBlock.h (100%) rename src/{ => effect_audio}/ykchorus/OnePoleLP.h (100%) rename src/{ => effect_midi}/midi_arp.cpp (100%) rename src/{ => effect_midi}/midi_arp.h (100%) rename src/{ => effect_midi}/midi_effect_base.h (97%) rename src/{ => effect_midi}/modarpeggiator/arpeggiator.cpp (100%) rename src/{ => effect_midi}/modarpeggiator/arpeggiator.hpp (100%) rename src/{ => effect_midi}/modarpeggiator/common/clock.cpp (100%) rename src/{ => effect_midi}/modarpeggiator/common/clock.hpp (100%) rename src/{ => effect_midi}/modarpeggiator/common/commons.h (100%) rename src/{ => effect_midi}/modarpeggiator/common/midiHandler.cpp (100%) rename src/{ => effect_midi}/modarpeggiator/common/midiHandler.hpp (100%) rename src/{ => effect_midi}/modarpeggiator/common/pattern.cpp (100%) rename src/{ => effect_midi}/modarpeggiator/common/pattern.hpp (100%) rename src/{ => effect_midi}/modarpeggiator/plugin.cpp (100%) rename src/{ => effect_midi}/modarpeggiator/plugin.hpp (100%) rename src/{ => effect_midi}/modarpeggiator/utils.cpp (100%) rename src/{ => effect_midi}/modarpeggiator/utils.hpp (100%) diff --git a/src/Makefile b/src/Makefile index 71337ba..8804682 100644 --- a/src/Makefile +++ b/src/Makefile @@ -9,18 +9,29 @@ CMSIS_DIR = ../CMSIS_5/CMSIS OBJS = main.o kernel.o minidexed.o config.o userinterface.o uimenu.o \ mididevice.o midikeyboard.o serialmididevice.o pckeyboard.o \ sysexfileloader.o performanceconfig.o perftimer.o \ - effect_base.o effect_chorus.o effect_delay.o effect_mverb.o \ - effect_talreverb3.o effect_ds1.o effect_bigmuff.o \ - moddistortion/Distortion_DS1.o moddistortion/Distortion_BigMuff.o \ - moddistortion/HyperbolicTables.o moddistortion/OverSample.o \ - effect_compressor.o effect_platervbstereo.o uibuttons.o midipin.o \ - midi_arp.o modarpeggiator/common/clock.o \ - modarpeggiator/common/midiHandler.o modarpeggiator/common/pattern.o \ - modarpeggiator/utils.o modarpeggiator/arpeggiator.o + uibuttons.o midipin.o effect_compressor.o \ + effect_audio/effect_base.o \ + effect_audio/effect_chorus.o \ + effect_audio/effect_delay.o \ + effect_audio/effect_platervbstereo.o \ + effect_audio/effect_talreverb3.o \ + effect_audio/effect_mverb.o \ + effect_audio/effect_ds1.o \ + effect_audio/effect_bigmuff.o \ + effect_audio/moddistortion/Distortion_DS1.o \ + effect_audio/moddistortion/Distortion_BigMuff.o \ + effect_audio/moddistortion/HyperbolicTables.o \ + effect_audio/moddistortion/OverSample.o \ + effect_midi/midi_arp.o \ + effect_midi/modarpeggiator/common/clock.o \ + effect_midi/modarpeggiator/common/midiHandler.o \ + effect_midi/modarpeggiator/common/pattern.o \ + effect_midi/modarpeggiator/utils.o \ + effect_midi/modarpeggiator/arpeggiator.o OPTIMIZE = -O3 include ./Synth_Dexed.mk include ./Rules.mk -EXTRACLEAN += moddistortion/*.[od] modarpeggiator/*.[od] modarpeggiator/common/*.[od] \ No newline at end of file +EXTRACLEAN += effect_audio/moddistortion/*.[od] effect_midi/modarpeggiator/*.[od] effect_midi/modarpeggiator/common/*.[od] \ No newline at end of file diff --git a/src/effect_3bandeq.h b/src/effect_audio/effect_3bandeq.h similarity index 100% rename from src/effect_3bandeq.h rename to src/effect_audio/effect_3bandeq.h diff --git a/src/effect_base.cpp b/src/effect_audio/effect_base.cpp similarity index 100% rename from src/effect_base.cpp rename to src/effect_audio/effect_base.cpp diff --git a/src/effect_base.h b/src/effect_audio/effect_base.h similarity index 100% rename from src/effect_base.h rename to src/effect_audio/effect_base.h diff --git a/src/effect_bigmuff.cpp b/src/effect_audio/effect_bigmuff.cpp similarity index 100% rename from src/effect_bigmuff.cpp rename to src/effect_audio/effect_bigmuff.cpp diff --git a/src/effect_bigmuff.h b/src/effect_audio/effect_bigmuff.h similarity index 100% rename from src/effect_bigmuff.h rename to src/effect_audio/effect_bigmuff.h diff --git a/src/effect_chorus.cpp b/src/effect_audio/effect_chorus.cpp similarity index 100% rename from src/effect_chorus.cpp rename to src/effect_audio/effect_chorus.cpp diff --git a/src/effect_chorus.h b/src/effect_audio/effect_chorus.h similarity index 100% rename from src/effect_chorus.h rename to src/effect_audio/effect_chorus.h diff --git a/src/effect_delay.cpp b/src/effect_audio/effect_delay.cpp similarity index 100% rename from src/effect_delay.cpp rename to src/effect_audio/effect_delay.cpp diff --git a/src/effect_delay.h b/src/effect_audio/effect_delay.h similarity index 100% rename from src/effect_delay.h rename to src/effect_audio/effect_delay.h diff --git a/src/effect_ds1.cpp b/src/effect_audio/effect_ds1.cpp similarity index 100% rename from src/effect_ds1.cpp rename to src/effect_audio/effect_ds1.cpp diff --git a/src/effect_ds1.h b/src/effect_audio/effect_ds1.h similarity index 100% rename from src/effect_ds1.h rename to src/effect_audio/effect_ds1.h diff --git a/src/effect_lpf.h b/src/effect_audio/effect_lpf.h similarity index 100% rename from src/effect_lpf.h rename to src/effect_audio/effect_lpf.h diff --git a/src/effect_mverb.cpp b/src/effect_audio/effect_mverb.cpp similarity index 100% rename from src/effect_mverb.cpp rename to src/effect_audio/effect_mverb.cpp diff --git a/src/effect_mverb.h b/src/effect_audio/effect_mverb.h similarity index 100% rename from src/effect_mverb.h rename to src/effect_audio/effect_mverb.h diff --git a/src/effect_platervbstereo.cpp b/src/effect_audio/effect_platervbstereo.cpp similarity index 100% rename from src/effect_platervbstereo.cpp rename to src/effect_audio/effect_platervbstereo.cpp diff --git a/src/effect_platervbstereo.h b/src/effect_audio/effect_platervbstereo.h similarity index 99% rename from src/effect_platervbstereo.h rename to src/effect_audio/effect_platervbstereo.h index feaf599..cddd5c5 100644 --- a/src/effect_platervbstereo.h +++ b/src/effect_audio/effect_platervbstereo.h @@ -46,7 +46,7 @@ #include #include -#include "common.h" +#include "../common.h" #include "effect_base.h" /*** diff --git a/src/effect_talreverb3.cpp b/src/effect_audio/effect_talreverb3.cpp similarity index 100% rename from src/effect_talreverb3.cpp rename to src/effect_audio/effect_talreverb3.cpp diff --git a/src/effect_talreverb3.h b/src/effect_audio/effect_talreverb3.h similarity index 100% rename from src/effect_talreverb3.h rename to src/effect_audio/effect_talreverb3.h diff --git a/src/moddistortion/ASinh.h b/src/effect_audio/moddistortion/ASinh.h similarity index 100% rename from src/moddistortion/ASinh.h rename to src/effect_audio/moddistortion/ASinh.h diff --git a/src/moddistortion/Cosh.h b/src/effect_audio/moddistortion/Cosh.h similarity index 100% rename from src/moddistortion/Cosh.h rename to src/effect_audio/moddistortion/Cosh.h diff --git a/src/moddistortion/Distortion_BigMuff.cpp b/src/effect_audio/moddistortion/Distortion_BigMuff.cpp similarity index 100% rename from src/moddistortion/Distortion_BigMuff.cpp rename to src/effect_audio/moddistortion/Distortion_BigMuff.cpp diff --git a/src/moddistortion/Distortion_BigMuff.h b/src/effect_audio/moddistortion/Distortion_BigMuff.h similarity index 100% rename from src/moddistortion/Distortion_BigMuff.h rename to src/effect_audio/moddistortion/Distortion_BigMuff.h diff --git a/src/moddistortion/Distortion_DS1.cpp b/src/effect_audio/moddistortion/Distortion_DS1.cpp similarity index 100% rename from src/moddistortion/Distortion_DS1.cpp rename to src/effect_audio/moddistortion/Distortion_DS1.cpp diff --git a/src/moddistortion/Distortion_DS1.h b/src/effect_audio/moddistortion/Distortion_DS1.h similarity index 100% rename from src/moddistortion/Distortion_DS1.h rename to src/effect_audio/moddistortion/Distortion_DS1.h diff --git a/src/moddistortion/HyperbolicTables.cpp b/src/effect_audio/moddistortion/HyperbolicTables.cpp similarity index 100% rename from src/moddistortion/HyperbolicTables.cpp rename to src/effect_audio/moddistortion/HyperbolicTables.cpp diff --git a/src/moddistortion/HyperbolicTables.h b/src/effect_audio/moddistortion/HyperbolicTables.h similarity index 100% rename from src/moddistortion/HyperbolicTables.h rename to src/effect_audio/moddistortion/HyperbolicTables.h diff --git a/src/moddistortion/OverSample.cpp b/src/effect_audio/moddistortion/OverSample.cpp similarity index 100% rename from src/moddistortion/OverSample.cpp rename to src/effect_audio/moddistortion/OverSample.cpp diff --git a/src/moddistortion/OverSample.h b/src/effect_audio/moddistortion/OverSample.h similarity index 100% rename from src/moddistortion/OverSample.h rename to src/effect_audio/moddistortion/OverSample.h diff --git a/src/moddistortion/Sinh.h b/src/effect_audio/moddistortion/Sinh.h similarity index 100% rename from src/moddistortion/Sinh.h rename to src/effect_audio/moddistortion/Sinh.h diff --git a/src/mverb/MVerb.h b/src/effect_audio/mverb/MVerb.h similarity index 100% rename from src/mverb/MVerb.h rename to src/effect_audio/mverb/MVerb.h diff --git a/src/tal-reverb-3/AllPassFilter.h b/src/effect_audio/tal-reverb-3/AllPassFilter.h similarity index 100% rename from src/tal-reverb-3/AllPassFilter.h rename to src/effect_audio/tal-reverb-3/AllPassFilter.h diff --git a/src/tal-reverb-3/AudioUtils.h b/src/effect_audio/tal-reverb-3/AudioUtils.h similarity index 100% rename from src/tal-reverb-3/AudioUtils.h rename to src/effect_audio/tal-reverb-3/AudioUtils.h diff --git a/src/tal-reverb-3/CombFilter.h b/src/effect_audio/tal-reverb-3/CombFilter.h similarity index 100% rename from src/tal-reverb-3/CombFilter.h rename to src/effect_audio/tal-reverb-3/CombFilter.h diff --git a/src/tal-reverb-3/Filter.h b/src/effect_audio/tal-reverb-3/Filter.h similarity index 100% rename from src/tal-reverb-3/Filter.h rename to src/effect_audio/tal-reverb-3/Filter.h diff --git a/src/tal-reverb-3/HighShelf.h b/src/effect_audio/tal-reverb-3/HighShelf.h similarity index 100% rename from src/tal-reverb-3/HighShelf.h rename to src/effect_audio/tal-reverb-3/HighShelf.h diff --git a/src/tal-reverb-3/LowShelf.h b/src/effect_audio/tal-reverb-3/LowShelf.h similarity index 100% rename from src/tal-reverb-3/LowShelf.h rename to src/effect_audio/tal-reverb-3/LowShelf.h diff --git a/src/tal-reverb-3/NoiseGenerator.h b/src/effect_audio/tal-reverb-3/NoiseGenerator.h similarity index 100% rename from src/tal-reverb-3/NoiseGenerator.h rename to src/effect_audio/tal-reverb-3/NoiseGenerator.h diff --git a/src/tal-reverb-3/ParamChangeUtil.h b/src/effect_audio/tal-reverb-3/ParamChangeUtil.h similarity index 100% rename from src/tal-reverb-3/ParamChangeUtil.h rename to src/effect_audio/tal-reverb-3/ParamChangeUtil.h diff --git a/src/tal-reverb-3/Params.h b/src/effect_audio/tal-reverb-3/Params.h similarity index 100% rename from src/tal-reverb-3/Params.h rename to src/effect_audio/tal-reverb-3/Params.h diff --git a/src/tal-reverb-3/PeakEq.h b/src/effect_audio/tal-reverb-3/PeakEq.h similarity index 100% rename from src/tal-reverb-3/PeakEq.h rename to src/effect_audio/tal-reverb-3/PeakEq.h diff --git a/src/tal-reverb-3/Reverb - Bestest.h b/src/effect_audio/tal-reverb-3/Reverb - Bestest.h similarity index 100% rename from src/tal-reverb-3/Reverb - Bestest.h rename to src/effect_audio/tal-reverb-3/Reverb - Bestest.h diff --git a/src/tal-reverb-3/Reverb - Great Sound.h b/src/effect_audio/tal-reverb-3/Reverb - Great Sound.h similarity index 100% rename from src/tal-reverb-3/Reverb - Great Sound.h rename to src/effect_audio/tal-reverb-3/Reverb - Great Sound.h diff --git a/src/tal-reverb-3/Reverb - improvement.h b/src/effect_audio/tal-reverb-3/Reverb - improvement.h similarity index 100% rename from src/tal-reverb-3/Reverb - improvement.h rename to src/effect_audio/tal-reverb-3/Reverb - improvement.h diff --git a/src/tal-reverb-3/Reverb.h b/src/effect_audio/tal-reverb-3/Reverb.h similarity index 100% rename from src/tal-reverb-3/Reverb.h rename to src/effect_audio/tal-reverb-3/Reverb.h diff --git a/src/tal-reverb-3/ReverbEngine.h b/src/effect_audio/tal-reverb-3/ReverbEngine.h similarity index 100% rename from src/tal-reverb-3/ReverbEngine.h rename to src/effect_audio/tal-reverb-3/ReverbEngine.h diff --git a/src/tal-reverb-3/TalEq.h b/src/effect_audio/tal-reverb-3/TalEq.h similarity index 100% rename from src/tal-reverb-3/TalEq.h rename to src/effect_audio/tal-reverb-3/TalEq.h diff --git a/src/ykchorus/Chorus.h b/src/effect_audio/ykchorus/Chorus.h similarity index 100% rename from src/ykchorus/Chorus.h rename to src/effect_audio/ykchorus/Chorus.h diff --git a/src/ykchorus/ChorusEngine.h b/src/effect_audio/ykchorus/ChorusEngine.h similarity index 100% rename from src/ykchorus/ChorusEngine.h rename to src/effect_audio/ykchorus/ChorusEngine.h diff --git a/src/ykchorus/DCBlock.h b/src/effect_audio/ykchorus/DCBlock.h similarity index 100% rename from src/ykchorus/DCBlock.h rename to src/effect_audio/ykchorus/DCBlock.h diff --git a/src/ykchorus/OnePoleLP.h b/src/effect_audio/ykchorus/OnePoleLP.h similarity index 100% rename from src/ykchorus/OnePoleLP.h rename to src/effect_audio/ykchorus/OnePoleLP.h diff --git a/src/midi_arp.cpp b/src/effect_midi/midi_arp.cpp similarity index 100% rename from src/midi_arp.cpp rename to src/effect_midi/midi_arp.cpp diff --git a/src/midi_arp.h b/src/effect_midi/midi_arp.h similarity index 100% rename from src/midi_arp.h rename to src/effect_midi/midi_arp.h diff --git a/src/midi_effect_base.h b/src/effect_midi/midi_effect_base.h similarity index 97% rename from src/midi_effect_base.h rename to src/effect_midi/midi_effect_base.h index accc3dd..3eda957 100644 --- a/src/midi_effect_base.h +++ b/src/effect_midi/midi_effect_base.h @@ -7,7 +7,7 @@ #include #include -#include "dexedadapter.h" +#include "../dexedadapter.h" class MidiEffect { diff --git a/src/modarpeggiator/arpeggiator.cpp b/src/effect_midi/modarpeggiator/arpeggiator.cpp similarity index 100% rename from src/modarpeggiator/arpeggiator.cpp rename to src/effect_midi/modarpeggiator/arpeggiator.cpp diff --git a/src/modarpeggiator/arpeggiator.hpp b/src/effect_midi/modarpeggiator/arpeggiator.hpp similarity index 100% rename from src/modarpeggiator/arpeggiator.hpp rename to src/effect_midi/modarpeggiator/arpeggiator.hpp diff --git a/src/modarpeggiator/common/clock.cpp b/src/effect_midi/modarpeggiator/common/clock.cpp similarity index 100% rename from src/modarpeggiator/common/clock.cpp rename to src/effect_midi/modarpeggiator/common/clock.cpp diff --git a/src/modarpeggiator/common/clock.hpp b/src/effect_midi/modarpeggiator/common/clock.hpp similarity index 100% rename from src/modarpeggiator/common/clock.hpp rename to src/effect_midi/modarpeggiator/common/clock.hpp diff --git a/src/modarpeggiator/common/commons.h b/src/effect_midi/modarpeggiator/common/commons.h similarity index 100% rename from src/modarpeggiator/common/commons.h rename to src/effect_midi/modarpeggiator/common/commons.h diff --git a/src/modarpeggiator/common/midiHandler.cpp b/src/effect_midi/modarpeggiator/common/midiHandler.cpp similarity index 100% rename from src/modarpeggiator/common/midiHandler.cpp rename to src/effect_midi/modarpeggiator/common/midiHandler.cpp diff --git a/src/modarpeggiator/common/midiHandler.hpp b/src/effect_midi/modarpeggiator/common/midiHandler.hpp similarity index 100% rename from src/modarpeggiator/common/midiHandler.hpp rename to src/effect_midi/modarpeggiator/common/midiHandler.hpp diff --git a/src/modarpeggiator/common/pattern.cpp b/src/effect_midi/modarpeggiator/common/pattern.cpp similarity index 100% rename from src/modarpeggiator/common/pattern.cpp rename to src/effect_midi/modarpeggiator/common/pattern.cpp diff --git a/src/modarpeggiator/common/pattern.hpp b/src/effect_midi/modarpeggiator/common/pattern.hpp similarity index 100% rename from src/modarpeggiator/common/pattern.hpp rename to src/effect_midi/modarpeggiator/common/pattern.hpp diff --git a/src/modarpeggiator/plugin.cpp b/src/effect_midi/modarpeggiator/plugin.cpp similarity index 100% rename from src/modarpeggiator/plugin.cpp rename to src/effect_midi/modarpeggiator/plugin.cpp diff --git a/src/modarpeggiator/plugin.hpp b/src/effect_midi/modarpeggiator/plugin.hpp similarity index 100% rename from src/modarpeggiator/plugin.hpp rename to src/effect_midi/modarpeggiator/plugin.hpp diff --git a/src/modarpeggiator/utils.cpp b/src/effect_midi/modarpeggiator/utils.cpp similarity index 100% rename from src/modarpeggiator/utils.cpp rename to src/effect_midi/modarpeggiator/utils.cpp diff --git a/src/modarpeggiator/utils.hpp b/src/effect_midi/modarpeggiator/utils.hpp similarity index 100% rename from src/modarpeggiator/utils.hpp rename to src/effect_midi/modarpeggiator/utils.hpp diff --git a/src/effects.h b/src/effects.h index ddb90bf..2152898 100644 --- a/src/effects.h +++ b/src/effects.h @@ -6,16 +6,16 @@ #define _EFFECTS_H #include -#include "effect_base.h" -#include "effect_chorus.h" -#include "effect_delay.h" -#include "effect_lpf.h" -#include "effect_ds1.h" -#include "effect_bigmuff.h" -#include "effect_talreverb3.h" -#include "effect_platervbstereo.h" -#include "effect_mverb.h" -#include "effect_3bandeq.h" +#include "effect_audio/effect_base.h" +#include "effect_audio/effect_chorus.h" +#include "effect_audio/effect_delay.h" +#include "effect_audio/effect_lpf.h" +#include "effect_audio/effect_ds1.h" +#include "effect_audio/effect_bigmuff.h" +#include "effect_audio/effect_talreverb3.h" +#include "effect_audio/effect_platervbstereo.h" +#include "effect_audio/effect_mverb.h" +#include "effect_audio/effect_3bandeq.h" inline AudioEffect* newAudioEffect(unsigned type, float32_t samplerate) { diff --git a/src/midi_effects.h b/src/midi_effects.h index a1f2afd..1aa89f4 100644 --- a/src/midi_effects.h +++ b/src/midi_effects.h @@ -1,8 +1,8 @@ #ifndef _MIDI_EFFECTS_H #define _MIDI_EFFECTS_H -#include "midi_effect_base.h" -#include "midi_arp.h" +#include "effect_midi/midi_effect_base.h" +#include "effect_midi/midi_arp.h" inline MidiEffect* newMidiEffect(unsigned type, float32_t samplerate, CDexedAdapter* synth) { diff --git a/src/minidexed.h b/src/minidexed.h index 990cdea..29ccb8b 100644 --- a/src/minidexed.h +++ b/src/minidexed.h @@ -42,7 +42,6 @@ #include #include "common.h" #include "effect_mixer.hpp" -#include "effect_platervbstereo.h" #include "effect_compressor.h" #include "effects.h" #include "midi_effects.h"