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

Use the spinlock mutex in EQPool

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-08-06 16:46:56 +02:00
parent 76654d56ea
commit f3e37cc713
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sfizz/EQPool.cpp
View file

@ -108,7 +108,7 @@ sfz::EQPool::EQPool(const MidiState& state, int numEQs)
sfz::EQHolderPtr sfz::EQPool::getEQ(const EQDescription& description, unsigned numChannels, float velocity) sfz::EQHolderPtr sfz::EQPool::getEQ(const EQDescription& description, unsigned numChannels, float velocity)
{ {
const std::unique_lock<std::mutex> lock { eqGuard, std::try_to_lock }; const std::unique_lock<SpinMutex> lock { eqGuard, std::try_to_lock };
if (!lock.owns_lock()) if (!lock.owns_lock())
return {}; return {};
@ -132,7 +132,7 @@ size_t sfz::EQPool::getActiveEQs() const
size_t sfz::EQPool::setnumEQs(size_t numEQs) size_t sfz::EQPool::setnumEQs(size_t numEQs)
{ {
const std::lock_guard<std::mutex> eqLock { eqGuard }; const std::lock_guard<SpinMutex> eqLock { eqGuard };
swapAndPopAll(eqs, [](sfz::EQHolderPtr& eq) { return eq.use_count() == 1; }); swapAndPopAll(eqs, [](sfz::EQHolderPtr& eq) { return eq.use_count() == 1; });

3
src/sfizz/EQPool.h
View file

@ -2,6 +2,7 @@
#include "SfzFilter.h" #include "SfzFilter.h"
#include "EQDescription.h" #include "EQDescription.h"
#include "MidiState.h" #include "MidiState.h"
#include "utility/SpinMutex.h"
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
@ -115,7 +116,7 @@ public:
*/ */
void setSampleRate(float sampleRate); void setSampleRate(float sampleRate);
private: private:
std::mutex eqGuard; SpinMutex eqGuard;
float sampleRate { config::defaultSampleRate }; float sampleRate { config::defaultSampleRate };
const MidiState& midiState; const MidiState& midiState;
std::vector<EQHolderPtr> eqs; std::vector<EQHolderPtr> eqs;