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

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

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

revision 2175 by persson, Mon Apr 25 08:12:36 2011 UTC revision 2203 by persson, Sat Jul 9 16:44:27 2011 UTC
# Line 76  namespace LinuxSampler { namespace gig { Line 76  namespace LinuxSampler { namespace gig {
76          ri.Pan       = pRegion->Pan;          ri.Pan       = pRegion->Pan;
77          ri.SampleStartOffset = pRegion->SampleStartOffset;          ri.SampleStartOffset = pRegion->SampleStartOffset;
78    
         ri.EG1PreAttack        = pRegion->EG1PreAttack;  
         ri.EG1Attack           = pRegion->EG1Attack;  
         ri.EG1Hold             = pRegion->EG1Hold;  
         ri.EG1Decay1           = pRegion->EG1Decay1;  
         ri.EG1Decay2           = pRegion->EG1Decay2;  
         ri.EG1Sustain          = pRegion->EG1Sustain;  
         ri.EG1InfiniteSustain  = pRegion->EG1InfiniteSustain;  
         ri.EG1Release          = pRegion->EG1Release;  
   
79          ri.EG2PreAttack        = pRegion->EG2PreAttack;          ri.EG2PreAttack        = pRegion->EG2PreAttack;
80          ri.EG2Attack           = pRegion->EG2Attack;          ri.EG2Attack           = pRegion->EG2Attack;
81          ri.EG2Decay1           = pRegion->EG2Decay1;          ri.EG2Decay1           = pRegion->EG2Decay1;
# Line 452  namespace LinuxSampler { namespace gig { Line 443  namespace LinuxSampler { namespace gig {
443      }      }
444    
445      void Voice::TriggerEG1(const EGInfo& egInfo, double velrelease, double velocityAttenuation, uint sampleRate, uint8_t velocity) {      void Voice::TriggerEG1(const EGInfo& egInfo, double velrelease, double velocityAttenuation, uint sampleRate, uint8_t velocity) {
446          EG1.trigger(uint(RgnInfo.EG1PreAttack),          EG1.trigger(pRegion->EG1PreAttack,
447                      RgnInfo.EG1Attack * egInfo.Attack,                      pRegion->EG1Attack * egInfo.Attack,
448                      RgnInfo.EG1Hold,                      pRegion->EG1Hold,
449                      RgnInfo.EG1Decay1 * egInfo.Decay * velrelease,                      pRegion->EG1Decay1 * egInfo.Decay * velrelease,
450                      RgnInfo.EG1Decay2 * egInfo.Decay * velrelease,                      pRegion->EG1Decay2 * egInfo.Decay * velrelease,
451                      RgnInfo.EG1InfiniteSustain,                      pRegion->EG1InfiniteSustain,
452                      uint(RgnInfo.EG1Sustain),                      pRegion->EG1Sustain,
453                      RgnInfo.EG1Release * egInfo.Release * velrelease,                      pRegion->EG1Release * egInfo.Release * velrelease,
454                      velocityAttenuation,                      velocityAttenuation,
455                      sampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);                      sampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
456      }      }
Legend:
Removed from v.2175  
changed lines
  Added in v.2203
  ViewVC Help
Powered by ViewVC