From 0581978f708bd9554e1472f8cc22304ad086d2cb Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Tue, 15 Oct 2019 15:05:09 +0200 Subject: [PATCH] Using freeverb-stereo. Fixing audio routing. --- MicroDexed.ino | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/MicroDexed.ino b/MicroDexed.ino index f223500..32476c9 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -42,8 +42,7 @@ AudioPlayQueue dexed1; AudioAnalyzePeak peak1; AudioEffectDelay delay_r; AudioEffectDelay delay_l; -AudioEffectFreeverb freeverb_r; -AudioEffectFreeverb freeverb_l; +AudioEffectFreeverbStereo freeverbs1; AudioEffectModulatedDelay modchorus_r; AudioEffectModulatedDelay modchorus_l; #if MOD_FILTER_OUTPUT != MOD_NO_FILTER_OUTPUT @@ -62,7 +61,9 @@ AudioMixer4 reverb_mixer_r; AudioMixer4 reverb_mixer_l; AudioAmplifier volume_r; AudioAmplifier volume_l; +#ifdef MIDI_DEVICE_USB AudioOutputUSB usb1; +#endif AudioConnection patchCord0(dexed1, peak1); AudioConnection patchCord1(dexed1, 0, chorus_mixer_r, 0); AudioConnection patchCord2(dexed1, 0, chorus_mixer_l, 0); @@ -96,26 +97,30 @@ AudioConnection patchCord24(delay_r, 0, delay_mixer_r, 2); AudioConnection patchCord25(delay_l, 0, delay_mixer_l, 2); AudioConnection patchCord26(delay_fb_mixer_r, delay_r); AudioConnection patchCord27(delay_fb_mixer_l, delay_l); -AudioConnection patchCord28(freeverb_r, 0, reverb_mixer_r, 1); -AudioConnection patchCord29(freeverb_l, 0, reverb_mixer_l, 1); -AudioConnection patchCord30(reverb_mixer_r, volume_r); -AudioConnection patchCord31(reverb_mixer_l, volume_l); -AudioConnection patchCord32(volume_r, 0, usb1, 0); -AudioConnection patchCord33(volume_l, 0, usb1, 1); +AudioConnection patchCord28(delay_mixer_r, 0, freeverbs1, 1); +AudioConnection patchCord29(delay_mixer_l, 0, freeverbs1, 1); +AudioConnection patchCord30(freeverbs1, 0, reverb_mixer_r, 1); +AudioConnection patchCord31(freeverbs1, 1, reverb_mixer_l, 1); +AudioConnection patchCord32(reverb_mixer_r, volume_r); +AudioConnection patchCord33(reverb_mixer_l, volume_l); +#ifdef MIDI_DEVICE_USB +AudioConnection patchCord34(volume_r, 0, usb1, 0); +AudioConnection patchCord35(volume_l, 0, usb1, 1); +#endif #if defined(TEENSY_AUDIO_BOARD) AudioOutputI2S i2s1; -AudioConnection patchCord34(volume_r, 0, i2s1, 0); -AudioConnection patchCord35(volume_l, 0, i2s1, 1); +AudioConnection patchCord36(volume_r, 0, i2s1, 0); +AudioConnection patchCord37(volume_l, 0, i2s1, 1); AudioControlSGTL5000 sgtl5000_1; #elif defined(TGA_AUDIO_BOARD) AudioOutputI2S i2s1; -AudioConnection patchCord34(volume_r, 0, i2s1, 0); -AudioConnection patchCord35(volume_l, 0, i2s1, 1); +AudioConnection patchCord36(volume_r, 0, i2s1, 0); +AudioConnection patchCord37(volume_l, 0, i2s1, 1); AudioControlWM8731master wm8731_1; #else AudioOutputPT8211 pt8211_1; -AudioConnection patchCord34(volume_r, 0, pt8211_1, 0); -AudioConnection patchCord35(volume_l, 0, pt8211_1, 1); +AudioConnection patchCord36(volume_r, 0, pt8211_1, 0); +AudioConnection patchCord37(volume_l, 0, pt8211_1, 1); #endif Dexed* dexed = new Dexed(SAMPLE_RATE);