/[svn]/linuxsampler/trunk/src/engines/gig/EGADSR.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/gig/EGADSR.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 830 by persson, Sun Jan 15 18:23:11 2006 UTC revision 1147 by persson, Tue Apr 3 17:39:52 2007 UTC
# Line 209  namespace LinuxSampler { namespace gig { Line 209  namespace LinuxSampler { namespace gig {
209              Level = (float) PreAttack / 1000.0;              Level = (float) PreAttack / 1000.0;
210              Coeff = 0.896f * (1.0f - Level) / StepsLeft; // max level is a bit lower if attack != 0              Coeff = 0.896f * (1.0f - Level) / StepsLeft; // max level is a bit lower if attack != 0
211          } else { // attack is zero - immediately jump to the next stage          } else { // attack is zero - immediately jump to the next stage
212              Level = 1.0;              Level = 1.029f; // a bit higher than max sustain
213              if (HoldAttack) enterAttackHoldStage();              if (HoldAttack) enterAttackHoldStage();
214              else            enterDecay1Part1Stage(SampleRate);              else            enterDecay1Part1Stage(SampleRate);
215          }          }
# Line 234  namespace LinuxSampler { namespace gig { Line 234  namespace LinuxSampler { namespace gig {
234          // (where d is 1/SampleRate). The transition from f to g is          // (where d is 1/SampleRate). The transition from f to g is
235          // done when f(x) has reached Level2 = 25% of full volume.          // done when f(x) has reached Level2 = 25% of full volume.
236          StepsLeft = (int) (Decay1Time * SampleRate);          StepsLeft = (int) (Decay1Time * SampleRate);
237          if (StepsLeft && SustainLevel < 1.0 && Level > SustainLevel) {          if (StepsLeft && Level > SustainLevel) {
238              Stage        = stage_decay1_part1;              Stage        = stage_decay1_part1;
239              Segment      = segment_lin;              Segment      = segment_lin;
240              Decay1Slope  = 1.365 * (SustainLevel - 1.0) / StepsLeft;              Decay1Slope = (1.347f * SustainLevel - 1.361f) / StepsLeft;
241              Coeff        = Decay1Slope * invVolume;              Coeff        = Decay1Slope * invVolume;
242              Decay1Level2 = 0.25 * invVolume;              Decay1Level2 = 0.25 * invVolume;
243              if (Level < Decay1Level2) enterDecay1Part2Stage(SampleRate);              StepsLeft = int((RTMath::Max(Decay1Level2, SustainLevel) - Level) / Coeff);
244              else StepsLeft = int((RTMath::Max(Decay1Level2, SustainLevel) - Level) / Coeff);              if (StepsLeft <= 0) enterDecay1Part2Stage(SampleRate);
245          } else {          } else {
246              if (InfiniteSustain) enterSustainStage();              if (InfiniteSustain) enterSustainStage();
247              else                 enterDecay2Stage(SampleRate);              else                 enterDecay2Stage(SampleRate);
# Line 256  namespace LinuxSampler { namespace gig { Line 256  namespace LinuxSampler { namespace gig {
256              Coeff  = exp(Decay1Slope);              Coeff  = exp(Decay1Slope);
257              Offset = ExpOffset * (1 - Coeff);              Offset = ExpOffset * (1 - Coeff);
258              StepsLeft = int(log((SustainLevel - ExpOffset) / (Level - ExpOffset)) / Decay1Slope);              StepsLeft = int(log((SustainLevel - ExpOffset) / (Level - ExpOffset)) / Decay1Slope);
259          } else {              if (StepsLeft > 0) return;
             if (InfiniteSustain) enterSustainStage();  
             else                 enterDecay2Stage(SampleRate);  
260          }          }
261            if (InfiniteSustain) enterSustainStage();
262            else                 enterDecay2Stage(SampleRate);
263      }      }
264    
265      void EGADSR::enterDecay2Stage(const uint SampleRate) {      void EGADSR::enterDecay2Stage(const uint SampleRate) {
266          Stage      = stage_decay2;          Stage      = stage_decay2;
267          Segment    = segment_lin;          Segment    = segment_lin;
268          Decay2Time = RTMath::Max(Decay2Time, CONFIG_EG_MIN_RELEASE_TIME);          Decay2Time = RTMath::Max(Decay2Time, 0.05f);
269          StepsLeft  = (int) (Decay2Time * SampleRate);          StepsLeft  = (int) (Decay2Time * SampleRate);
270          Coeff      = (-1.03 / StepsLeft) * invVolume;          Coeff      = (-1.03 / StepsLeft) * invVolume;
271          //FIXME: do we really have to calculate 'StepsLeft' two times?          //FIXME: do we really have to calculate 'StepsLeft' two times?
272          StepsLeft  = int((CONFIG_EG_BOTTOM - Level) / Coeff);          StepsLeft  = int((CONFIG_EG_BOTTOM - Level) / Coeff);
273          if (StepsLeft == 0) enterEndStage();          if (StepsLeft <= 0) enterEndStage();
274      }      }
275    
276      void EGADSR::enterSustainStage() {      void EGADSR::enterSustainStage() {
# Line 286  namespace LinuxSampler { namespace gig { Line 286  namespace LinuxSampler { namespace gig {
286          Segment   = segment_lin;          Segment   = segment_lin;
287          StepsLeft = int((ReleaseLevel2 - Level) / ReleaseCoeff);          StepsLeft = int((ReleaseLevel2 - Level) / ReleaseCoeff);
288          Coeff     = ReleaseCoeff;          Coeff     = ReleaseCoeff;
289            if (StepsLeft <= 0) enterReleasePart2Stage();
290      }      }
291    
292      void EGADSR::enterReleasePart2Stage() {      void EGADSR::enterReleasePart2Stage() {
# Line 294  namespace LinuxSampler { namespace gig { Line 295  namespace LinuxSampler { namespace gig {
295          StepsLeft = int(log((CONFIG_EG_BOTTOM - ExpOffset) / (Level - ExpOffset)) / ReleaseSlope);          StepsLeft = int(log((CONFIG_EG_BOTTOM - ExpOffset) / (Level - ExpOffset)) / ReleaseSlope);
296          Coeff     = ReleaseCoeff2;          Coeff     = ReleaseCoeff2;
297          Offset    = ReleaseCoeff3;          Offset    = ReleaseCoeff3;
298            if (StepsLeft <= 0) enterFadeOutStage();
299      }      }
300    
301      void EGADSR::enterFadeOutStage() {      void EGADSR::enterFadeOutStage() {
# Line 301  namespace LinuxSampler { namespace gig { Line 303  namespace LinuxSampler { namespace gig {
303          Segment   = segment_lin;          Segment   = segment_lin;
304          StepsLeft = int(Level / (-FadeOutCoeff));          StepsLeft = int(Level / (-FadeOutCoeff));
305          Coeff     = FadeOutCoeff;          Coeff     = FadeOutCoeff;
306          if (StepsLeft == 0) enterEndStage();          if (StepsLeft <= 0) enterEndStage();
307      }      }
308    
309      void EGADSR::enterEndStage() {      void EGADSR::enterEndStage() {
Legend:
Removed from v.830  
changed lines
  Added in v.1147
  ViewVC Help
Powered by ViewVC