|
|
@ -999,16 +999,12 @@ void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity) { |
|
|
|
float vol_min = configuration.drums.vol_min[d] / 100.0f; |
|
|
|
float vol_min = configuration.drums.vol_min[d] / 100.0f; |
|
|
|
float vol_max = configuration.drums.vol_max[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_r.gain(slot, pan * volume_transform(mapfloat(inVelocity, 0, 127, vol_min, vol_max))); |
|
|
|
//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_l.gain(slot, (1.0 - pan) * volume_transform(mapfloat(inVelocity, 0, 127, vol_min, vol_max))); |
|
|
|
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))); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef USE_FX |
|
|
|
#ifdef USE_FX |
|
|
|
//drum_reverb_send_mixer_r.gain(slot, (1.0 - pan) * volume_transform(reverb_send));
|
|
|
|
drum_reverb_send_mixer_r.gain(slot, pan * volume_transform(reverb_send)); |
|
|
|
//drum_reverb_send_mixer_l.gain(slot, pan * volume_transform(reverb_send));
|
|
|
|
drum_reverb_send_mixer_l.gain(slot, (1.0 - 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); |
|
|
|
|
|
|
|
#endif |
|
|
|
#endif |
|
|
|
if (drum_config[d].drum_data != NULL && drum_config[d].len > 0) { |
|
|
|
if (drum_config[d].drum_data != NULL && drum_config[d].len > 0) { |
|
|
|
if (configuration.drums.pitch[d] != 0) { |
|
|
|
if (configuration.drums.pitch[d] != 0) { |
|
|
|