From 9a49348274e3ceca30a4edcb87cfdec779773898 Mon Sep 17 00:00:00 2001 From: Paul Fd Date: Tue, 10 Mar 2020 13:35:07 +0100 Subject: [PATCH] Use a constexpr minmax in SfzHelpers --- src/sfizz/SfzHelpers.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sfizz/SfzHelpers.h b/src/sfizz/SfzHelpers.h index 4a69ba95..188574f4 100644 --- a/src/sfizz/SfzHelpers.h +++ b/src/sfizz/SfzHelpers.h @@ -11,6 +11,7 @@ #include #include #include "Config.h" +#include "MathHelpers.h" namespace sfz { @@ -85,7 +86,7 @@ template constexpr float normalizeCC(T ccValue) { static_assert(std::is_integral::value, "Requires an integral T"); - return static_cast(std::min(std::max(ccValue, static_cast(0)), static_cast(127))) / 127.0f; + return static_cast(min(max(ccValue, static_cast(0)), static_cast(127))) / 127.0f; } /** @@ -124,7 +125,7 @@ constexpr float normalizePercents(T percentValue) */ constexpr float normalizeBend(float bendValue) { - return std::min(std::max(bendValue, -8191.0f), 8191.0f) / 8191.0f; + return min(max(bendValue, -8191.0f), 8191.0f) / 8191.0f; } /**