Refactor Effect directory

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]
+EXTRACLEAN += effect_audio/moddistortion/*.[od] effect_midi/modarpeggiator/*.[od] effect_midi/modarpeggiator/common/*.[od]

src/effect_audio/effect_platervbstereo.h

@@ -46,7 +46,7 @@
 
 #include <stdint.h>
 #include <arm_math.h>
-#include "common.h"
+#include "../common.h"
 #include "effect_base.h"
 
 /***

src/effect_midi/midi_effect_base.h

@@ -7,7 +7,7 @@
 
 #include <string>
 #include <vector>
-#include "dexedadapter.h"
+#include "../dexedadapter.h"
 
 class MidiEffect
 {

src/effects.h

@@ -6,16 +6,16 @@
 #define _EFFECTS_H
 
 #include <string>
-#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)
 {

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)
 {

src/minidexed.h

@@ -42,7 +42,6 @@
 #include <circle/spinlock.h>
 #include "common.h"
 #include "effect_mixer.hpp"
-#include "effect_platervbstereo.h"
 #include "effect_compressor.h"
 #include "effects.h"
 #include "midi_effects.h"