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

Can't use auto in lambda params

Browse source
This commit is contained in:
Paul Fd 2020-03-10 14:19:32 +01:00
parent d70268e1d8
commit c919cc9c90
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/sfizz/Synth.cpp
View file

@ -260,7 +260,7 @@ void sfz::Synth::handleEffectOpcodes(const std::vector<Opcode>& members)
void addEndpointsToVelocityCurve(sfz::Region& region) void addEndpointsToVelocityCurve(sfz::Region& region)
{ {
if (region.velocityPoints.size() > 0) { if (region.velocityPoints.size() > 0) {
absl::c_sort(region.velocityPoints, [](auto& lhs, auto& rhs) { return lhs.first < rhs.first; }); absl::c_sort(region.velocityPoints, [](const std::pair<int, float>& lhs, const std::pair<int, float>& rhs) { return lhs.first < rhs.first; });
if (region.ampVeltrack > 0) { if (region.ampVeltrack > 0) {
if (region.velocityPoints.back().first != sfz::Default::velocityRange.getEnd()) if (region.velocityPoints.back().first != sfz::Default::velocityRange.getEnd())
region.velocityPoints.push_back(std::make_pair<int, float>(127, 1.0f)); region.velocityPoints.push_back(std::make_pair<int, float>(127, 1.0f));
@ -409,7 +409,7 @@ bool sfz::Synth::loadSfzFile(const fs::path& file)
sfz::Voice* sfz::Synth::findFreeVoice() noexcept sfz::Voice* sfz::Synth::findFreeVoice() noexcept
{ {
auto freeVoice = absl::c_find_if(voices, [](const auto& voice) { return voice->isFree(); }); auto freeVoice = absl::c_find_if(voices, [](const std::unique_ptr<Voice>& voice) { return voice->isFree(); });
if (freeVoice != voices.end()) if (freeVoice != voices.end())
return freeVoice->get(); return freeVoice->get();
@ -418,7 +418,7 @@ sfz::Voice* sfz::Synth::findFreeVoice() noexcept
for (auto& voice : voices) for (auto& voice : voices)
if (voice->canBeStolen()) if (voice->canBeStolen())
voiceViewArray.push_back(voice.get()); voiceViewArray.push_back(voice.get());
absl::c_sort(voiceViewArray, [](const auto& lhs, const auto& rhs) { return lhs->getSourcePosition() > rhs->getSourcePosition(); }); absl::c_sort(voiceViewArray, [](Voice* lhs, Voice* rhs) { return lhs->getSourcePosition() > rhs->getSourcePosition(); });
for (auto* voice : voiceViewArray) { for (auto* voice : voiceViewArray) {
if (voice->getMeanSquaredAverage() < config::voiceStealingThreshold) { if (voice->getMeanSquaredAverage() < config::voiceStealingThreshold) {