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

Add distinct bound permissivity for low and high

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-03-19 14:40:01 +01:00
parent 4dc429a572
commit 73608d2091
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/sfizz/Defaults.h
View file

@ -51,12 +51,14 @@ enum OpcodeFlags : int {
kEnforceLowerBound = 1 << 1, kEnforceLowerBound = 1 << 1,
kEnforceUpperBound = 1 << 2, kEnforceUpperBound = 1 << 2,
kEnforceBounds = kEnforceLowerBound|kEnforceUpperBound, kEnforceBounds = kEnforceLowerBound|kEnforceUpperBound,
kPermissiveBounds = 1 << 3, kPermissiveLowerBound = 1 << 3,
kNormalizePercent = 1 << 4, kPermissiveUpperBound = 1 << 4,
kNormalizeMidi = 1 << 5, kPermissiveBounds = kPermissiveLowerBound|kPermissiveUpperBound,
kNormalizeBend = 1 << 6, kNormalizePercent = 1 << 5,
kWrapPhase = 1 << 7, kNormalizeMidi = 1 << 6,
kDb2Mag = 1 << 8, kNormalizeBend = 1 << 7,
kWrapPhase = 1 << 8,
kDb2Mag = 1 << 9,
}; };
template<class T> template<class T>

8
src/sfizz/Opcode.cpp
View file

@ -167,12 +167,12 @@ absl::optional<T> readInt_(OpcodeSpec<T> spec, absl::string_view v)
if (returnedValue > static_cast<int64_t>(spec.bounds.getEnd())) { if (returnedValue > static_cast<int64_t>(spec.bounds.getEnd())) {
if (spec.flags & kEnforceUpperBound) if (spec.flags & kEnforceUpperBound)
return spec.bounds.getEnd(); return spec.bounds.getEnd();
else if (!(spec.flags & kPermissiveBounds)) else if (!(spec.flags & kPermissiveUpperBound))
return absl::nullopt; return absl::nullopt;
} else if (returnedValue < static_cast<int64_t>(spec.bounds.getStart())) { } else if (returnedValue < static_cast<int64_t>(spec.bounds.getStart())) {
if (spec.flags & kEnforceLowerBound) if (spec.flags & kEnforceLowerBound)
return spec.bounds.getStart(); return spec.bounds.getStart();
else if (!(spec.flags & kPermissiveBounds)) else if (!(spec.flags & kPermissiveLowerBound))
return absl::nullopt; return absl::nullopt;
} }
@ -225,12 +225,12 @@ absl::optional<T> readFloat_(OpcodeSpec<T> spec, absl::string_view v)
else if (returnedValue > static_cast<int64_t>(spec.bounds.getEnd())) { else if (returnedValue > static_cast<int64_t>(spec.bounds.getEnd())) {
if (spec.flags & kEnforceUpperBound) if (spec.flags & kEnforceUpperBound)
return spec.bounds.getEnd(); return spec.bounds.getEnd();
else if (!(spec.flags & kPermissiveBounds)) else if (!(spec.flags & kPermissiveUpperBound))
return absl::nullopt; return absl::nullopt;
} else if (returnedValue < static_cast<int64_t>(spec.bounds.getStart())) { } else if (returnedValue < static_cast<int64_t>(spec.bounds.getStart())) {
if (spec.flags & kEnforceLowerBound) if (spec.flags & kEnforceLowerBound)
return spec.bounds.getStart(); return spec.bounds.getStart();
else if (!(spec.flags & kPermissiveBounds)) else if (!(spec.flags & kPermissiveLowerBound))
return absl::nullopt; return absl::nullopt;
} }