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

Clamp the values in range for velocity and

Browse source 
CC switched envelopes
This commit is contained in:
Paul Ferrand 2019-12-28 22:39:20 +01:00
parent 4a25e6a4b8
commit 88ce956dd3
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/sfizz/EGDescription.h
View file

@ -79,7 +79,7 @@ struct EGDescription
*/ */
float getAttack(const SfzCCArray &ccValues, uint8_t velocity) const noexcept float getAttack(const SfzCCArray &ccValues, uint8_t velocity) const noexcept
{ {
return ccSwitchedValue(ccValues, ccAttack, attack) + normalizeVelocity(velocity)*vel2attack; return Default::egTimeRange.clamp(ccSwitchedValue(ccValues, ccAttack, attack) + normalizeVelocity(velocity)*vel2attack);
} }
/** /**
* @brief Get the decay with possibly a CC modifier and a velocity modifier * @brief Get the decay with possibly a CC modifier and a velocity modifier
@ -90,7 +90,7 @@ struct EGDescription
*/ */
float getDecay(const SfzCCArray &ccValues, uint8_t velocity) const noexcept float getDecay(const SfzCCArray &ccValues, uint8_t velocity) const noexcept
{ {
return ccSwitchedValue(ccValues, ccDecay, decay) + normalizeVelocity(velocity)*vel2decay; return Default::egTimeRange.clamp(ccSwitchedValue(ccValues, ccDecay, decay) + normalizeVelocity(velocity)*vel2decay);
} }
/** /**
* @brief Get the delay with possibly a CC modifier and a velocity modifier * @brief Get the delay with possibly a CC modifier and a velocity modifier
@ -101,7 +101,7 @@ struct EGDescription
*/ */
float getDelay(const SfzCCArray &ccValues, uint8_t velocity) const noexcept float getDelay(const SfzCCArray &ccValues, uint8_t velocity) const noexcept
{ {
return ccSwitchedValue(ccValues, ccDelay, delay) + normalizeVelocity(velocity)*vel2delay; return Default::egTimeRange.clamp(ccSwitchedValue(ccValues, ccDelay, delay) + normalizeVelocity(velocity)*vel2delay);
} }
/** /**
* @brief Get the holding duration with possibly a CC modifier and a velocity modifier * @brief Get the holding duration with possibly a CC modifier and a velocity modifier
@ -112,7 +112,7 @@ struct EGDescription
*/ */
float getHold(const SfzCCArray &ccValues, uint8_t velocity) const noexcept float getHold(const SfzCCArray &ccValues, uint8_t velocity) const noexcept
{ {
return ccSwitchedValue(ccValues, ccHold, hold) + normalizeVelocity(velocity)*vel2hold; return Default::egTimeRange.clamp(ccSwitchedValue(ccValues, ccHold, hold) + normalizeVelocity(velocity)*vel2hold);
} }
/** /**
* @brief Get the release duration with possibly a CC modifier and a velocity modifier * @brief Get the release duration with possibly a CC modifier and a velocity modifier
@ -123,7 +123,7 @@ struct EGDescription
*/ */
float getRelease(const SfzCCArray &ccValues, uint8_t velocity) const noexcept float getRelease(const SfzCCArray &ccValues, uint8_t velocity) const noexcept
{ {
return ccSwitchedValue(ccValues, ccRelease, release) + normalizeVelocity(velocity)*vel2release; return Default::egTimeRange.clamp(ccSwitchedValue(ccValues, ccRelease, release) + normalizeVelocity(velocity)*vel2release);
} }
/** /**
* @brief Get the starting level with possibly a CC modifier and a velocity modifier * @brief Get the starting level with possibly a CC modifier and a velocity modifier
@ -134,7 +134,7 @@ struct EGDescription
*/ */
float getStart(const SfzCCArray &ccValues, uint8_t velocity [[maybe_unused]]) const noexcept float getStart(const SfzCCArray &ccValues, uint8_t velocity [[maybe_unused]]) const noexcept
{ {
return ccSwitchedValue(ccValues, ccStart, start); return Default::egPercentRange.clamp(ccSwitchedValue(ccValues, ccStart, start));
} }
/** /**
* @brief Get the sustain level with possibly a CC modifier and a velocity modifier * @brief Get the sustain level with possibly a CC modifier and a velocity modifier
@ -145,7 +145,7 @@ struct EGDescription
*/ */
float getSustain(const SfzCCArray &ccValues, uint8_t velocity) const noexcept float getSustain(const SfzCCArray &ccValues, uint8_t velocity) const noexcept
{ {
return ccSwitchedValue(ccValues, ccSustain, sustain) + normalizeVelocity(velocity)*vel2sustain; return Default::egPercentRange.clamp(ccSwitchedValue(ccValues, ccSustain, sustain) + normalizeVelocity(velocity)*vel2sustain);
} }
LEAK_DETECTOR(EGDescription); LEAK_DETECTOR(EGDescription);
}; };