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

Rebase and use the swap and pop helper

Browse source
This commit is contained in:
Paul Ferrand 2020-06-15 14:18:26 +02:00
parent 5ef921485b
commit 2195466055
3 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/sfizz/PolyphonyGroup.h
View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "Region.h" #include "Region.h"
#include "Voice.h" #include "Voice.h"
#include "SwapAndPop.h"
#include "absl/algorithm/container.h" #include "absl/algorithm/container.h"
namespace sfz namespace sfz
@ -20,15 +21,7 @@ public:
} }
void removeVoice(const Voice* voice) void removeVoice(const Voice* voice)
{ {
auto it = absl::c_find(voices, voice); swapAndPopFirst(voices, [voice](const Voice* v) { return v == voice; });
if (it == voices.end())
return;
auto last = voices.end() - 1;
if (it != last)
std::iter_swap(it, last);
voices.pop_back();
} }
const std::vector<Voice*>& getActiveVoices() const { return voices; } const std::vector<Voice*>& getActiveVoices() const { return voices; }
std::vector<Voice*>& getActiveVoices() { return voices; } std::vector<Voice*>& getActiveVoices() { return voices; }

12
src/sfizz/RegionSet.h
View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "Region.h" #include "Region.h"
#include "Voice.h" #include "Voice.h"
#include "SwapAndPop.h"
#include <vector> #include <vector>
namespace sfz namespace sfz
@ -31,16 +32,7 @@ public:
} }
void removeVoice(const Voice* voice) void removeVoice(const Voice* voice)
{ {
auto it = absl::c_find(voices, voice); swapAndPopFirst(voices, [voice](const Voice* v) { return v == voice; });
if (it == voices.end())
return;
auto last = voices.end() - 1;
if (it != last)
std::iter_swap(it, last);
voices.pop_back();
DBG("Active voices size " << voices.size());
} }
static void registerVoiceInHierarchy(const Region* region, Voice* voice) static void registerVoiceInHierarchy(const Region* region, Voice* voice)
{ {

1
src/sfizz/Synth.cpp
View file

@ -53,7 +53,6 @@ void sfz::Synth::onVoiceStateChanged(NumericId<Voice> id, Voice::State state)
(void)state; (void)state;
if (state == Voice::State::idle) { if (state == Voice::State::idle) {
auto voice = getVoiceById(id); auto voice = getVoiceById(id);
DBG("Removing voice " << id.number << " from hierarchies");
RegionSet::removeVoiceFromHierarchy(voice->getRegion(), voice); RegionSet::removeVoiceFromHierarchy(voice->getRegion(), voice);
polyphonyGroups[voice->getRegion()->group].removeVoice(voice); polyphonyGroups[voice->getRegion()->group].removeVoice(voice);
} }