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

Remove all callback guards

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-02-01 21:29:12 +01:00
parent 8b8caf4937
commit e178ae25e6
2 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/sfizz/Synth.cpp
View file

@ -18,7 +18,6 @@
#include "Resources.h"
#include "ScopedFTZ.h"
#include "StringViewHelpers.h"
#include "utility/SpinMutex.h"
#include "utility/XmlHelpers.h"
#include "Voice.h"
#include "Interpolators.h"
@ -486,7 +485,6 @@ void Synth::Impl::handleEffectOpcodes(const std::vector<Opcode>& rawMembers)
bool Synth::loadSfzFile(const fs::path& file)
{
Impl& impl = *impl_;
const std::lock_guard<SpinMutex> disableCallback { impl.callbackGuard_ };
impl.clear();
@ -515,7 +513,6 @@ bool Synth::loadSfzFile(const fs::path& file)
bool Synth::loadSfzString(const fs::path& path, absl::string_view text)
{
Impl& impl = *impl_;
const std::lock_guard<SpinMutex> disableCallback { impl.callbackGuard_ };
impl.clear();
@ -805,8 +802,6 @@ void Synth::setSamplesPerBlock(int samplesPerBlock) noexcept
Impl& impl = *impl_;
ASSERT(samplesPerBlock <= config::maxBlockSize);
const std::lock_guard<SpinMutex> disableCallback { impl.callbackGuard_ };
impl.samplesPerBlock_ = samplesPerBlock;
for (auto& voice : impl.voiceManager_)
voice.setSamplesPerBlock(samplesPerBlock);
@ -828,7 +823,6 @@ int Synth::getSamplesPerBlock() const noexcept
void Synth::setSampleRate(float sampleRate) noexcept
{
Impl& impl = *impl_;
const std::lock_guard<SpinMutex> disableCallback { impl.callbackGuard_ };
impl.sampleRate_ = sampleRate;
for (auto& voice : impl.voiceManager_)
@ -865,10 +859,6 @@ void Synth::renderBlock(AudioSpan<float> buffer) noexcept
impl.resources_.filePool.triggerGarbageCollection();
}
const std::unique_lock<SpinMutex> lock { impl.callbackGuard_, std::try_to_lock };
if (!lock.owns_lock())
return;
size_t numFrames = buffer.getNumFrames();
auto tempSpan = impl.resources_.bufferPool.getStereoBuffer(numFrames);
auto tempMixSpan = impl.resources_.bufferPool.getStereoBuffer(numFrames);
@ -986,11 +976,6 @@ void Synth::noteOn(int delay, int noteNumber, uint8_t velocity) noexcept
const auto normalizedVelocity = normalizeVelocity(velocity);
ScopedTiming logger { impl.dispatchDuration_, ScopedTiming::Operation::addToDuration };
impl.resources_.midiState.noteOnEvent(delay, noteNumber, normalizedVelocity);
const std::unique_lock<SpinMutex> lock { impl.callbackGuard_, std::try_to_lock };
if (!lock.owns_lock())
return;
impl.noteOnDispatch(delay, noteNumber, normalizedVelocity);
}
@ -1004,10 +989,6 @@ void Synth::noteOff(int delay, int noteNumber, uint8_t velocity) noexcept
ScopedTiming logger { impl.dispatchDuration_, ScopedTiming::Operation::addToDuration };
impl.resources_.midiState.noteOffEvent(delay, noteNumber, normalizedVelocity);
const std::unique_lock<SpinMutex> lock { impl.callbackGuard_, std::try_to_lock };
if (!lock.owns_lock())
return;
// FIXME: Some keyboards (e.g. Casio PX5S) can send a real note-off velocity. In this case, do we have a
// way in sfz to specify that a release trigger should NOT use the note-on velocity?
// auto replacedVelocity = (velocity == 0 ? getNoteVelocity(noteNumber) : velocity);
@ -1148,10 +1129,6 @@ void Synth::Impl::performHdcc(int delay, int ccNumber, float normValue, bool asM
ScopedTiming logger { dispatchDuration_, ScopedTiming::Operation::addToDuration };
resources_.midiState.ccEvent(delay, ccNumber, normValue);
const std::unique_lock<SpinMutex> lock { callbackGuard_, std::try_to_lock };
if (!lock.owns_lock())
return;
if (asMidi) {
if (ccNumber == config::resetCC) {
resetAllControllers(delay);
@ -1492,7 +1469,6 @@ void Synth::setNumVoices(int numVoices) noexcept
{
ASSERT(numVoices > 0);
Impl& impl = *impl_;
const std::lock_guard<SpinMutex> disableCallback { impl.callbackGuard_ };
// fast path
if (numVoices == impl.numVoices_)
@ -1601,7 +1577,6 @@ void Synth::Impl::setupModMatrix()
void Synth::setOversamplingFactor(Oversampling factor) noexcept
{
Impl& impl = *impl_;
const std::lock_guard<SpinMutex> disableCallback { impl.callbackGuard_ };
// fast path
if (factor == impl.oversamplingFactor_)
@ -1624,7 +1599,6 @@ Oversampling Synth::getOversamplingFactor() const noexcept
void Synth::setPreloadSize(uint32_t preloadSize) noexcept
{
Impl& impl = *impl_;
const std::lock_guard<SpinMutex> disableCallback { impl.callbackGuard_ };
// fast path
if (preloadSize == impl.resources_.filePool.getPreloadSize())
@ -1660,10 +1634,6 @@ void Synth::Impl::resetAllControllers(int delay) noexcept
{
resources_.midiState.resetAllControllers(delay);
const std::unique_lock<SpinMutex> lock { callbackGuard_, std::try_to_lock };
if (!lock.owns_lock())
return;
for (auto& voice : voiceManager_) {
voice.registerPitchWheel(delay, 0);
for (int cc = 0; cc < config::numCCs; ++cc)
@ -1732,8 +1702,6 @@ void Synth::disableLogging() noexcept
void Synth::allSoundOff() noexcept
{
Impl& impl = *impl_;
const std::lock_guard<SpinMutex> disableCallback { impl.callbackGuard_ };
for (auto& voice : impl.voiceManager_)
voice.reset();
for (auto& effectBus : impl.effectBuses_)

2
src/sfizz/SynthPrivate.h
View file

@ -246,8 +246,6 @@ struct Synth::Impl final: public Parser::Listener {
// Distribution used to generate random value for the *rand opcodes
std::uniform_real_distribution<float> randNoteDistribution_ { 0, 1 };
SpinMutex callbackGuard_;
// Singletons passed as references to the voices
Resources resources_;