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

Change the name of the envelope variables and filters

Browse source
This commit is contained in:
Paul Ferrand 2020-05-07 18:26:29 +02:00
parent cd455c435e
commit 298ec7fc0c
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/sfizz/Voice.cpp
View file

@ -22,7 +22,7 @@ sfz::Voice::Voice(sfz::Resources& resources)
for (WavetableOscillator& osc : waveOscillators) for (WavetableOscillator& osc : waveOscillators)
osc.init(sampleRate); osc.init(sampleRate);
for (auto & filter : channelPowerFilters) for (auto & filter : channelEnvelopeFilters)
filter.setGain(vaGain(config::filteredEnvelopeCutoff, sampleRate)); filter.setGain(vaGain(config::filteredEnvelopeCutoff, sampleRate));
} }
@ -195,7 +195,7 @@ void sfz::Voice::setSampleRate(float sampleRate) noexcept
{ {
this->sampleRate = sampleRate; this->sampleRate = sampleRate;
for (auto & filter : channelPowerFilters) for (auto & filter : channelEnvelopeFilters)
filter.setGain(vaGain(config::filteredEnvelopeCutoff, sampleRate)); filter.setGain(vaGain(config::filteredEnvelopeCutoff, sampleRate));
for (WavetableOscillator& osc : waveOscillators) for (WavetableOscillator& osc : waveOscillators)
@ -624,10 +624,10 @@ void sfz::Voice::reset() noexcept
floatPositionOffset = 0.0f; floatPositionOffset = 0.0f;
noteIsOff = false; noteIsOff = false;
for (auto& f : channelPowerFilters) for (auto& f : channelEnvelopeFilters)
f.reset(); f.reset();
for (auto& p : channelPowers) for (auto& p : smoothedChannelEnvelopes)
p = 0.0f; p = 0.0f;
filters.clear(); filters.clear();
@ -636,7 +636,7 @@ void sfz::Voice::reset() noexcept
float sfz::Voice::getAverageEnvelope() const noexcept float sfz::Voice::getAverageEnvelope() const noexcept
{ {
return max(channelPowers[0], channelPowers[1]); return max(smoothedChannelEnvelopes[0], smoothedChannelEnvelopes[1]);
} }
bool sfz::Voice::releasedOrFree() const noexcept bool sfz::Voice::releasedOrFree() const noexcept
@ -723,14 +723,15 @@ void sfz::Voice::setupOscillatorUnison()
void sfz::Voice::updateChannelPowers(AudioSpan<float> buffer) void sfz::Voice::updateChannelPowers(AudioSpan<float> buffer)
{ {
assert(channelPowers.size() == channelPowerFilters.size()); assert(smoothedChannelEnvelopes.size() == channelEnvelopeFilters.size());
assert(buffer.getNumFrames() <= channelPowerFilters.size()); assert(buffer.getNumFrames() <= channelEnvelopeFilters.size());
if (buffer.getNumFrames() == 0) if (buffer.getNumFrames() == 0)
return; return;
for (unsigned i = 0; i < channelPowers.size(); ++i) { for (unsigned i = 0; i < smoothedChannelEnvelopes.size(); ++i) {
const auto input = buffer.getConstSpan(i); const auto input = buffer.getConstSpan(i);
for (unsigned s = 0; s < buffer.getNumFrames(); ++s) for (unsigned s = 0; s < buffer.getNumFrames(); ++s)
channelPowers[i] = channelPowerFilters[i].tickLowpass(std::abs(input[s])); smoothedChannelEnvelopes[i] =
channelEnvelopeFilters[i].tickLowpass(std::abs(input[s]));
} }
} }

4
src/sfizz/Voice.h
View file

@ -309,8 +309,8 @@ private:
std::normal_distribution<float> noiseDist { 0, config::noiseVariance }; std::normal_distribution<float> noiseDist { 0, config::noiseVariance };
std::array<OnePoleFilter<float>, 2> channelPowerFilters; std::array<OnePoleFilter<float>, 2> channelEnvelopeFilters;
std::array<float, 2> channelPowers; std::array<float, 2> smoothedChannelEnvelopes;
LEAK_DETECTOR(Voice); LEAK_DETECTOR(Voice);
}; };