/[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 1046 by persson, Sat Feb 10 12:00:55 2007 UTC revision 1424 by schoenebeck, Sun Oct 14 22:00:17 2007 UTC
# Line 3  Line 3 
3   *   LinuxSampler - modular, streaming capable sampler                     *   *   LinuxSampler - modular, streaming capable sampler                     *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
6   *   Copyright (C) 2005 Christian Schoenebeck                              *   *   Copyright (C) 2005 - 2007 Christian Schoenebeck                       *
7   *                                                                         *   *                                                                         *
8   *   This program is free software; you can redistribute it and/or modify  *   *   This program is free software; you can redistribute it and/or modify  *
9   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 23  Line 23 
23    
24  #include "EGADSR.h"  #include "EGADSR.h"
25    
26    #include "../../common/global_private.h"
27    
28  namespace LinuxSampler { namespace gig {  namespace LinuxSampler { namespace gig {
29    
30      EGADSR::EGADSR() {      EGADSR::EGADSR() {
# Line 240  namespace LinuxSampler { namespace gig { Line 242  namespace LinuxSampler { namespace gig {
242              Decay1Slope = (1.347f * SustainLevel - 1.361f) / StepsLeft;              Decay1Slope = (1.347f * SustainLevel - 1.361f) / StepsLeft;
243              Coeff        = Decay1Slope * invVolume;              Coeff        = Decay1Slope * invVolume;
244              Decay1Level2 = 0.25 * invVolume;              Decay1Level2 = 0.25 * invVolume;
245              if (Level < Decay1Level2) enterDecay1Part2Stage(SampleRate);              StepsLeft = int((RTMath::Max(Decay1Level2, SustainLevel) - Level) / Coeff);
246              else StepsLeft = int((RTMath::Max(Decay1Level2, SustainLevel) - Level) / Coeff);              if (StepsLeft <= 0) enterDecay1Part2Stage(SampleRate);
247          } else {          } else {
248              if (InfiniteSustain) enterSustainStage();              if (InfiniteSustain) enterSustainStage();
249              else                 enterDecay2Stage(SampleRate);              else                 enterDecay2Stage(SampleRate);
# Line 256  namespace LinuxSampler { namespace gig { Line 258  namespace LinuxSampler { namespace gig {
258              Coeff  = exp(Decay1Slope);              Coeff  = exp(Decay1Slope);
259              Offset = ExpOffset * (1 - Coeff);              Offset = ExpOffset * (1 - Coeff);
260              StepsLeft = int(log((SustainLevel - ExpOffset) / (Level - ExpOffset)) / Decay1Slope);              StepsLeft = int(log((SustainLevel - ExpOffset) / (Level - ExpOffset)) / Decay1Slope);
261          } else {              if (StepsLeft > 0) return;
             if (InfiniteSustain) enterSustainStage();  
             else                 enterDecay2Stage(SampleRate);  
262          }          }
263            if (InfiniteSustain) enterSustainStage();
264            else                 enterDecay2Stage(SampleRate);
265      }      }
266    
267      void EGADSR::enterDecay2Stage(const uint SampleRate) {      void EGADSR::enterDecay2Stage(const uint SampleRate) {
# Line 270  namespace LinuxSampler { namespace gig { Line 272  namespace LinuxSampler { namespace gig {
272          Coeff      = (-1.03 / StepsLeft) * invVolume;          Coeff      = (-1.03 / StepsLeft) * invVolume;
273          //FIXME: do we really have to calculate 'StepsLeft' two times?          //FIXME: do we really have to calculate 'StepsLeft' two times?
274          StepsLeft  = int((CONFIG_EG_BOTTOM - Level) / Coeff);          StepsLeft  = int((CONFIG_EG_BOTTOM - Level) / Coeff);
275          if (StepsLeft == 0) enterEndStage();          if (StepsLeft <= 0) enterEndStage();
276      }      }
277    
278      void EGADSR::enterSustainStage() {      void EGADSR::enterSustainStage() {
# Line 286  namespace LinuxSampler { namespace gig { Line 288  namespace LinuxSampler { namespace gig {
288          Segment   = segment_lin;          Segment   = segment_lin;
289          StepsLeft = int((ReleaseLevel2 - Level) / ReleaseCoeff);          StepsLeft = int((ReleaseLevel2 - Level) / ReleaseCoeff);
290          Coeff     = ReleaseCoeff;          Coeff     = ReleaseCoeff;
291          if (StepsLeft == 0) enterReleasePart2Stage();          if (StepsLeft <= 0) enterReleasePart2Stage();
292      }      }
293    
294      void EGADSR::enterReleasePart2Stage() {      void EGADSR::enterReleasePart2Stage() {
# Line 295  namespace LinuxSampler { namespace gig { Line 297  namespace LinuxSampler { namespace gig {
297          StepsLeft = int(log((CONFIG_EG_BOTTOM - ExpOffset) / (Level - ExpOffset)) / ReleaseSlope);          StepsLeft = int(log((CONFIG_EG_BOTTOM - ExpOffset) / (Level - ExpOffset)) / ReleaseSlope);
298          Coeff     = ReleaseCoeff2;          Coeff     = ReleaseCoeff2;
299          Offset    = ReleaseCoeff3;          Offset    = ReleaseCoeff3;
300          if (StepsLeft == 0) enterFadeOutStage();          if (StepsLeft <= 0) enterFadeOutStage();
301      }      }
302    
303      void EGADSR::enterFadeOutStage() {      void EGADSR::enterFadeOutStage() {
# Line 303  namespace LinuxSampler { namespace gig { Line 305  namespace LinuxSampler { namespace gig {
305          Segment   = segment_lin;          Segment   = segment_lin;
306          StepsLeft = int(Level / (-FadeOutCoeff));          StepsLeft = int(Level / (-FadeOutCoeff));
307          Coeff     = FadeOutCoeff;          Coeff     = FadeOutCoeff;
308          if (StepsLeft == 0) enterEndStage();          if (StepsLeft <= 0) enterEndStage();
309      }      }
310    
311      void EGADSR::enterEndStage() {      void EGADSR::enterEndStage() {
Legend:
Removed from v.1046  
changed lines
  Added in v.1424
  ViewVC Help
Powered by ViewVC