sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Override the velocity in the startVoice method

Browse source
This commit is contained in:
Paul Fd 2021-04-04 17:26:40 +02:00
parent 65353486a9
commit 78e20c68bf
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sfizz/Synth.cpp
View file

@ -1144,9 +1144,6 @@ void Synth::Impl::noteOnDispatch(int delay, int noteNumber, float velocity) noex
}
TriggerEvent triggerEvent { TriggerEventType::NoteOn, noteNumber, velocity };
if (region.velocityOverride == VelocityOverride::previous)
triggerEvent.value = resources_.midiState.getLastVelocity();
startVoice(layer, delay, triggerEvent, ring);
}
}
@ -1199,7 +1196,7 @@ void Synth::cc(int delay, int ccNumber, uint8_t ccValue) noexcept
void Synth::Impl::ccDispatch(int delay, int ccNumber, float value) noexcept
{
SisterVoiceRingBuilder ring;
const TriggerEvent triggerEvent { TriggerEventType::CC, ccNumber, value };
TriggerEvent triggerEvent { TriggerEventType::CC, ccNumber, value };
for (Layer* layer : ccActivationLists_[ccNumber]) {
const Region& region = layer->getRegion();
@ -1217,8 +1214,9 @@ void Synth::Impl::ccDispatch(int delay, int ccNumber, float value) noexcept
}
}
if (layer->registerCC(ccNumber, value))
if (layer->registerCC(ccNumber, value)) {
startVoice(layer, delay, triggerEvent, ring);
}
}
}

3
src/sfizz/Voice.cpp
View file

@ -401,6 +401,9 @@ bool Voice::startVoice(Layer* layer, int delay, const TriggerEvent& event) noexc
if (impl.triggerEvent_.type == TriggerEventType::CC)
impl.triggerEvent_.number = region.pitchKeycenter;
if (region.velocityOverride == VelocityOverride::previous)
impl.triggerEvent_.value = resources.midiState.getLastVelocity();
if (region.disabled()) {
impl.switchState(State::cleanMeUp);
return false;