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

Merge pull request #26 from michaelwillis/dynamic_crossfade

Browse source 
Support updated crossfading during note playback
This commit is contained in:
Paul Ferrand 2020-01-19 07:24:43 +01:00 • committed by GitHub
commit 16ddfa3cb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/sfizz/Voice.cpp
View file

@ -66,7 +66,6 @@ void sfz::Voice::startVoice(Region* region, int delay, int number, uint8_t value
volumeEnvelope.reset(db2mag(Default::volumeRange.clamp(volumedB)));
baseGain = region->getBaseGain();
baseGain *= region->getCrossfadeGain(midiState.getCCArray());
if (triggerType != TriggerType::CC)
baseGain *= region->getNoteGain(number, value);
@ -75,6 +74,9 @@ void sfz::Voice::startVoice(Region* region, int delay, int number, uint8_t value
gain *= normalizeCC(midiState.getCCValue(region->amplitudeCC->first)) * normalizePercents(region->amplitudeCC->second);
amplitudeEnvelope.reset(Default::normalizedRange.clamp(gain));
float crossfadeGain { region->getCrossfadeGain(midiState.getCCArray()) };
crossfadeEnvelope.reset(Default::normalizedRange.clamp(crossfadeGain));
basePan = normalizeNegativePercents(region->pan);
auto pan { basePan };
if (region->panCC)
@ -202,6 +204,11 @@ void sfz::Voice::registerCC(int delay, int ccNumber, uint8_t ccValue) noexcept
const float newWidth { baseWidth + normalizeCC(ccValue) * normalizeNegativePercents(region->widthCC->second) };
widthEnvelope.registerEvent(delay, Default::symmetricNormalizedRange.clamp(newWidth));
}
if (region->crossfadeCCInRange.contains(ccNumber) || region->crossfadeCCOutRange.contains(ccNumber)) {
const float crossfadeGain = region->getCrossfadeGain(midiState.getCCArray());
crossfadeEnvelope.registerEvent(delay, Default::normalizedRange.clamp(crossfadeGain));
}
}
void sfz::Voice::registerPitchWheel(int delay, int pitch) noexcept
@ -284,6 +291,10 @@ void sfz::Voice::processMono(AudioSpan<float> buffer) noexcept
amplitudeEnvelope.getBlock(span1);
applyGain<float>(span1, leftBuffer);
// Crossfade envelope
crossfadeEnvelope.getBlock(span1);
applyGain<float>(span1, leftBuffer);
// Volume envelope
volumeEnvelope.getBlock(span1);
applyGain<float>(span1, leftBuffer);
@ -324,6 +335,10 @@ void sfz::Voice::processStereo(AudioSpan<float> buffer) noexcept
amplitudeEnvelope.getBlock(span1);
buffer.applyGain(span1);
// Crossfade envelope
crossfadeEnvelope.getBlock(span1);
buffer.applyGain(span1);
// Volume envelope
volumeEnvelope.getBlock(span1);
buffer.applyGain(span1);

1
src/sfizz/Voice.h
View file

@ -302,6 +302,7 @@ private:
ADSREnvelope<float> egEnvelope;
LinearEnvelope<float> amplitudeEnvelope; // linear events
LinearEnvelope<float> crossfadeEnvelope;
LinearEnvelope<float> panEnvelope;
LinearEnvelope<float> positionEnvelope;
LinearEnvelope<float> widthEnvelope;