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

Rename egEnvelope to egAmplitude

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-09-23 22:58:53 +02:00
parent 0f2bb80434
commit 2f12206c4c
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/sfizz/Voice.cpp
View file

@ -130,7 +130,7 @@ void sfz::Voice::startVoice(Region* region, int delay, const TriggerEvent& event
bendStepFactor = centsFactor(region->bendStep); bendStepFactor = centsFactor(region->bendStep);
bendSmoother.setSmoothing(region->bendSmooth, sampleRate); bendSmoother.setSmoothing(region->bendSmooth, sampleRate);
bendSmoother.reset(centsFactor(region->getBendInCents(resources.midiState.getPitchBend()))); bendSmoother.reset(centsFactor(region->getBendInCents(resources.midiState.getPitchBend())));
egEnvelope.reset(region->amplitudeEG, *region, resources.midiState, delay, triggerEvent.value, sampleRate); egAmplitude.reset(region->amplitudeEG, *region, resources.midiState, delay, triggerEvent.value, sampleRate);
resources.modMatrix.initVoice(id, region->getId(), delay); resources.modMatrix.initVoice(id, region->getId(), delay);
saveModulationTargets(region); saveModulationTargets(region);
@ -152,10 +152,10 @@ void sfz::Voice::release(int delay) noexcept
if (state != State::playing) if (state != State::playing)
return; return;
if (egEnvelope.getRemainingDelay() > delay) { if (egAmplitude.getRemainingDelay() > delay) {
switchState(State::cleanMeUp); switchState(State::cleanMeUp);
} else { } else {
egEnvelope.startRelease(delay); egAmplitude.startRelease(delay);
} }
resources.modMatrix.releaseVoice(id, region->getId(), delay); resources.modMatrix.releaseVoice(id, region->getId(), delay);
@ -164,9 +164,9 @@ void sfz::Voice::release(int delay) noexcept
void sfz::Voice::off(int delay) noexcept void sfz::Voice::off(int delay) noexcept
{ {
if (region->offMode == SfzOffMode::fast) { if (region->offMode == SfzOffMode::fast) {
egEnvelope.setReleaseTime( Default::offTime ); egAmplitude.setReleaseTime( Default::offTime );
} else if (region->offMode == SfzOffMode::time) { } else if (region->offMode == SfzOffMode::time) {
egEnvelope.setReleaseTime(region->offTime); egAmplitude.setReleaseTime(region->offTime);
} }
release(delay); release(delay);
@ -286,7 +286,7 @@ void sfz::Voice::renderBlock(AudioSpan<float> buffer) noexcept
panStageMono(buffer); panStageMono(buffer);
} }
if (!egEnvelope.isSmoothing()) if (!egAmplitude.isSmoothing())
switchState(State::cleanMeUp); switchState(State::cleanMeUp);
powerFollower.process(buffer); powerFollower.process(buffer);
@ -368,7 +368,7 @@ void sfz::Voice::amplitudeEnvelope(absl::Span<float> modulationSpan) noexcept
ModMatrix& mm = resources.modMatrix; ModMatrix& mm = resources.modMatrix;
// AmpEG envelope // AmpEG envelope
egEnvelope.getBlock(modulationSpan); egAmplitude.getBlock(modulationSpan);
// Amplitude envelope // Amplitude envelope
applyGain1<float>(baseGain, modulationSpan); applyGain1<float>(baseGain, modulationSpan);
@ -572,8 +572,8 @@ void sfz::Voice::fillWithData(AudioSpan<float> buffer) noexcept
<< " for sample " << region->sampleId); << " for sample " << region->sampleId);
} }
#endif #endif
egEnvelope.setReleaseTime(0.0f); egAmplitude.setReleaseTime(0.0f);
egEnvelope.startRelease(i); egAmplitude.startRelease(i);
fill<int>(indices->subspan(i), sampleEnd); fill<int>(indices->subspan(i), sampleEnd);
fill<float>(coeffs->subspan(i), 1.0f); fill<float>(coeffs->subspan(i), 1.0f);
break; break;
@ -853,7 +853,7 @@ float sfz::Voice::getAveragePower() const noexcept
bool sfz::Voice::releasedOrFree() const noexcept bool sfz::Voice::releasedOrFree() const noexcept
{ {
return state != State::playing || egEnvelope.isReleased(); return state != State::playing || egAmplitude.isReleased();
} }
uint32_t sfz::Voice::getSourcePosition() const noexcept uint32_t sfz::Voice::getSourcePosition() const noexcept

2
src/sfizz/Voice.h
View file

@ -461,7 +461,7 @@ private:
std::vector<std::unique_ptr<LFO>> lfos; std::vector<std::unique_ptr<LFO>> lfos;
std::vector<std::unique_ptr<FlexEnvelope>> flexEGs; std::vector<std::unique_ptr<FlexEnvelope>> flexEGs;
ADSREnvelope<float> egEnvelope; ADSREnvelope<float> egAmplitude;
float bendStepFactor { centsFactor(1) }; float bendStepFactor { centsFactor(1) };
WavetableOscillator waveOscillators[config::oscillatorsPerVoice]; WavetableOscillator waveOscillators[config::oscillatorsPerVoice];