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

Remove the renderVoiceToOutput method and add a missing comment

Browse source
This commit is contained in:
Paul Ferrand 2020-10-07 09:08:01 +02:00
parent 81fe043bb3
commit f9178d41aa
2 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/sfizz/Synth.cpp
View file

@ -801,20 +801,6 @@ void sfz::Synth::setSampleRate(float sampleRate) noexcept
} }
} }
void sfz::Synth::renderVoiceToOutputs(Voice& voice, AudioSpan<float>& tempSpan) noexcept
{
const Region* region = voice.getRegion();
ASSERT(region != nullptr);
voice.renderBlock(tempSpan);
for (size_t i = 0, n = effectBuses.size(); i < n; ++i) {
if (auto& bus = effectBuses[i]) {
float addGain = region->getGainToEffectBus(i);
bus->addToInputs(tempSpan, addGain, tempSpan.getNumFrames());
}
}
}
void sfz::Synth::renderBlock(AudioSpan<float> buffer) noexcept void sfz::Synth::renderBlock(AudioSpan<float> buffer) noexcept
{ {
ScopedFTZ ftz; ScopedFTZ ftz;
@ -865,7 +851,17 @@ void sfz::Synth::renderBlock(AudioSpan<float> buffer) noexcept
mm.beginVoice(voice->getId(), voice->getRegion()->getId(), voice->getTriggerEvent().value); mm.beginVoice(voice->getId(), voice->getRegion()->getId(), voice->getTriggerEvent().value);
activeVoices++; activeVoices++;
renderVoiceToOutputs(*voice, *tempSpan);
const Region* region = voice->getRegion();
ASSERT(region != nullptr);
voice->renderBlock(*tempSpan);
for (size_t i = 0, n = effectBuses.size(); i < n; ++i) {
if (auto& bus = effectBuses[i]) {
float addGain = region->getGainToEffectBus(i);
bus->addToInputs(*tempSpan, addGain, numFrames);
}
}
callbackBreakdown.data += voice->getLastDataDuration(); callbackBreakdown.data += voice->getLastDataDuration();
callbackBreakdown.amplitude += voice->getLastAmplitudeDuration(); callbackBreakdown.amplitude += voice->getLastAmplitudeDuration();
callbackBreakdown.filters += voice->getLastFilterDuration(); callbackBreakdown.filters += voice->getLastFilterDuration();

7
src/sfizz/Synth.h
View file

@ -742,13 +742,10 @@ private:
void setupModMatrix(); void setupModMatrix();
/** /**
* @brief Render the voice to its designated outputs and effect busses. * @brief Get the modification time of all included sfz files
* *
* @param voice * @return fs::file_time_type
* @param tempSpan a temporary span used for rendering
*/ */
void renderVoiceToOutputs(Voice& voice, AudioSpan<float>& tempSpan) noexcept;
fs::file_time_type checkModificationTime(); fs::file_time_type checkModificationTime();
/** /**