Fixing drum panning.

2 years ago · 300f66ae9a
parent c285f7767c
commit 300f66ae9a
2 changed files with 359367 additions and 8 deletions
--- a/MicroDexed.ino
+++ b/MicroDexed.ino
@ -999,16 +999,12 @@ void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity) {
        float vol_min = configuration.drums.vol_min[d] / 100.0f;
        float vol_max = configuration.drums.vol_max[d] / 100.0f;

-        //drum_mixer_r.gain(slot, (1.0 - pan) * volume_transform(mapfloat(inVelocity, 0, 127, drum_config[d].vol_min/100.0f, configuration.drums.vol_max[d]/100.0f)));
-        //drum_mixer_l.gain(slot, pan * volume_transform(mapfloat(inVelocity, 0, 127, drum_config[d].vol_min/100.0f, configuration.drums.vol_max[d]/100.0f)));
-        drum_mixer_r.gain(slot, (1.0 - pan) * volume_transform(mapfloat(inVelocity, 0, 127, vol_min, vol_max)));
-        drum_mixer_l.gain(slot, pan * volume_transform(mapfloat(inVelocity, 0, 127, vol_min, vol_max)));
+        drum_mixer_r.gain(slot, pan * volume_transform(mapfloat(inVelocity, 0, 127, vol_min, vol_max)));
+        drum_mixer_l.gain(slot, (1.0 - pan) * volume_transform(mapfloat(inVelocity, 0, 127, vol_min, vol_max)));

 #ifdef USE_FX
-        //drum_reverb_send_mixer_r.gain(slot, (1.0 - pan) * volume_transform(reverb_send));
-        //drum_reverb_send_mixer_l.gain(slot, pan * volume_transform(reverb_send));
-        drum_reverb_send_mixer_r.gain(slot, (1.0 - pan) * reverb_send);
-        drum_reverb_send_mixer_l.gain(slot, pan * reverb_send);
+        drum_reverb_send_mixer_r.gain(slot, pan * volume_transform(reverb_send));
+        drum_reverb_send_mixer_l.gain(slot, (1.0 - pan) * volume_transform(reverb_send));
 #endif
        if (drum_config[d].drum_data != NULL && drum_config[d].len > 0) {
          if (configuration.drums.pitch[d] != 0) {
--- a/addon/tools/drumset.h.orig
+++ b/addon/tools/drumset.h.orig