From 890f7690b3bb6141fb4d8493c5f85a4cf2a3e51c Mon Sep 17 00:00:00 2001
From: Holger Wirtz <wirtz@dfn.de>
Date: Wed, 21 Jul 2021 12:15:11 +0200
Subject: [PATCH] Small fixes.

---
 MicroDexed.ino | 64 +++++++++++++++++++++++++-------------------------
 UI.hpp         |  6 ++---
 config.h       |  2 +-
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/MicroDexed.ino b/MicroDexed.ino
index 84a6e82..81bd259 100644
--- a/MicroDexed.ino
+++ b/MicroDexed.ino
@@ -35,7 +35,7 @@
 #include "effect_modulated_delay.h"
 #include "effect_stereo_mono.h"
 #include "effect_mono_stereo.h"
-#include "mixer8.h"
+//#include "mixer8.h"
 #ifdef USE_PLATEREVERB
 #include "effect_platervbstereo.h"
 #else
@@ -44,54 +44,54 @@
 #include "UI.hpp"
 
 // Audio engines
-AudioSynthDexed*     MicroDexed[NUM_DEXED];
+AudioSynthDexed*                MicroDexed[NUM_DEXED];
 
 #if defined(USE_FX)
-AudioSynthWaveform*        chorus_modulator[NUM_DEXED];
+AudioSynthWaveform*             chorus_modulator[NUM_DEXED];
 #if MOD_FILTER_OUTPUT != MOD_NO_FILTER_OUTPUT
-AudioFilterBiquad*         modchorus_filter[NUM_DEXED];
+AudioFilterBiquad*              modchorus_filter[NUM_DEXED];
 #endif
-AudioEffectModulatedDelay* modchorus[NUM_DEXED];
-AudioMixer4*               chorus_mixer[NUM_DEXED];
-AudioMixer4*               delay_fb_mixer[NUM_DEXED];
-AudioEffectDelay*          delay_fx[NUM_DEXED];
-AudioMixer4*               delay_mixer[NUM_DEXED];
+AudioEffectModulatedDelay*      modchorus[NUM_DEXED];
+AudioMixer4*                    chorus_mixer[NUM_DEXED];
+AudioMixer4*                    delay_fb_mixer[NUM_DEXED];
+AudioEffectDelay*               delay_fx[NUM_DEXED];
+AudioMixer4*                    delay_mixer[NUM_DEXED];
 #endif
-AudioEffectMonoStereo*     mono2stereo[NUM_DEXED];
+AudioEffectMonoStereo*          mono2stereo[NUM_DEXED];
 
-AudioMixer4                microdexed_peak_mixer;
-AudioAnalyzePeak           microdexed_peak;
+AudioMixer4                     microdexed_peak_mixer;
+AudioAnalyzePeak                microdexed_peak;
 #if defined(USE_FX)
-AudioMixer8                reverb_mixer_r;
-AudioMixer8                reverb_mixer_l;
+AudioMixer4                     reverb_mixer_r;
+AudioMixer4                     reverb_mixer_l;
 #ifdef USE_PLATEREVERB
-AudioEffectPlateReverb     reverb;
+AudioEffectPlateReverb          reverb;
 #else
-AudioEffectFreeverbStereoFloat   freeverb;
+AudioEffectFreeverbStereoFloat  freeverb;
 #endif
 #endif
-AudioMixer4                master_mixer_r;
-AudioMixer4                master_mixer_l;
-AudioAmplifier             volume_r;
-AudioAmplifier             volume_l;
-AudioEffectStereoMono      stereo2mono;
-AudioAnalyzePeak           master_peak_r;
-AudioAnalyzePeak           master_peak_l;
+AudioMixer4                     master_mixer_r;
+AudioMixer4                     master_mixer_l;
+AudioAmplifier                  volume_r;
+AudioAmplifier                  volume_l;
+AudioEffectStereoMono           stereo2mono;
+AudioAnalyzePeak                master_peak_r;
+AudioAnalyzePeak                master_peak_l;
 #if defined(ANTIALIAS_FRQ)
-AudioFilterBiquad          antialias_r;
-AudioFilterBiquad          antialias_l;
+AudioFilterBiquad               antialias_r;
+AudioFilterBiquad               antialias_l;
 #endif
 #if defined(TEENSY_AUDIO_BOARD) && defined(SGTL5000_AUDIO_THRU)
-AudioMixer4                audio_thru_mixer_r;
-AudioMixer4                audio_thru_mixer_l;
+AudioMixer4                     audio_thru_mixer_r;
+AudioMixer4                     audio_thru_mixer_l;
 #endif
 
 // Drumset
 #ifdef NUM_DRUMS
-AudioPlaySdRaw*             Drum[NUM_DRUMS];
-AudioEffectMonoStereo*      drum_mono2stereo[NUM_DRUMS];
-AudioMixer4                 drum_mixer_r;
-AudioMixer4                 drum_mixer_l;
+AudioPlaySdRaw*                 Drum[NUM_DRUMS];
+AudioEffectMonoStereo*          drum_mono2stereo[NUM_DRUMS];
+AudioMixer4                     drum_mixer_r;
+AudioMixer4                     drum_mixer_l;
 #endif
 
 // Audio chain tail
@@ -2440,7 +2440,7 @@ void show_cpu_and_mem_usage(void)
     Serial.print(F("="));
     Serial.print(active_voices[instance_id], DEC);
     Serial.print(F("/"));
-    Serial.print(MAX_NOTES, DEC);
+    Serial.print(MAX_NOTES / NUM_DEXED, DEC);
     if (instance_id != NUM_DEXED - 1)
       Serial.print(F(","));
   }
diff --git a/UI.hpp b/UI.hpp
index 85b8cb6..51c3c19 100644
--- a/UI.hpp
+++ b/UI.hpp
@@ -30,7 +30,7 @@
 #include "disp_plus.h"
 #include "effect_modulated_delay.h"
 #include "effect_stereo_mono.h"
-#include "mixer8.h"
+//#include "mixer8.h"
 #ifdef USE_PLATEREVERB
 #include "effect_platervbstereo.h"
 #else
@@ -85,8 +85,8 @@ extern AudioEffectMonoStereo*     mono2stereo[NUM_DEXED];
 extern AudioMixer4                microdexed_peak_mixer;
 extern AudioAnalyzePeak           microdexed_peak;
 #if defined(USE_FX)
-extern AudioMixer8                reverb_mixer_r;
-extern AudioMixer8                reverb_mixer_l;
+extern AudioMixer4                reverb_mixer_r;
+extern AudioMixer4                reverb_mixer_l;
 #ifdef USE_PLATEREVERB
 extern AudioEffectPlateReverb     reverb;
 #else
diff --git a/config.h b/config.h
index 60f1224..12cf624 100644
--- a/config.h
+++ b/config.h
@@ -109,7 +109,7 @@
 #define USE_FX 1
 
 // NUMBER OF SAMPLEDRUMS
-#define NUM_DRUMS 4
+//#define NUM_DRUMS 4
 #define DRUM_MIDI_CHANNEL 1
 
 // CHORUS parameters