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

Adapt the block size of the effect bus to the one of the Synth

Browse source
This commit is contained in:
Paul Fd 2020-03-05 19:02:45 +01:00
parent 49a182d90f
commit 9d3364889b
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sfizz/Effects.cpp
View file

@ -124,10 +124,16 @@ void EffectBus::mixOutputsTo(float* const mainOutput[], float* const mixOutput[]
const float gainToMix = _gainToMix; const float gainToMix = _gainToMix;
for (unsigned c = 0; c < EffectChannels; ++c) { for (unsigned c = 0; c < EffectChannels; ++c) {
absl::Span<const float> fxOut = _outputs.getConstSpan(c); auto fxOut = _outputs.getConstSpan(c);
sfz::multiplyAdd(gainToMain, fxOut, absl::Span<float>(mainOutput[c], nframes)); sfz::multiplyAdd(gainToMain, fxOut, absl::Span<float>(mainOutput[c], nframes));
sfz::multiplyAdd(gainToMix, fxOut, absl::Span<float>(mixOutput[c], nframes)); sfz::multiplyAdd(gainToMix, fxOut, absl::Span<float>(mixOutput[c], nframes));
} }
} }
void EffectBus::setSamplesPerBlock(int samplesPerBlock) noexcept
{
_inputs.resize(samplesPerBlock);
_outputs.resize(samplesPerBlock);
}
} // namespace sfz } // namespace sfz

9
src/sfizz/Effects.h
View file

@ -136,10 +136,17 @@ public:
*/ */
void mixOutputsTo(float* const mainOutput[], float* const mixOutput[], unsigned nframes); void mixOutputsTo(float* const mainOutput[], float* const mixOutput[], unsigned nframes);
/**
* @brief Sets the maximum number of frames to render at a time. The actual value can be lower
* but should never be higher.
*
*/
void setSamplesPerBlock(int samplesPerBlock) noexcept;
private: private:
std::vector<std::unique_ptr<Effect>> _effects; std::vector<std::unique_ptr<Effect>> _effects;
AudioBuffer<float> _inputs { EffectChannels, config::defaultSamplesPerBlock }; AudioBuffer<float> _inputs { EffectChannels, config::defaultSamplesPerBlock };
AudioBuffer<float> _outputs { EffectChannels, config::defaultSamplesPerBlock }; AudioBuffer<float> _outputs { EffectChannels, config::defaultSamplesPerBlock };
float _gainToMain = 0.0; float _gainToMain = 0.0;
float _gainToMix = 0.0; float _gainToMix = 0.0;
}; };

4
src/sfizz/Synth.cpp
View file

@ -125,6 +125,8 @@ void sfz::Synth::clear()
effectBuses.clear(); effectBuses.clear();
effectBuses.emplace_back(new EffectBus); effectBuses.emplace_back(new EffectBus);
effectBuses[0]->setGainToMain(1.0); effectBuses[0]->setGainToMain(1.0);
effectBuses[0]->setSamplesPerBlock(samplesPerBlock);
effectBuses[0]->init(sampleRate);
resources.filePool.clear(); resources.filePool.clear();
resources.logger.clear(); resources.logger.clear();
numGroups = 0; numGroups = 0;
@ -463,6 +465,8 @@ void sfz::Synth::setSamplesPerBlock(int samplesPerBlock) noexcept
this->tempMixNodeBuffer.resize(samplesPerBlock); this->tempMixNodeBuffer.resize(samplesPerBlock);
for (auto& voice : voices) for (auto& voice : voices)
voice->setSamplesPerBlock(samplesPerBlock); voice->setSamplesPerBlock(samplesPerBlock);
for (auto& bus: effectBuses)
bus->setSamplesPerBlock(samplesPerBlock);
} }
void sfz::Synth::setSampleRate(float sampleRate) noexcept void sfz::Synth::setSampleRate(float sampleRate) noexcept