diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp index d3c71232..2428f079 100644 --- a/src/sfizz/Region.cpp +++ b/src/sfizz/Region.cpp @@ -767,7 +767,7 @@ float sfz::Region::velocityCurve(uint8_t velocity) const noexcept return gain; } -constexpr uint8_t offsetAndClamp(uint8_t key, int offset, sfz::Range range) +uint8_t offsetAndClamp(uint8_t key, int offset, sfz::Range range) { const int offsetKey { key + offset }; if (offsetKey > std::numeric_limits::max()) diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp index 4a2ad7de..d9f88d15 100644 --- a/src/sfizz/Synth.cpp +++ b/src/sfizz/Synth.cpp @@ -165,7 +165,7 @@ void sfz::Synth::handleControlOpcodes(const std::vector& members) [[fallthrough]]; case hash("label_cc"): if (member.parameter && Default::ccNumberRange.containsWithEnd(*member.parameter)) - ccNames.emplace_back(*member.parameter, member.value); + ccNames.emplace_back(*member.parameter, std::string(member.value)); break; case hash("Default_path"): [[fallthrough]];