--- linuxsampler/trunk/src/engines/gig/EGADSR.cpp 2005/11/02 19:26:15 797 +++ linuxsampler/trunk/src/engines/gig/EGADSR.cpp 2016/10/31 00:05:00 3034 @@ -3,7 +3,7 @@ * LinuxSampler - modular, streaming capable sampler * * * * Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck * - * Copyright (C) 2005 Christian Schoenebeck * + * Copyright (C) 2005 - 2016 Christian Schoenebeck * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -23,20 +23,13 @@ #include "EGADSR.h" -namespace LinuxSampler { namespace gig { - - EGADSR::EGADSR() { - enterEndStage(); - Level = 0.0; - CalculateFadeOutCoeff(CONFIG_EG_MIN_RELEASE_TIME, 44100.0); // even if the sample rate will be 192kHz it won't hurt at all - } +#include "../../common/global_private.h" - void EGADSR::CalculateFadeOutCoeff(float FadeOutTime, float SampleRate) { - const float killSteps = FadeOutTime * SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE; - FadeOutCoeff = -1.0f / killSteps; - } +namespace LinuxSampler { namespace gig { void EGADSR::update(event_t Event, uint SampleRate) { + if (atEnd(Event)) return; + if (Event == event_hold_end) HoldAttack = false; switch (Stage) { @@ -45,15 +38,13 @@ case event_release: enterReleasePart1Stage(); break; - case event_cancel_release: - enterSustainStage(); - break; case event_stage_end: if (HoldAttack) enterAttackHoldStage(); else enterDecay1Part1Stage(SampleRate); break; + default: ; // noop } break; case stage_attack_hold: @@ -69,12 +60,7 @@ case event_release: enterReleasePart1Stage(); break; - case event_cancel_release: - if (InfiniteSustain) - enterSustainStage(); - else - enterDecay1Part1Stage(SampleRate); - break; + default: ; // noop } break; case stage_decay1_part1: @@ -85,12 +71,7 @@ case event_release: enterReleasePart1Stage(); break; - case event_cancel_release: - if (InfiniteSustain) - enterSustainStage(); - else - enterDecay2Stage(SampleRate); - break; + default: ; // noop } break; case stage_decay1_part2: @@ -98,8 +79,7 @@ case event_release: enterReleasePart1Stage(); break; - case event_stage_end: // fall through - case event_cancel_release: + case event_stage_end: if (Level < CONFIG_EG_BOTTOM) enterEndStage(); else if (InfiniteSustain) @@ -107,6 +87,7 @@ else enterDecay2Stage(SampleRate); break; + default: ; // noop } break; case stage_decay2: @@ -120,6 +101,7 @@ case event_hold_end: enterDecay1Part1Stage(SampleRate); break; + default: ; // noop } break; case stage_sustain: @@ -135,6 +117,7 @@ case event_hold_end: enterDecay1Part1Stage(SampleRate); break; + default: ; // noop } break; case stage_release_part1: @@ -148,6 +131,7 @@ else enterDecay2Stage(SampleRate); break; + default: ; // noop } break; case stage_release_part2: @@ -161,15 +145,12 @@ else enterDecay2Stage(SampleRate); break; + default: ; // noop } break; case stage_fadeout: - switch (Event) { - case event_stage_end: - enterEndStage(); - break; - } - break; + case stage_end: + ; // noop } } @@ -194,6 +175,7 @@ ReleaseCoeff3 = ExpOffset * (1 - ReleaseCoeff2); ReleaseLevel2 = 0.25 * invVolume; + enterFirstStage(); enterAttackStage(PreAttack, AttackTime, SampleRate); } @@ -201,15 +183,15 @@ Stage = stage_attack; Segment = segment_lin; - if (AttackTime >= 0.0005f) { + if (AttackTime >= 1e-8) { // Measurements of GSt output shows that the real attack time // is about 65.5% of the value specified in the gig file. - // The minimum attack value used is 0.032. - StepsLeft = int(0.655f * RTMath::Max(AttackTime, 0.032f) * SampleRate); + // The minimum attack value used is 0.0316. + StepsLeft = int(0.655f * RTMath::Max(AttackTime, 0.0316f) * SampleRate); Level = (float) PreAttack / 1000.0; Coeff = 0.896f * (1.0f - Level) / StepsLeft; // max level is a bit lower if attack != 0 } else { // attack is zero - immediately jump to the next stage - Level = 1.0; + Level = 1.029f; // a bit higher than max sustain if (HoldAttack) enterAttackHoldStage(); else enterDecay1Part1Stage(SampleRate); } @@ -234,14 +216,14 @@ // (where d is 1/SampleRate). The transition from f to g is // done when f(x) has reached Level2 = 25% of full volume. StepsLeft = (int) (Decay1Time * SampleRate); - if (StepsLeft && SustainLevel < 1.0 && Level > SustainLevel) { + if (StepsLeft && Level > SustainLevel) { Stage = stage_decay1_part1; Segment = segment_lin; - Decay1Slope = 1.365 * (SustainLevel - 1.0) / StepsLeft; + Decay1Slope = (1.347f * SustainLevel - 1.361f) / StepsLeft; Coeff = Decay1Slope * invVolume; Decay1Level2 = 0.25 * invVolume; - if (Level < Decay1Level2) enterDecay1Part2Stage(SampleRate); - else StepsLeft = int((RTMath::Max(Decay1Level2, SustainLevel) - Level) / Coeff); + StepsLeft = int((RTMath::Max(Decay1Level2, SustainLevel) - Level) / Coeff); + if (StepsLeft <= 0) enterDecay1Part2Stage(SampleRate); } else { if (InfiniteSustain) enterSustainStage(); else enterDecay2Stage(SampleRate); @@ -256,21 +238,21 @@ Coeff = exp(Decay1Slope); Offset = ExpOffset * (1 - Coeff); StepsLeft = int(log((SustainLevel - ExpOffset) / (Level - ExpOffset)) / Decay1Slope); - } else { - if (InfiniteSustain) enterSustainStage(); - else enterDecay2Stage(SampleRate); + if (StepsLeft > 0) return; } + if (InfiniteSustain) enterSustainStage(); + else enterDecay2Stage(SampleRate); } void EGADSR::enterDecay2Stage(const uint SampleRate) { Stage = stage_decay2; Segment = segment_lin; - Decay2Time = RTMath::Max(Decay2Time, CONFIG_EG_MIN_RELEASE_TIME); + Decay2Time = RTMath::Max(Decay2Time, 0.05f); StepsLeft = (int) (Decay2Time * SampleRate); Coeff = (-1.03 / StepsLeft) * invVolume; //FIXME: do we really have to calculate 'StepsLeft' two times? StepsLeft = int((CONFIG_EG_BOTTOM - Level) / Coeff); - if (StepsLeft == 0) enterEndStage(); + if (StepsLeft <= 0) enterEndStage(); } void EGADSR::enterSustainStage() { @@ -286,6 +268,7 @@ Segment = segment_lin; StepsLeft = int((ReleaseLevel2 - Level) / ReleaseCoeff); Coeff = ReleaseCoeff; + if (StepsLeft <= 0) enterReleasePart2Stage(); } void EGADSR::enterReleasePart2Stage() { @@ -294,19 +277,7 @@ StepsLeft = int(log((CONFIG_EG_BOTTOM - ExpOffset) / (Level - ExpOffset)) / ReleaseSlope); Coeff = ReleaseCoeff2; Offset = ReleaseCoeff3; - } - - void EGADSR::enterFadeOutStage() { - Stage = stage_fadeout; - Segment = segment_lin; - StepsLeft = int(Level / (-FadeOutCoeff)); - Coeff = FadeOutCoeff; - if (StepsLeft == 0) enterEndStage(); - } - - void EGADSR::enterEndStage() { - Stage = stage_end; - Segment = segment_end; + if (StepsLeft <= 0) enterFadeOutStage(); } }} // namespace LinuxSampler::gig