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

Fixes to allow building on GCC 5.3.1

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-02-01 16:11:40 +01:00
parent 05608108fc
commit 9c321af37b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sfizz/Region.cpp
View file

@ -767,7 +767,7 @@ float sfz::Region::velocityCurve(uint8_t velocity) const noexcept
return gain; return gain;
} }
constexpr uint8_t offsetAndClamp(uint8_t key, int offset, sfz::Range<uint8_t> range) uint8_t offsetAndClamp(uint8_t key, int offset, sfz::Range<uint8_t> range)
{ {
const int offsetKey { key + offset }; const int offsetKey { key + offset };
if (offsetKey > std::numeric_limits<uint8_t>::max()) if (offsetKey > std::numeric_limits<uint8_t>::max())

2
src/sfizz/Synth.cpp
View file

@ -165,7 +165,7 @@ void sfz::Synth::handleControlOpcodes(const std::vector<Opcode>& members)
[[fallthrough]]; [[fallthrough]];
case hash("label_cc"): case hash("label_cc"):
if (member.parameter && Default::ccNumberRange.containsWithEnd(*member.parameter)) 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; break;
case hash("Default_path"): case hash("Default_path"):
[[fallthrough]]; [[fallthrough]];