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

Correct the condition for the envelope to free-run

Browse source
This commit is contained in:
Paul Ferrand 2020-09-09 15:23:15 +02:00
parent afadb171a4
commit 1fcd3077ae
2 changed files with 44 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/sfizz/ADSREnvelope.cpp
View file

@ -54,10 +54,9 @@ void ADSREnvelope<Type>::reset(const EGDescription& desc, const Region& region,
sustainThreshold = this->sustain + config::virtuallyZero; sustainThreshold = this->sustain + config::virtuallyZero;
shouldRelease = false; shouldRelease = false;
freeRunning = ( freeRunning = (
(region.trigger == SfzTrigger::release) (this->sustain == 0.0f)
|| (this->sustain == 0.0f) || (region.loopMode == SfzLoopMode::one_shot && (region.isGenerator() || region.oscillator))
|| (region.trigger == SfzTrigger::release_key) );
|| (region.loopMode == SfzLoopMode::one_shot && (region.isGenerator() || region.oscillator)));
currentValue = this->start; currentValue = this->start;
currentState = State::Delay; currentState = State::Delay;
} }

44
tests/SynthT.cpp
View file

@ -687,16 +687,54 @@ TEST_CASE("[Synth] Sisters and off-by")
REQUIRE( sfz::SisterVoiceRing::countSisterVoices(synth.getVoiceView(0)) == 1 ); REQUIRE( sfz::SisterVoiceRing::countSisterVoices(synth.getVoiceView(0)) == 1 );
} }
TEST_CASE("[Synth] Release key") TEST_CASE("[Synth] Release (basic behavior with sample)")
{ {
sfz::Synth synth; sfz::Synth synth;
synth.loadSfzString(fs::current_path() / "tests/TestFiles/release.sfz", R"( synth.setSamplesPerBlock(4096);
sfz::AudioBuffer<float> buffer { 2, 4096 };
synth.loadSfzString(fs::current_path() / "tests/TestFiles/release_key_sample.sfz", R"(
<region> key=62 sample=*sine
<region> key=62 sample=closedhat.wav trigger=release_key
)");
synth.noteOn(0, 62, 85);
REQUIRE( numPlayingVoices(synth) == 1 );
REQUIRE( getPlayingVoices(synth).front()->getRegion()->sampleId.filename() == "*sine" );
synth.noteOff(0, 62, 85);
REQUIRE( numPlayingVoices(synth) == 1 );
REQUIRE( getPlayingVoices(synth).front()->getRegion()->sampleId.filename() == "closedhat.wav" );
synth.renderBlock(buffer);
REQUIRE( numPlayingVoices(synth) == 1 );
REQUIRE( getPlayingVoices(synth).front()->getRegion()->sampleId.filename() == "closedhat.wav" );
}
TEST_CASE("[Synth] Release key (basic behavior with sample)")
{
sfz::Synth synth;
synth.setSamplesPerBlock(4096);
sfz::AudioBuffer<float> buffer { 2, 4096 };
synth.loadSfzString(fs::current_path() / "tests/TestFiles/release_key_sample.sfz", R"(
<region> key=62 sample=closedhat.wav trigger=release_key
)");
synth.noteOn(0, 62, 85);
synth.noteOff(0, 62, 85);
REQUIRE( numPlayingVoices(synth) == 1 );
synth.renderBlock(buffer);
REQUIRE( numPlayingVoices(synth) == 1 );
REQUIRE( getPlayingVoices(synth).front()->getRegion()->sampleId.filename() == "closedhat.wav" );
}
TEST_CASE("[Synth] Release key (pedal)")
{
sfz::Synth synth;
synth.setSamplesPerBlock(4096);
sfz::AudioBuffer<float> buffer { 2, 4096 };
synth.loadSfzString(fs::current_path() / "tests/TestFiles/release_key_pedal.sfz", R"(
<region> key=62 sample=*sine trigger=release_key <region> key=62 sample=*sine trigger=release_key
)"); )");
synth.noteOn(0, 62, 85); synth.noteOn(0, 62, 85);
synth.cc(0, 64, 127); synth.cc(0, 64, 127);
synth.noteOff(0, 62, 85); synth.noteOff(0, 62, 85);
REQUIRE( synth.getNumActiveVoices(true) == 1 ); REQUIRE( numPlayingVoices(synth) == 1 );
} }
TEST_CASE("[Synth] Release") TEST_CASE("[Synth] Release")