/[svn]/linuxsampler/trunk/src/engines/common/AbstractVoice.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/common/AbstractVoice.cpp

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

revision 2114 by persson, Tue Aug 10 12:05:19 2010 UTC revision 2115 by persson, Thu Aug 12 15:36:15 2010 UTC
# Line 535  namespace LinuxSampler { Line 535  namespace LinuxSampler {
535       */       */
536      void AbstractVoice::processTransitionEvents(RTList<Event>::Iterator& itEvent, uint End) {      void AbstractVoice::processTransitionEvents(RTList<Event>::Iterator& itEvent, uint End) {
537          for (; itEvent && itEvent->FragmentPos() <= End; ++itEvent) {          for (; itEvent && itEvent->FragmentPos() <= End; ++itEvent) {
538              if (Type != Voice::type_release_trigger) {              // some voice types ignore note off
539                if (!(Type & (Voice::type_one_shot | Voice::type_release_trigger | Voice::type_controller_triggered))) {
540                  if (itEvent->Type == Event::type_release) {                  if (itEvent->Type == Event::type_release) {
541                      EnterReleaseStage();                      EnterReleaseStage();
542                  } else if (itEvent->Type == Event::type_cancel_release) {                  } else if (itEvent->Type == Event::type_cancel_release) {
# Line 616  namespace LinuxSampler { Line 616  namespace LinuxSampler {
616          volume *= GetSampleAttenuation() * pEngineChannel->GlobalVolume * GLOBAL_VOLUME;          volume *= GetSampleAttenuation() * pEngineChannel->GlobalVolume * GLOBAL_VOLUME;
617    
618          // the volume of release triggered samples depends on note length          // the volume of release triggered samples depends on note length
619          if (Type == Voice::type_release_trigger) {          if (Type & Voice::type_release_trigger) {
620              float noteLength = float(GetEngine()->FrameTime + Delay -              float noteLength = float(GetEngine()->FrameTime + Delay -
621                  GetNoteOnTime(MIDIKey) ) / GetEngine()->SampleRate;                  GetNoteOnTime(MIDIKey) ) / GetEngine()->SampleRate;
622    

Legend:
Removed from v.2114  
changed lines
  Added in v.2115

  ViewVC Help
Powered by ViewVC