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

Added the pitch envelope on data generators

Browse source
This commit is contained in:
Paul Ferrand 2019-12-13 11:10:50 +01:00
parent cc04f21a05
commit 862dfca73e
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/sfizz/Voice.cpp
View file

@ -96,7 +96,7 @@ void sfz::Voice::startVoice(Region* region, int delay, int channel, int number,
widthEnvelope.reset(width); widthEnvelope.reset(width);
pitchBendEnvelope.setFunction([region](float pitchValue){ pitchBendEnvelope.setFunction([region](float pitchValue){
const auto normalizedBend = normalizeBend(pitchValue); const auto normalizedBend = -1 * normalizeBend(pitchValue);
const auto bendInCents = normalizedBend > 0 ? normalizedBend * region->bendUp : normalizedBend * region->bendDown; const auto bendInCents = normalizedBend > 0 ? normalizedBend * region->bendUp : normalizedBend * region->bendDown;
return centsFactor(bendInCents); return centsFactor(bendInCents);
}); });
@ -199,7 +199,6 @@ void sfz::Voice::registerPitchWheel(int delay, int channel, int pitch) noexcept
return; return;
pitchBendEnvelope.registerEvent(delay, pitch); pitchBendEnvelope.registerEvent(delay, pitch);
// TODO
} }
void sfz::Voice::registerAftertouch(int delay [[maybe_unused]], int channel [[maybe_unused]], uint8_t aftertouch [[maybe_unused]]) noexcept void sfz::Voice::registerAftertouch(int delay [[maybe_unused]], int channel [[maybe_unused]], uint8_t aftertouch [[maybe_unused]]) noexcept
@ -367,10 +366,17 @@ void sfz::Voice::fillWithData(AudioSpan<float> buffer) noexcept
auto indices = indexSpan.first(buffer.getNumFrames()); auto indices = indexSpan.first(buffer.getNumFrames());
auto jumps = tempSpan1.first(buffer.getNumFrames()); auto jumps = tempSpan1.first(buffer.getNumFrames());
auto bends = tempSpan2.first(buffer.getNumFrames());
auto leftCoeffs = tempSpan1.first(buffer.getNumFrames()); auto leftCoeffs = tempSpan1.first(buffer.getNumFrames());
auto rightCoeffs = tempSpan2.first(buffer.getNumFrames()); auto rightCoeffs = tempSpan2.first(buffer.getNumFrames());
fill<float>(jumps, pitchRatio * speedRatio); fill<float>(jumps, pitchRatio * speedRatio);
if (region->bendStep > 1)
pitchBendEnvelope.getQuantizedBlock(bends, region->bendStep);
else
pitchBendEnvelope.getBlock(bends);
applyGain<float>(bends, jumps);
jumps[0] += floatPositionOffset; jumps[0] += floatPositionOffset;
cumsum<float>(jumps, jumps); cumsum<float>(jumps, jumps);
sfzInterpolationCast<float>(jumps, indices, leftCoeffs, rightCoeffs); sfzInterpolationCast<float>(jumps, indices, leftCoeffs, rightCoeffs);
@ -446,10 +452,23 @@ void sfz::Voice::fillWithGenerator(AudioSpan<float> buffer) noexcept
if (buffer.getNumFrames() == 0) if (buffer.getNumFrames() == 0)
return; return;
float step = baseFrequency * twoPi<float> / sampleRate; auto jumps = tempSpan1.first(buffer.getNumFrames());
phase = linearRamp<float>(tempSpan1, phase, step); auto bends = tempSpan2.first(buffer.getNumFrames());
auto phases = tempSpan2.first(buffer.getNumFrames());
sin<float>(tempSpan1.first(buffer.getNumFrames()), buffer.getSpan(0)); const float step = baseFrequency * twoPi<float> / sampleRate;
fill<float>(jumps, step);
if (region->bendStep > 1)
pitchBendEnvelope.getQuantizedBlock(bends, region->bendStep);
else
pitchBendEnvelope.getBlock(bends);
applyGain<float>(bends, jumps);
jumps[0] += phase;
cumsum<float>(jumps, phases);
phase = phases.back();
sin<float>(phases, buffer.getSpan(0));
copy<float>(buffer.getSpan(0), buffer.getSpan(1)); copy<float>(buffer.getSpan(0), buffer.getSpan(1));
// Wrap the phase so we don't loose too much precision on longer notes // Wrap the phase so we don't loose too much precision on longer notes