wirtz
/
MicroDexed
mirror of https://codeberg.org/dcoredump/MicroDexed.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Small fixes.

Browse Source
pull/48/head
Holger Wirtz 3 years ago
parent 8e7806b081
commit 890f7690b3
3 changed files with 36 additions and 36 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 64
      MicroDexed.ino
  2. 6
      UI.hpp
  3. 2
      config.h

64
MicroDexed.ino
Unescape View File

@ -35,7 +35,7 @@
#include "effect_modulated_delay.h" #include "effect_modulated_delay.h"
#include "effect_stereo_mono.h" #include "effect_stereo_mono.h"
#include "effect_mono_stereo.h" #include "effect_mono_stereo.h"
#include "mixer8.h" //#include "mixer8.h"
#ifdef USE_PLATEREVERB #ifdef USE_PLATEREVERB
#include "effect_platervbstereo.h" #include "effect_platervbstereo.h"
#else #else
@ -44,54 +44,54 @@
#include "UI.hpp" #include "UI.hpp"
// Audio engines // Audio engines
AudioSynthDexed* MicroDexed[NUM_DEXED]; AudioSynthDexed* MicroDexed[NUM_DEXED];
#if defined(USE_FX) #if defined(USE_FX)
AudioSynthWaveform* chorus_modulator[NUM_DEXED]; AudioSynthWaveform* chorus_modulator[NUM_DEXED];
#if MOD_FILTER_OUTPUT != MOD_NO_FILTER_OUTPUT #if MOD_FILTER_OUTPUT != MOD_NO_FILTER_OUTPUT
AudioFilterBiquad* modchorus_filter[NUM_DEXED]; AudioFilterBiquad* modchorus_filter[NUM_DEXED];
#endif #endif
AudioEffectModulatedDelay* modchorus[NUM_DEXED]; AudioEffectModulatedDelay* modchorus[NUM_DEXED];
AudioMixer4* chorus_mixer[NUM_DEXED]; AudioMixer4* chorus_mixer[NUM_DEXED];
AudioMixer4* delay_fb_mixer[NUM_DEXED]; AudioMixer4* delay_fb_mixer[NUM_DEXED];
AudioEffectDelay* delay_fx[NUM_DEXED]; AudioEffectDelay* delay_fx[NUM_DEXED];
AudioMixer4* delay_mixer[NUM_DEXED]; AudioMixer4* delay_mixer[NUM_DEXED];
#endif #endif
AudioEffectMonoStereo* mono2stereo[NUM_DEXED]; AudioEffectMonoStereo* mono2stereo[NUM_DEXED];
AudioMixer4 microdexed_peak_mixer; AudioMixer4 microdexed_peak_mixer;
AudioAnalyzePeak microdexed_peak; AudioAnalyzePeak microdexed_peak;
#if defined(USE_FX) #if defined(USE_FX)
AudioMixer8 reverb_mixer_r; AudioMixer4 reverb_mixer_r;
AudioMixer8 reverb_mixer_l; AudioMixer4 reverb_mixer_l;
#ifdef USE_PLATEREVERB #ifdef USE_PLATEREVERB
AudioEffectPlateReverb reverb; AudioEffectPlateReverb reverb;
#else #else
AudioEffectFreeverbStereoFloat freeverb; AudioEffectFreeverbStereoFloat freeverb;
#endif #endif
#endif #endif
AudioMixer4 master_mixer_r; AudioMixer4 master_mixer_r;
AudioMixer4 master_mixer_l; AudioMixer4 master_mixer_l;
AudioAmplifier volume_r; AudioAmplifier volume_r;
AudioAmplifier volume_l; AudioAmplifier volume_l;
AudioEffectStereoMono stereo2mono; AudioEffectStereoMono stereo2mono;
AudioAnalyzePeak master_peak_r; AudioAnalyzePeak master_peak_r;
AudioAnalyzePeak master_peak_l; AudioAnalyzePeak master_peak_l;
#if defined(ANTIALIAS_FRQ) #if defined(ANTIALIAS_FRQ)
AudioFilterBiquad antialias_r; AudioFilterBiquad antialias_r;
AudioFilterBiquad antialias_l; AudioFilterBiquad antialias_l;
#endif #endif
#if defined(TEENSY_AUDIO_BOARD) && defined(SGTL5000_AUDIO_THRU) #if defined(TEENSY_AUDIO_BOARD) && defined(SGTL5000_AUDIO_THRU)
AudioMixer4 audio_thru_mixer_r; AudioMixer4 audio_thru_mixer_r;
AudioMixer4 audio_thru_mixer_l; AudioMixer4 audio_thru_mixer_l;
#endif #endif
// Drumset // Drumset
#ifdef NUM_DRUMS #ifdef NUM_DRUMS
AudioPlaySdRaw* Drum[NUM_DRUMS]; AudioPlaySdRaw* Drum[NUM_DRUMS];
AudioEffectMonoStereo* drum_mono2stereo[NUM_DRUMS]; AudioEffectMonoStereo* drum_mono2stereo[NUM_DRUMS];
AudioMixer4 drum_mixer_r; AudioMixer4 drum_mixer_r;
AudioMixer4 drum_mixer_l; AudioMixer4 drum_mixer_l;
#endif #endif
// Audio chain tail // Audio chain tail
@ -2440,7 +2440,7 @@ void show_cpu_and_mem_usage(void)
Serial.print(F("=")); Serial.print(F("="));
Serial.print(active_voices[instance_id], DEC); Serial.print(active_voices[instance_id], DEC);
Serial.print(F("/")); Serial.print(F("/"));
Serial.print(MAX_NOTES, DEC); Serial.print(MAX_NOTES / NUM_DEXED, DEC);
if (instance_id != NUM_DEXED - 1) if (instance_id != NUM_DEXED - 1)
Serial.print(F(",")); Serial.print(F(","));
} }

6
UI.hpp
Unescape View File

@ -30,7 +30,7 @@
#include "disp_plus.h" #include "disp_plus.h"
#include "effect_modulated_delay.h" #include "effect_modulated_delay.h"
#include "effect_stereo_mono.h" #include "effect_stereo_mono.h"
#include "mixer8.h" //#include "mixer8.h"
#ifdef USE_PLATEREVERB #ifdef USE_PLATEREVERB
#include "effect_platervbstereo.h" #include "effect_platervbstereo.h"
#else #else
@ -85,8 +85,8 @@ extern AudioEffectMonoStereo* mono2stereo[NUM_DEXED];
extern AudioMixer4 microdexed_peak_mixer; extern AudioMixer4 microdexed_peak_mixer;
extern AudioAnalyzePeak microdexed_peak; extern AudioAnalyzePeak microdexed_peak;
#if defined(USE_FX) #if defined(USE_FX)
extern AudioMixer8 reverb_mixer_r; extern AudioMixer4 reverb_mixer_r;
extern AudioMixer8 reverb_mixer_l; extern AudioMixer4 reverb_mixer_l;
#ifdef USE_PLATEREVERB #ifdef USE_PLATEREVERB
extern AudioEffectPlateReverb reverb; extern AudioEffectPlateReverb reverb;
#else #else

2
config.h
Unescape View File

@ -109,7 +109,7 @@
#define USE_FX 1 #define USE_FX 1
// NUMBER OF SAMPLEDRUMS // NUMBER OF SAMPLEDRUMS
#define NUM_DRUMS 4 //#define NUM_DRUMS 4
#define DRUM_MIDI_CHANNEL 1 #define DRUM_MIDI_CHANNEL 1
// CHORUS parameters // CHORUS parameters

Write Preview
Loading…
Cancel
Save