From 9f8b27571233b9bc1f067e4535dcf0dcf37cb01b Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Sun, 29 Mar 2020 14:01:21 +0200 Subject: [PATCH] Don't dispatch on template for the MidiEventComparator --- src/sfizz/MidiState.cpp | 2 +- src/sfizz/SfzHelpers.h | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/sfizz/MidiState.cpp b/src/sfizz/MidiState.cpp index 5917d839..d08f7d10 100644 --- a/src/sfizz/MidiState.cpp +++ b/src/sfizz/MidiState.cpp @@ -104,7 +104,7 @@ int sfz::MidiState::getPitchBend() const noexcept void sfz::MidiState::ccEvent(int delay, int ccNumber, float ccValue) noexcept { ASSERT(ccValue >= 0.0 && ccValue <= 1.0); - const auto insertionPoint = absl::c_upper_bound(cc[ccNumber], delay, MidiEventComparator{}); + const auto insertionPoint = absl::c_upper_bound(cc[ccNumber], delay, MidiEventDelayComparator{}); cc[ccNumber].insert(insertionPoint, { delay, ccValue }); } diff --git a/src/sfizz/SfzHelpers.h b/src/sfizz/SfzHelpers.h index 5d552670..becc30d5 100644 --- a/src/sfizz/SfzHelpers.h +++ b/src/sfizz/SfzHelpers.h @@ -67,8 +67,7 @@ struct MidiEvent { float value; }; -template -struct MidiEventComparator { +struct MidiEventDelayComparator { bool operator()(const MidiEvent& event, const int& delay) { return (event.delay < delay); @@ -85,8 +84,7 @@ struct MidiEventComparator { } }; -template<> -struct MidiEventComparator { +struct MidiEventValueComparator { bool operator()(const MidiEvent& event, const float& value) { return (event.value < value);