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

Merge pull request #376 from jpcima/adsr-rate

Browse source 
Adjust the ADSR exponential rate
This commit is contained in:
JP Cimalando 2020-08-18 22:16:54 +02:00 • committed by GitHub
commit be7ff64a17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sfizz/ADSREnvelope.cpp
View file

@ -28,7 +28,7 @@ template<class Type>
Type ADSREnvelope<Type>::secondsToExpRate (Type timeInSeconds) const noexcept Type ADSREnvelope<Type>::secondsToExpRate (Type timeInSeconds) const noexcept
{ {
timeInSeconds = std::max<Type>(25e-3, timeInSeconds); timeInSeconds = std::max<Type>(25e-3, timeInSeconds);
return std::exp(-8.0 / (timeInSeconds * sampleRate)); return std::exp(-9.0 / (timeInSeconds * sampleRate));
}; };
template <class Type> template <class Type>
@ -96,7 +96,7 @@ Type ADSREnvelope<Type>::getNextValue() noexcept
return currentValue; return currentValue;
case State::Release: case State::Release:
currentValue *= releaseRate; currentValue *= releaseRate;
if (currentValue > config::virtuallyZero) if (currentValue > config::egReleaseThreshold)
return currentValue; return currentValue;
currentState = State::Done; currentState = State::Done;
@ -169,9 +169,9 @@ void ADSREnvelope<Type>::getBlock(absl::Span<Type> output) noexcept
sfz::fill(output.first(count), currentValue); sfz::fill(output.first(count), currentValue);
break; break;
case State::Release: case State::Release:
while (count < size && (currentValue *= releaseRate) > config::virtuallyZero) while (count < size && (currentValue *= releaseRate) > config::egReleaseThreshold)
output[count++] = currentValue; output[count++] = currentValue;
if (currentValue <= config::virtuallyZero) { if (currentValue <= config::egReleaseThreshold) {
currentValue = 0; currentValue = 0;
currentState = State::Done; currentState = State::Done;
} }

5
src/sfizz/Config.h
View file

@ -86,6 +86,11 @@ namespace config {
modulated filter. The lower, the more CPU resources are consumed. modulated filter. The lower, the more CPU resources are consumed.
*/ */
constexpr int filterControlInterval { 16 }; constexpr int filterControlInterval { 16 };
/**
Amplitude below which an exponential releasing envelope is considered as
finished.
*/
constexpr float egReleaseThreshold = 1e-4;
/** /**
Default metadata for MIDIName documents Default metadata for MIDIName documents
*/ */