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

Sort and clean the velocity curve of regions upon construction

Browse source
This commit is contained in:
paulfd 2019-08-29 19:16:33 +02:00
parent 2964850f80
commit 1863437306
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sources/Synth.cpp
View file

@ -1,5 +1,6 @@
#include "Synth.h" #include "Synth.h"
#include "Helpers.h" #include "Helpers.h"
#include "absl/algorithm/container.h"
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <utility> #include <utility>
@ -124,6 +125,28 @@ void sfz::Synth::handleControlOpcodes(const std::vector<Opcode>& members)
} }
} }
void addEndpointsToVelocityCurve(sfz::Region& region)
{
if (region.velocityPoints.size() > 0)
{
absl::c_sort(region.velocityPoints, [](auto& lhs, auto& rhs) { return lhs.first < rhs.first; });
if (region.ampVeltrack > 0)
{
if (region.velocityPoints.back().first != sfz::Default::velocityRange.getEnd())
region.velocityPoints.push_back(std::make_pair<int, float>(127, 1.0f));
if (region.velocityPoints.front().first != sfz::Default::velocityRange.getStart())
region.velocityPoints.insert(region.velocityPoints.begin(), std::make_pair<int, float>(0, 0.0f));
}
else
{
if (region.velocityPoints.front().first != sfz::Default::velocityRange.getEnd())
region.velocityPoints.insert(region.velocityPoints.begin(), std::make_pair<int, float>(127, 0.0f));
if (region.velocityPoints.back().first != sfz::Default::velocityRange.getStart())
region.velocityPoints.push_back(std::make_pair<int, float>(0, 1.0f));
}
}
}
bool sfz::Synth::loadSfzFile(const std::filesystem::path& filename) bool sfz::Synth::loadSfzFile(const std::filesystem::path& filename)
{ {
clear(); clear();
@ -172,10 +195,7 @@ bool sfz::Synth::loadSfzFile(const std::filesystem::path& filename)
region->registerNoteOff(region->channelRange.getStart(), *defaultSwitch, 0, 1.0); region->registerNoteOff(region->channelRange.getStart(), *defaultSwitch, 0, 1.0);
} }
absl::c_sort(region->velocityPoints, [](const auto& lhs, const auto& rhs) { addEndpointsToVelocityCurve(*region);
return lhs.first < rhs.first;
});
region->registerPitchWheel(region->channelRange.getStart(), 0); region->registerPitchWheel(region->channelRange.getStart(), 0);
region->registerAftertouch(region->channelRange.getStart(), 0); region->registerAftertouch(region->channelRange.getStart(), 0);
region->registerTempo(2.0f); region->registerTempo(2.0f);