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

Make it so you cannot add events too "early" in the block

Browse source
This commit is contained in:
Paul Ferrand 2020-01-20 19:13:40 +01:00
parent bc567c5e7b
commit 864fe57c54
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sfizz/Voice.cpp
View file

@ -179,7 +179,10 @@ void sfz::Voice::registerCC(int delay, int ccNumber, uint8_t ccValue) noexcept
if (region->checkSustain && noteIsOff && ccNumber == config::sustainCC && ccValue < config::halfCCThreshold) if (region->checkSustain && noteIsOff && ccNumber == config::sustainCC && ccValue < config::halfCCThreshold)
release(delay); release(delay);
// TODO: gain-type events at time 0 may trigger sharp discontinuities; maybe add a minimum delay? // Add a minimum delay for smoothing the envelopes
// TODO: this feels like a hack, revisit this along with the smoothed envelopes...
delay = max(delay, minEnvelopeDelay);
if (region->amplitudeCC && ccNumber == region->amplitudeCC->first) { if (region->amplitudeCC && ccNumber == region->amplitudeCC->first) {
const float newGain { baseGain * normalizeCC(ccValue) * normalizePercents(region->amplitudeCC->second) }; const float newGain { baseGain * normalizeCC(ccValue) * normalizePercents(region->amplitudeCC->second) };
amplitudeEnvelope.registerEvent(delay, Default::normalizedRange.clamp(newGain)); amplitudeEnvelope.registerEvent(delay, Default::normalizedRange.clamp(newGain));
@ -206,8 +209,8 @@ void sfz::Voice::registerCC(int delay, int ccNumber, uint8_t ccValue) noexcept
} }
if (region->crossfadeCCInRange.contains(ccNumber) || region->crossfadeCCOutRange.contains(ccNumber)) { if (region->crossfadeCCInRange.contains(ccNumber) || region->crossfadeCCOutRange.contains(ccNumber)) {
const float crossfadeGain = region->getCrossfadeGain(midiState.getCCArray()); const float crossfadeGain = region->getCrossfadeGain(midiState.getCCArray());
crossfadeEnvelope.registerEvent(delay, Default::normalizedRange.clamp(crossfadeGain)); crossfadeEnvelope.registerEvent(delay, Default::normalizedRange.clamp(crossfadeGain));
} }
} }
@ -237,6 +240,7 @@ void sfz::Voice::setSampleRate(float sampleRate) noexcept
void sfz::Voice::setSamplesPerBlock(int samplesPerBlock) noexcept void sfz::Voice::setSamplesPerBlock(int samplesPerBlock) noexcept
{ {
this->samplesPerBlock = samplesPerBlock; this->samplesPerBlock = samplesPerBlock;
this->minEnvelopeDelay = samplesPerBlock / 2;
tempBuffer1.resize(samplesPerBlock); tempBuffer1.resize(samplesPerBlock);
tempBuffer2.resize(samplesPerBlock); tempBuffer2.resize(samplesPerBlock);
tempBuffer3.resize(samplesPerBlock); tempBuffer3.resize(samplesPerBlock);

1
src/sfizz/Voice.h
View file

@ -295,6 +295,7 @@ private:
absl::Span<int> indexSpan { absl::MakeSpan(indexBuffer) }; absl::Span<int> indexSpan { absl::MakeSpan(indexBuffer) };
int samplesPerBlock { config::defaultSamplesPerBlock }; int samplesPerBlock { config::defaultSamplesPerBlock };
int minEnvelopeDelay { config::defaultSamplesPerBlock / 2 };
float sampleRate { config::defaultSampleRate }; float sampleRate { config::defaultSampleRate };
const MidiState& midiState; const MidiState& midiState;