/[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 782 by persson, Fri Sep 2 20:11:55 2005 UTC revision 783 by persson, Sun Oct 2 14:40:52 2005 UTC
# Line 36  namespace LinuxSampler { namespace gig { Line 36  namespace LinuxSampler { namespace gig {
36          FadeOutCoeff = -1.0f / killSteps;          FadeOutCoeff = -1.0f / killSteps;
37      }      }
38    
39      void EGADSR::update(event_t Event, double SamplePos, float CurrentPitch, uint SampleRate) {      void EGADSR::update(event_t Event, uint SampleRate) {
40            if (Event == event_hold_end) HoldAttack = false;
41    
42          switch (Stage) {          switch (Stage) {
43              case stage_attack:              case stage_attack:
44                  if (StepsLeft) {                  switch (Event) {
45                      PostponedEvent = Event;                      case event_release:
                 } else {  
                     if (Event == event_release)  
                         enterReleasePart1Stage();  
                     else if (Event == event_cancel_release)  
                         enterSustainStage();  
                     else if (PostponedEvent == event_release)  
46                          enterReleasePart1Stage();                          enterReleasePart1Stage();
47                      else if (PostponedEvent == event_cancel_release)                          break;
48                        case event_cancel_release:
49                          enterSustainStage();                          enterSustainStage();
50                      else if (HoldAttack)                          break;
51                          enterAttackHoldStage(SamplePos, CurrentPitch);                      case event_stage_end:
52                      else                          if (HoldAttack)
53                          enterDecay1Part1Stage(SampleRate);                              enterAttackHoldStage();
54                            else
55                                enterDecay1Part1Stage(SampleRate);
56                            break;
57                  }                  }
58                  break;                  break;
59              case stage_attack_hold:              case stage_attack_hold:
60                  switch (Event) {                  switch (Event) {
61                      case event_stage_end:                      case event_stage_end: {// just refresh time
62                            const int intMax = (unsigned int) -1 >> 1;
63                            StepsLeft = intMax; // we use the highest possible value
64                            break;
65                        }
66                        case event_hold_end:
67                          enterDecay1Part1Stage(SampleRate);                          enterDecay1Part1Stage(SampleRate);
68                          break;                          break;
69                      case event_release:                      case event_release:
# Line 95  namespace LinuxSampler { namespace gig { Line 100  namespace LinuxSampler { namespace gig {
100                          break;                          break;
101                      case event_stage_end: // fall through                      case event_stage_end: // fall through
102                      case event_cancel_release:                      case event_cancel_release:
103                          if (InfiniteSustain)                          if (Level < CONFIG_EG_BOTTOM)
104                                enterEndStage();
105                            else if (InfiniteSustain)
106                              enterSustainStage();                              enterSustainStage();
107                          else                          else
108                              enterDecay2Stage(SampleRate);                              enterDecay2Stage(SampleRate);
# Line 110  namespace LinuxSampler { namespace gig { Line 117  namespace LinuxSampler { namespace gig {
117                      case event_release:                      case event_release:
118                          enterReleasePart1Stage();                          enterReleasePart1Stage();
119                          break;                          break;
120                        case event_hold_end:
121                            enterDecay1Part1Stage(SampleRate);
122                            break;
123                  }                  }
124                  break;                  break;
125              case stage_sustain:              case stage_sustain:
# Line 122  namespace LinuxSampler { namespace gig { Line 132  namespace LinuxSampler { namespace gig {
132                      case event_release:                      case event_release:
133                          enterReleasePart1Stage();                          enterReleasePart1Stage();
134                          break;                          break;
135                        case event_hold_end:
136                            enterDecay1Part1Stage(SampleRate);
137                            break;
138                  }                  }
139                  break;                  break;
140              case stage_release_part1:              case stage_release_part1:
# Line 160  namespace LinuxSampler { namespace gig { Line 173  namespace LinuxSampler { namespace gig {
173          }          }
174      }      }
175    
176      void EGADSR::trigger(uint PreAttack, float AttackTime, bool HoldAttack, long LoopStart, float Decay1Time, double Decay2Time, bool InfiniteSustain, uint SustainLevel, float ReleaseTime, float Volume, uint SampleRate) {      void EGADSR::trigger(uint PreAttack, float AttackTime, bool HoldAttack, float Decay1Time, double Decay2Time, bool InfiniteSustain, uint SustainLevel, float ReleaseTime, float Volume, uint SampleRate) {
177            this->SustainLevel     = SustainLevel / 1000.0;
         if (SustainLevel) {  
             this->SustainLevel = SustainLevel / 1000.0;  
         } else {  
             // sustain level 0 means that voice dies after decay 1  
             this->SustainLevel = CONFIG_EG_BOTTOM;  
             InfiniteSustain    = false;  
             Decay2Time         = CONFIG_EG_MIN_RELEASE_TIME;  
         }  
178          this->InfiniteSustain  = InfiniteSustain;          this->InfiniteSustain  = InfiniteSustain;
179          this->HoldAttack       = HoldAttack;          this->HoldAttack       = HoldAttack;
         this->LoopStart        = LoopStart;  
180    
181          this->Decay1Time = Decay1Time;          this->Decay1Time = Decay1Time;
182          this->Decay2Time = Decay2Time;          this->Decay2Time = Decay2Time;
# Line 190  namespace LinuxSampler { namespace gig { Line 194  namespace LinuxSampler { namespace gig {
194          ReleaseCoeff3 = ExpOffset * (1 - ReleaseCoeff2);          ReleaseCoeff3 = ExpOffset * (1 - ReleaseCoeff2);
195          ReleaseLevel2 = 0.25 * invVolume;          ReleaseLevel2 = 0.25 * invVolume;
196    
197          enterAttackStage(PreAttack, AttackTime, SampleRate, 0.0, 1.0f);          enterAttackStage(PreAttack, AttackTime, SampleRate);
198      }      }
199    
200      void EGADSR::enterAttackStage(const uint PreAttack, const float AttackTime, const uint SampleRate, const double SamplePos, const float CurrentPitch) {      void EGADSR::enterAttackStage(const uint PreAttack, const float AttackTime, const uint SampleRate) {
201          Stage   = stage_attack;          Stage   = stage_attack;
202          Segment = segment_lin;          Segment = segment_lin;
203          // Measurements of GSt output shows that the real attack time          // Measurements of GSt output shows that the real attack time
# Line 204  namespace LinuxSampler { namespace gig { Line 208  namespace LinuxSampler { namespace gig {
208              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
209          } else { // immediately jump to the next stage          } else { // immediately jump to the next stage
210              Level = 1.0;              Level = 1.0;
211              if (HoldAttack) enterAttackHoldStage(SamplePos, CurrentPitch);              if (HoldAttack) enterAttackHoldStage();
212              else            enterDecay1Part1Stage(SampleRate);              else            enterDecay1Part1Stage(SampleRate);
213          }          }
         PostponedEvent = (event_t) -1; // init with anything except release or cancel_release  
214      }      }
215    
216      void EGADSR::enterAttackHoldStage(const double SamplePos, const float CurrentPitch) {      void EGADSR::enterAttackHoldStage() {
217          Stage     = stage_attack_hold;          Stage     = stage_attack_hold;
218          Segment   = segment_lin;          Segment   = segment_lin;
219          Coeff     = 0.0f; // don't rise anymore          Coeff     = 0.0f; // don't rise anymore
220          StepsLeft = (int) (LoopStart - SamplePos / CurrentPitch); // FIXME: just an approximation, inaccuracy grows with higher audio fragment size, sufficient for usual fragment sizes though          const int intMax = (unsigned int) -1 >> 1;
221            StepsLeft = intMax; // we use the highest value possible (we refresh StepsLeft in update() in case)
222      }      }
223    
224      void EGADSR::enterDecay1Part1Stage(const uint SampleRate) {      void EGADSR::enterDecay1Part1Stage(const uint SampleRate) {
# Line 228  namespace LinuxSampler { namespace gig { Line 232  namespace LinuxSampler { namespace gig {
232          // (where d is 1/SampleRate). The transition from f to g is          // (where d is 1/SampleRate). The transition from f to g is
233          // done when f(x) has reached Level2 = 25% of full volume.          // done when f(x) has reached Level2 = 25% of full volume.
234          StepsLeft = (int) (Decay1Time * SampleRate);          StepsLeft = (int) (Decay1Time * SampleRate);
235          if (StepsLeft && SustainLevel < 1.0) {          if (StepsLeft && SustainLevel < 1.0 && Level > SustainLevel) {
236              Stage        = stage_decay1_part1;              Stage        = stage_decay1_part1;
237              Segment      = segment_lin;              Segment      = segment_lin;
238              Decay1Slope  = 1.365 * (SustainLevel - 1.0) / StepsLeft;              Decay1Slope  = 1.365 * (SustainLevel - 1.0) / StepsLeft;
Legend:
Removed from v.782  
changed lines
  Added in v.783
  ViewVC Help
Powered by ViewVC