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

WIP

Browse source
This commit is contained in:
Paul Ferrand 2021-02-03 21:57:17 +01:00
parent 9a1e3971a9
commit 49d749e354
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sfizz/Defaults.h
View file

@ -87,13 +87,13 @@ struct OpcodeSpec
if (!(flags & needsOperation)) if (!(flags & needsOperation))
return input; return input;
else if (flags & kNormalizePercent) else if (flags & kNormalizePercent)
return normalizePercents(input); return static_cast<U>(normalizePercents(input));
else if (flags & kNormalizeMidi) else if (flags & kNormalizeMidi)
return normalize7Bits(input); return static_cast<U>(normalize7Bits(input));
else if (flags & kNormalizeBend) else if (flags & kNormalizeBend)
return normalizeBend(input); return static_cast<U>(normalizeBend(input));
else if (flags & kDb2Mag) else if (flags & kDb2Mag)
return db2mag(input); return static_cast<U>(db2mag(input));
else // just in case else // just in case
return input; return input;
} }

8
src/sfizz/Region.h
View file

@ -383,10 +383,10 @@ struct Region {
// Performance parameters: amplifier // Performance parameters: amplifier
float volume { Default::volume }; // volume float volume { Default::volume }; // volume
float amplitude { normalizePercents(Default::amplitude) }; // amplitude float amplitude { Default::amplitude }; // amplitude
float pan { normalizePercents(Default::pan) }; // pan float pan { Default::pan }; // pan
float width { normalizePercents(Default::width) }; // width float width { Default::width }; // width
float position { normalizePercents(Default::position) }; // position float position { Default::position }; // position
uint8_t ampKeycenter { Default::key }; // amp_keycenter uint8_t ampKeycenter { Default::key }; // amp_keycenter
float ampKeytrack { Default::ampKeytrack }; // amp_keytrack float ampKeytrack { Default::ampKeytrack }; // amp_keytrack
float ampVeltrack { Default::ampVeltrack }; // amp_veltrack float ampVeltrack { Default::ampVeltrack }; // amp_veltrack

2
src/sfizz/Synth.cpp
View file

@ -360,7 +360,7 @@ void Synth::Impl::handleControlOpcodes(const std::vector<Opcode>& members)
} }
break; break;
case hash("label_cc&"): case hash("label_cc&"):
if (Default::ccNumberRange.containsWithEnd(member.parameters.back())) if (Default::ccNumber.bounds.containsWithEnd(member.parameters.back()))
setCCLabel(member.parameters.back(), std::string(member.value)); setCCLabel(member.parameters.back(), std::string(member.value));
break; break;
case hash("label_key&"): case hash("label_key&"):