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

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

Parent Directory | Revision Log | View Patch Patch

-revision 285 by schoenebeck,
Thu Oct 14 21:31:26 2004 UTC
+revision 1895 by persson,
Sun May  3 12:15:40 2009 UTC
 Line 3
   *   LinuxSampler - modular, streaming capable sampler                     *
   *                                                                         *
   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
+  *   Copyright (C) 2005 - 2009 Christian Schoenebeck                       *
   *                                                                         *
   *   This program is free software; you can redistribute it and/or modify  *
   *   it under the terms of the GNU General Public License as published by  *
-Line 20
+Line 21
   *   MA  02111-1307  USA                                                   *
   ***************************************************************************/
- #include "EGADSR.h"
+ #include "../../common/Features.h"
- #include "Manipulator.h"
+ #include "Synthesizer.h"
+ #include "Profiler.h"
  #include "Voice.h"
  namespace LinuxSampler { namespace gig {
-     const float Voice::FILTER_CUTOFF_COEFF(CalculateFilterCutoffCoeff());
-     const int Voice::FILTER_UPDATE_MASK(CalculateFilterUpdateMask());
-     float Voice::CalculateFilterCutoffCoeff() {
-         return log(FILTER_CUTOFF_MIN / FILTER_CUTOFF_MAX);
-     }
-     int Voice::CalculateFilterUpdateMask() {
-         if (FILTER_UPDATE_PERIOD <= 0) return 0;
-         int power_of_two;
-         for (power_of_two = 0; 1<<power_of_two < FILTER_UPDATE_PERIOD; power_of_two++);
-         return (1 << power_of_two) - 1;
-     }
      Voice::Voice() {
          pEngine     = NULL;
          pDiskThread = NULL;
          PlaybackState = playback_state_end;
-         pEG1   = NULL;
+         pLFO1 = new LFOUnsigned(1.0f);  // amplitude EG (0..1 range)
-         pEG2   = NULL;
+         pLFO2 = new LFOUnsigned(1.0f);  // filter EG (0..1 range)
-         pEG3   = NULL;
+         pLFO3 = new LFOSigned(1200.0f); // pitch EG (-1200..+1200 range)
-         pVCAManipulator  = NULL;
-         pVCFCManipulator = NULL;
-         pVCOManipulator  = NULL;
-         pLFO1  = NULL;
-         pLFO2  = NULL;
-         pLFO3  = NULL;
          KeyGroup = 0;
+         SynthesisMode = 0; // set all mode bits to 0 first
+         // select synthesis implementation (asm core is not supported ATM)
+         #if 0 // CONFIG_ASM && ARCH_X86
+         SYNTHESIS_MODE_SET_IMPLEMENTATION(SynthesisMode, Features::supportsMMX() && Features::supportsSSE());
+         #else
+         SYNTHESIS_MODE_SET_IMPLEMENTATION(SynthesisMode, false);
+         #endif
+         SYNTHESIS_MODE_SET_PROFILING(SynthesisMode, Profiler::isEnabled());
+         finalSynthesisParameters.filterLeft.Reset();
+         finalSynthesisParameters.filterRight.Reset();
      }
      Voice::~Voice() {
-         if (pEG1)  delete pEG1;
-         if (pEG2)  delete pEG2;
-         if (pEG3)  delete pEG3;
          if (pLFO1) delete pLFO1;
          if (pLFO2) delete pLFO2;
          if (pLFO3) delete pLFO3;
-         if (pVCAManipulator)  delete pVCAManipulator;
-         if (pVCFCManipulator) delete pVCFCManipulator;
-         if (pVCOManipulator)  delete pVCOManipulator;
      }
      void Voice::SetEngine(Engine* pEngine) {
-         this->pEngine = pEngine;
+         this->pEngine     = pEngine;
-         // delete old objects
-         if (pEG1) delete pEG1;
-         if (pEG2) delete pEG2;
-         if (pEG3) delete pEG3;
-         if (pVCAManipulator)  delete pVCAManipulator;
-         if (pVCFCManipulator) delete pVCFCManipulator;
-         if (pVCOManipulator)  delete pVCOManipulator;
-         if (pLFO1) delete pLFO1;
-         if (pLFO2) delete pLFO2;
-         if (pLFO3) delete pLFO3;
-         // create new ones
-         pEG1   = new EGADSR(pEngine, Event::destination_vca);
-         pEG2   = new EGADSR(pEngine, Event::destination_vcfc);
-         pEG3   = new EGDecay(pEngine, Event::destination_vco);
-         pVCAManipulator  = new VCAManipulator(pEngine);
-         pVCFCManipulator = new VCFCManipulator(pEngine);
-         pVCOManipulator  = new VCOManipulator(pEngine);
-         pLFO1  = new LFO<gig::VCAManipulator>(0.0f, 1.0f, LFO<VCAManipulator>::propagation_top_down, pVCAManipulator, pEngine->pEventPool);
-         pLFO2  = new LFO<gig::VCFCManipulator>(0.0f, 1.0f, LFO<VCFCManipulator>::propagation_top_down, pVCFCManipulator, pEngine->pEventPool);
-         pLFO3  = new LFO<gig::VCOManipulator>(-1200.0f, 1200.0f, LFO<VCOManipulator>::propagation_middle_balanced, pVCOManipulator, pEngine->pEventPool); // +-1 octave (+-1200 cents) max.
          this->pDiskThread = pEngine->pDiskThread;
          dmsg(6,("Voice::SetEngine()\n"));
      }
-Line 103 
 namespace LinuxSampler { namespace gig {
+Line 66 
 namespace LinuxSampler { namespace gig {
       *  Initializes and triggers the voice, a disk stream will be launched if
       *  needed.
       *
-      *  @param itNoteOnEvent       - event that caused triggering of this voice
+      *  @param pEngineChannel - engine channel on which this voice was ordered
-      *  @param PitchBend           - MIDI detune factor (-8192 ... +8191)
+      *  @param itNoteOnEvent  - event that caused triggering of this voice
-      *  @param pInstrument         - points to the loaded instrument which provides sample wave(s) and articulation data
+      *  @param PitchBend      - MIDI detune factor (-8192 ... +8191)
-      *  @param iLayer              - layer number this voice refers to (only if this is a layered sound of course)
+      *  @param pDimRgn        - points to the dimension region which provides sample wave(s) and articulation data
-      *  @param ReleaseTriggerVoice - if this new voice is a release trigger voice (optional, default = false)
+      *  @param VoiceType      - type of this voice
-      *  @returns 0 on success, a value < 0 if something failed
+      *  @param iKeyGroup      - a value > 0 defines a key group in which this voice is member of
+      *  @returns 0 on success, a value < 0 if the voice wasn't triggered
+      *           (either due to an error or e.g. because no region is
+      *           defined for the given key)
       */
-     int Voice::Trigger(Pool<Event>::Iterator& itNoteOnEvent, int PitchBend, ::gig::Instrument* pInstrument, int iLayer, bool ReleaseTriggerVoice) {
+     int Voice::Trigger(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent, int PitchBend, ::gig::DimensionRegion* pDimRgn, type_t VoiceType, int iKeyGroup) {
-         if (!pInstrument) {
+         this->pEngineChannel = pEngineChannel;
-            dmsg(1,("voice::trigger: !pInstrument\n"));
+         this->pDimRgn        = pDimRgn;
-            exit(EXIT_FAILURE);
+         Orphan = false;
+         #if CONFIG_DEVMODE
+         if (itNoteOnEvent->FragmentPos() > pEngine->MaxSamplesPerCycle) { // just a sanity check for debugging
+             dmsg(1,("Voice::Trigger(): ERROR, TriggerDelay > Totalsamples\n"));
          }
+         #endif // CONFIG_DEVMODE
-         Type            = type_normal;
+         Type            = VoiceType;
          MIDIKey         = itNoteOnEvent->Param.Note.Key;
-         pRegion         = pInstrument->GetRegion(MIDIKey);
+         PlaybackState   = playback_state_init; // mark voice as triggered, but no audio rendered yet
-         PlaybackState   = playback_state_ram; // we always start playback from RAM cache and switch then to disk if needed
          Delay           = itNoteOnEvent->FragmentPos();
          itTriggerEvent  = itNoteOnEvent;
          itKillEvent     = Pool<Event>::Iterator();
-         itChildVoice    = Pool<Voice>::Iterator();
+         KeyGroup        = iKeyGroup;
+         pSample         = pDimRgn->pSample; // sample won't change until the voice is finished
-         if (!pRegion) {
-             std::cerr << "gig::Voice: No Region defined for MIDI key " << MIDIKey << std::endl << std::flush;
-             KillImmediately();
-             return -1;
-         }
-         KeyGroup = pRegion->KeyGroup;
+         // calculate volume
+         const double velocityAttenuation = pDimRgn->GetVelocityAttenuation(itNoteOnEvent->Param.Note.Velocity);
-         // get current dimension values to select the right dimension region
+         // For 16 bit samples, we downscale by 32768 to convert from
-         //FIXME: controller values for selecting the dimension region here are currently not sample accurate
+         // int16 value range to DSP value range (which is
-         uint DimValues[5] = {0,0,0,0,0};
+         // -1.0..1.0). For 24 bit, we downscale from int32.
-         for (int i = pRegion->Dimensions - 1; i >= 0; i--) {
+         float volume = velocityAttenuation / (pSample->BitDepth == 16 ? 32768.0f : 32768.0f * 65536.0f);
-             switch (pRegion->pDimensionDefinitions[i].dimension) {
-                 case ::gig::dimension_samplechannel:
+         volume *= pDimRgn->SampleAttenuation * pEngineChannel->GlobalVolume * GLOBAL_VOLUME;
-                     DimValues[i] = 0; //TODO: we currently ignore this dimension
-                     break;
+         // the volume of release triggered samples depends on note length
-                 case ::gig::dimension_layer:
+         if (Type == type_release_trigger) {
-                     DimValues[i] = iLayer;
+             float noteLength = float(pEngine->FrameTime + Delay -
-                     // if this is the 1st layer then spawn further voices for all the other layers
+                                      pEngineChannel->pMIDIKeyInfo[MIDIKey].NoteOnTime) / pEngine->SampleRate;
-                     if (iLayer == 0)
+             float attenuation = 1 - 0.01053 * (256 >> pDimRgn->ReleaseTriggerDecay) * noteLength;
-                         for (int iNewLayer = 1; iNewLayer < pRegion->pDimensionDefinitions[i].zones; iNewLayer++)
+             if (attenuation <= 0) return -1;
-                             itChildVoice = pEngine->LaunchVoice(itNoteOnEvent, iNewLayer, ReleaseTriggerVoice);
+             volume *= attenuation;
-                     break;
+         }
-                 case ::gig::dimension_velocity:
-                     DimValues[i] = itNoteOnEvent->Param.Note.Velocity;
+         // select channel mode (mono or stereo)
-                     break;
+         SYNTHESIS_MODE_SET_CHANNELS(SynthesisMode, pSample->Channels == 2);
-                 case ::gig::dimension_channelaftertouch:
+         // select bit depth (16 or 24)
-                     DimValues[i] = 0; //TODO: we currently ignore this dimension
+         SYNTHESIS_MODE_SET_BITDEPTH24(SynthesisMode, pSample->BitDepth == 24);
-                     break;
-                 case ::gig::dimension_releasetrigger:
-                     Type = (ReleaseTriggerVoice) ? type_release_trigger : (!iLayer) ? type_release_trigger_required : type_normal;
-                     DimValues[i] = (uint) ReleaseTriggerVoice;
-                     break;
-                 case ::gig::dimension_keyboard:
-                     DimValues[i] = (uint) itNoteOnEvent->Param.Note.Key;
-                     break;
-                 case ::gig::dimension_modwheel:
-                     DimValues[i] = pEngine->ControllerTable[1];
-                     break;
-                 case ::gig::dimension_breath:
-                     DimValues[i] = pEngine->ControllerTable[2];
-                     break;
-                 case ::gig::dimension_foot:
-                     DimValues[i] = pEngine->ControllerTable[4];
-                     break;
-                 case ::gig::dimension_portamentotime:
-                     DimValues[i] = pEngine->ControllerTable[5];
-                     break;
-                 case ::gig::dimension_effect1:
-                     DimValues[i] = pEngine->ControllerTable[12];
-                     break;
-                 case ::gig::dimension_effect2:
-                     DimValues[i] = pEngine->ControllerTable[13];
-                     break;
-                 case ::gig::dimension_genpurpose1:
-                     DimValues[i] = pEngine->ControllerTable[16];
-                     break;
-                 case ::gig::dimension_genpurpose2:
-                     DimValues[i] = pEngine->ControllerTable[17];
-                     break;
-                 case ::gig::dimension_genpurpose3:
-                     DimValues[i] = pEngine->ControllerTable[18];
-                     break;
-                 case ::gig::dimension_genpurpose4:
-                     DimValues[i] = pEngine->ControllerTable[19];
-                     break;
-                 case ::gig::dimension_sustainpedal:
-                     DimValues[i] = pEngine->ControllerTable[64];
-                     break;
-                 case ::gig::dimension_portamento:
-                     DimValues[i] = pEngine->ControllerTable[65];
-                     break;
-                 case ::gig::dimension_sostenutopedal:
-                     DimValues[i] = pEngine->ControllerTable[66];
-                     break;
-                 case ::gig::dimension_softpedal:
-                     DimValues[i] = pEngine->ControllerTable[67];
-                     break;
-                 case ::gig::dimension_genpurpose5:
-                     DimValues[i] = pEngine->ControllerTable[80];
-                     break;
-                 case ::gig::dimension_genpurpose6:
-                     DimValues[i] = pEngine->ControllerTable[81];
-                     break;
-                 case ::gig::dimension_genpurpose7:
-                     DimValues[i] = pEngine->ControllerTable[82];
-                     break;
-                 case ::gig::dimension_genpurpose8:
-                     DimValues[i] = pEngine->ControllerTable[83];
-                     break;
-                 case ::gig::dimension_effect1depth:
-                     DimValues[i] = pEngine->ControllerTable[91];
-                     break;
-                 case ::gig::dimension_effect2depth:
-                     DimValues[i] = pEngine->ControllerTable[92];
-                     break;
-                 case ::gig::dimension_effect3depth:
-                     DimValues[i] = pEngine->ControllerTable[93];
-                     break;
-                 case ::gig::dimension_effect4depth:
-                     DimValues[i] = pEngine->ControllerTable[94];
-                     break;
-                 case ::gig::dimension_effect5depth:
-                     DimValues[i] = pEngine->ControllerTable[95];
-                     break;
-                 case ::gig::dimension_none:
-                     std::cerr << "gig::Voice::Trigger() Error: dimension=none\n" << std::flush;
-                     break;
-                 default:
-                     std::cerr << "gig::Voice::Trigger() Error: Unknown dimension\n" << std::flush;
-             }
-         }
-         pDimRgn = pRegion->GetDimensionRegionByValue(DimValues[4],DimValues[3],DimValues[2],DimValues[1],DimValues[0]);
          // get starting crossfade volume level
+         float crossfadeVolume;
          switch (pDimRgn->AttenuationController.type) {
              case ::gig::attenuation_ctrl_t::type_channelaftertouch:
-                 CrossfadeVolume = 1.0f; //TODO: aftertouch not supported yet
+                 crossfadeVolume = Engine::CrossfadeCurve[CrossfadeAttenuation(pEngineChannel->ControllerTable[128])];
                  break;
              case ::gig::attenuation_ctrl_t::type_velocity:
-                 CrossfadeVolume = CrossfadeAttenuation(itNoteOnEvent->Param.Note.Velocity);
+                 crossfadeVolume = Engine::CrossfadeCurve[CrossfadeAttenuation(itNoteOnEvent->Param.Note.Velocity)];
                  break;
              case ::gig::attenuation_ctrl_t::type_controlchange: //FIXME: currently not sample accurate
-                 CrossfadeVolume = CrossfadeAttenuation(pEngine->ControllerTable[pDimRgn->AttenuationController.controller_number]);
+                 crossfadeVolume = Engine::CrossfadeCurve[CrossfadeAttenuation(pEngineChannel->ControllerTable[pDimRgn->AttenuationController.controller_number])];
                  break;
              case ::gig::attenuation_ctrl_t::type_none: // no crossfade defined
              default:
-                 CrossfadeVolume = 1.0f;
+                 crossfadeVolume = 1.0f;
          }
-         PanLeft  = 1.0f - float(RTMath::Max(pDimRgn->Pan, 0)) /  63.0f;
+         VolumeLeft  = volume * Engine::PanCurve[64 - pDimRgn->Pan];
-         PanRight = 1.0f - float(RTMath::Min(pDimRgn->Pan, 0)) / -64.0f;
+         VolumeRight = volume * Engine::PanCurve[64 + pDimRgn->Pan];
-         pSample = pDimRgn->pSample; // sample won't change until the voice is finished
+         float subfragmentRate = pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE;
+         CrossfadeSmoother.trigger(crossfadeVolume, subfragmentRate);
+         VolumeSmoother.trigger(pEngineChannel->MidiVolume, subfragmentRate);
+         PanLeftSmoother.trigger(pEngineChannel->GlobalPanLeft, subfragmentRate);
+         PanRightSmoother.trigger(pEngineChannel->GlobalPanRight, subfragmentRate);
-         Pos = pDimRgn->SampleStartOffset; // offset where we should start playback of sample (0 - 2000 sample points)
+         finalSynthesisParameters.dPos = pDimRgn->SampleStartOffset; // offset where we should start playback of sample (0 - 2000 sample points)
+         Pos = pDimRgn->SampleStartOffset;
          // Check if the sample needs disk streaming or is too short for that
          long cachedsamples = pSample->GetCache().Size / pSample->FrameSize;
          DiskVoice          = cachedsamples < pSample->SamplesTotal;
+         const DLS::sample_loop_t& loopinfo = pDimRgn->pSampleLoops[0];
          if (DiskVoice) { // voice to be streamed from disk
-             MaxRAMPos = cachedsamples - (pEngine->MaxSamplesPerCycle << MAX_PITCH) / pSample->Channels; //TODO: this calculation is too pessimistic and may better be moved to Render() method, so it calculates MaxRAMPos dependent to the current demand of sample points to be rendered (e.g. in case of JACK)
+             if (cachedsamples > (pEngine->MaxSamplesPerCycle << CONFIG_MAX_PITCH)) {
+                 MaxRAMPos = cachedsamples - (pEngine->MaxSamplesPerCycle << CONFIG_MAX_PITCH) / pSample->Channels; //TODO: this calculation is too pessimistic and may better be moved to Render() method, so it calculates MaxRAMPos dependent to the current demand of sample points to be rendered (e.g. in case of JACK)
+             } else {
+                 // The cache is too small to fit a max sample buffer.
+                 // Setting MaxRAMPos to 0 will probably cause a click
+                 // in the audio, but it's better than not handling
+                 // this case at all, which would have caused the
+                 // unsigned MaxRAMPos to be set to a negative number.
+                 MaxRAMPos = 0;
+             }
              // check if there's a loop defined which completely fits into the cached (RAM) part of the sample
-             if (pSample->Loops && pSample->LoopEnd <= MaxRAMPos) {
+             RAMLoop = (pDimRgn->SampleLoops && (loopinfo.LoopStart + loopinfo.LoopLength) <= MaxRAMPos);
-                 RAMLoop        = true;
-                 LoopCyclesLeft = pSample->LoopPlayCount;
-             }
-             else RAMLoop = false;
-             if (pDiskThread->OrderNewStream(&DiskStreamRef, pSample, MaxRAMPos, !RAMLoop) < 0) {
+             if (pDiskThread->OrderNewStream(&DiskStreamRef, pDimRgn, MaxRAMPos, !RAMLoop) < 0) {
                  dmsg(1,("Disk stream order failed!\n"));
                  KillImmediately();
                  return -1;
-Line 285 
 namespace LinuxSampler { namespace gig {
+Line 179 
 namespace LinuxSampler { namespace gig {
          }
          else { // RAM only voice
              MaxRAMPos = cachedsamples;
-             if (pSample->Loops) {
+             RAMLoop = (pDimRgn->SampleLoops != 0);
-                 RAMLoop        = true;
-                 LoopCyclesLeft = pSample->LoopPlayCount;
-             }
-             else RAMLoop = false;
              dmsg(4,("RAM only voice launched (Looping: %s)\n", (RAMLoop) ? "yes" : "no"));
          }
+         if (RAMLoop) {
+             loop.uiTotalCycles = pSample->LoopPlayCount;
+             loop.uiCyclesLeft  = pSample->LoopPlayCount;
+             loop.uiStart       = loopinfo.LoopStart;
+             loop.uiEnd         = loopinfo.LoopStart + loopinfo.LoopLength;
+             loop.uiSize        = loopinfo.LoopLength;
+         }
          // calculate initial pitch value
          {
-             double pitchbasecents = pDimRgn->FineTune * 10 + (int) pEngine->ScaleTuning[MIDIKey % 12];
+             double pitchbasecents = pEngineChannel->pInstrument->FineTune + pDimRgn->FineTune + pEngine->ScaleTuning[MIDIKey % 12];
-             if (pDimRgn->PitchTrack) pitchbasecents += (MIDIKey - (int) pDimRgn->UnityNote) * 100;
-             this->PitchBase = RTMath::CentsToFreqRatio(pitchbasecents) * (double(pSample->SamplesPerSecond) / double(pEngine->pAudioOutputDevice->SampleRate()));
-             this->PitchBend = RTMath::CentsToFreqRatio(((double) PitchBend / 8192.0) * 200.0); // pitchbend wheel +-2 semitones = 200 cents
-         }
+             // GSt behaviour: maximum transpose up is 40 semitones. If
+             // MIDI key is more than 40 semitones above unity note,
+             // the transpose is not done.
+             if (pDimRgn->PitchTrack && (MIDIKey - (int) pDimRgn->UnityNote) < 40) pitchbasecents += (MIDIKey - (int) pDimRgn->UnityNote) * 100;
-         Volume = pDimRgn->GetVelocityAttenuation(itNoteOnEvent->Param.Note.Velocity) / 32768.0f; // we downscale by 32768 to convert from int16 value range to DSP value range (which is -1.0..1.0)
+             this->PitchBase = RTMath::CentsToFreqRatioUnlimited(pitchbasecents) * (double(pSample->SamplesPerSecond) / double(pEngine->SampleRate));
+             this->PitchBend = RTMath::CentsToFreqRatio(PitchBend / 8192.0 * 100.0 * pEngineChannel->pInstrument->PitchbendRange);
+         }
+         // the length of the decay and release curves are dependent on the velocity
+         const double velrelease = 1 / pDimRgn->GetVelocityRelease(itNoteOnEvent->Param.Note.Velocity);
          // setup EG 1 (VCA EG)
          {
-Line 315 
 namespace LinuxSampler { namespace gig {
+Line 215 
 namespace LinuxSampler { namespace gig {
                      eg1controllervalue = 0;
                      break;
                  case ::gig::eg1_ctrl_t::type_channelaftertouch:
-                     eg1controllervalue = 0; // TODO: aftertouch not yet supported
+                     eg1controllervalue = pEngineChannel->ControllerTable[128];
                      break;
                  case ::gig::eg1_ctrl_t::type_velocity:
                      eg1controllervalue = itNoteOnEvent->Param.Note.Velocity;
                      break;
                  case ::gig::eg1_ctrl_t::type_controlchange: // MIDI control change controller
-                     eg1controllervalue = pEngine->ControllerTable[pDimRgn->EG1Controller.controller_number];
+                     eg1controllervalue = pEngineChannel->ControllerTable[pDimRgn->EG1Controller.controller_number];
                      break;
              }
              if (pDimRgn->EG1ControllerInvert) eg1controllervalue = 127 - eg1controllervalue;
-             // calculate influence of EG1 controller on EG1's parameters (TODO: needs to be fine tuned)
+             // calculate influence of EG1 controller on EG1's parameters
-             double eg1attack  = (pDimRgn->EG1ControllerAttackInfluence)  ? 0.0001 * (double) (1 << pDimRgn->EG1ControllerAttackInfluence)  * eg1controllervalue : 0.0;
+             // (eg1attack is different from the others)
-             double eg1decay   = (pDimRgn->EG1ControllerDecayInfluence)   ? 0.0001 * (double) (1 << pDimRgn->EG1ControllerDecayInfluence)   * eg1controllervalue : 0.0;
+             double eg1attack  = (pDimRgn->EG1ControllerAttackInfluence)  ?
-             double eg1release = (pDimRgn->EG1ControllerReleaseInfluence) ? 0.0001 * (double) (1 << pDimRgn->EG1ControllerReleaseInfluence) * eg1controllervalue : 0.0;
++ 0.031 * (double) (pDimRgn->EG1ControllerAttackInfluence == 1 ?
+: 1 << pDimRgn->EG1ControllerAttackInfluence) * eg1controllervalue : 1.0;
-             pEG1->Trigger(pDimRgn->EG1PreAttack,
+             double eg1decay   = (pDimRgn->EG1ControllerDecayInfluence)   ? 1 + 0.00775 * (double) (1 << pDimRgn->EG1ControllerDecayInfluence)   * eg1controllervalue : 1.0;
-                           pDimRgn->EG1Attack + eg1attack,
+             double eg1release = (pDimRgn->EG1ControllerReleaseInfluence) ? 1 + 0.00775 * (double) (1 << pDimRgn->EG1ControllerReleaseInfluence) * eg1controllervalue : 1.0;
-                           pDimRgn->EG1Hold,
-                           pSample->LoopStart,
+             EG1.trigger(pDimRgn->EG1PreAttack,
-                           pDimRgn->EG1Decay1 + eg1decay,
+                         pDimRgn->EG1Attack * eg1attack,
-                           pDimRgn->EG1Decay2 + eg1decay,
+                         pDimRgn->EG1Hold,
-                           pDimRgn->EG1InfiniteSustain,
+                         pDimRgn->EG1Decay1 * eg1decay * velrelease,
-                           pDimRgn->EG1Sustain,
+                         pDimRgn->EG1Decay2 * eg1decay * velrelease,
-                           pDimRgn->EG1Release + eg1release,
+                         pDimRgn->EG1InfiniteSustain,
-                           Delay);
+                         pDimRgn->EG1Sustain,
-         }
+                         pDimRgn->EG1Release * eg1release * velrelease,
+                         velocityAttenuation,
+                         pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
+         }
+ #ifdef CONFIG_INTERPOLATE_VOLUME
+         // setup initial volume in synthesis parameters
+ #ifdef CONFIG_PROCESS_MUTED_CHANNELS
+         if (pEngineChannel->GetMute()) {
+             finalSynthesisParameters.fFinalVolumeLeft  = 0;
+             finalSynthesisParameters.fFinalVolumeRight = 0;
+         }
+         else
+ #else
+         {
+             float finalVolume = pEngineChannel->MidiVolume * crossfadeVolume * EG1.getLevel();
+             finalSynthesisParameters.fFinalVolumeLeft  = finalVolume * VolumeLeft  * pEngineChannel->GlobalPanLeft;
+             finalSynthesisParameters.fFinalVolumeRight = finalVolume * VolumeRight * pEngineChannel->GlobalPanRight;
+         }
+ #endif
+ #endif
-     #if ENABLE_FILTER
          // setup EG 2 (VCF Cutoff EG)
          {
              // get current value of EG2 controller
-Line 354 
 namespace LinuxSampler { namespace gig {
+Line 273 
 namespace LinuxSampler { namespace gig {
                      eg2controllervalue = 0;
                      break;
                  case ::gig::eg2_ctrl_t::type_channelaftertouch:
-                     eg2controllervalue = 0; // TODO: aftertouch not yet supported
+                     eg2controllervalue = pEngineChannel->ControllerTable[128];
                      break;
                  case ::gig::eg2_ctrl_t::type_velocity:
                      eg2controllervalue = itNoteOnEvent->Param.Note.Velocity;
                      break;
                  case ::gig::eg2_ctrl_t::type_controlchange: // MIDI control change controller
-                     eg2controllervalue = pEngine->ControllerTable[pDimRgn->EG2Controller.controller_number];
+                     eg2controllervalue = pEngineChannel->ControllerTable[pDimRgn->EG2Controller.controller_number];
                      break;
              }
              if (pDimRgn->EG2ControllerInvert) eg2controllervalue = 127 - eg2controllervalue;
-             // calculate influence of EG2 controller on EG2's parameters (TODO: needs to be fine tuned)
+             // calculate influence of EG2 controller on EG2's parameters
-             double eg2attack  = (pDimRgn->EG2ControllerAttackInfluence)  ? 0.0001 * (double) (1 << pDimRgn->EG2ControllerAttackInfluence)  * eg2controllervalue : 0.0;
+             double eg2attack  = (pDimRgn->EG2ControllerAttackInfluence)  ? 1 + 0.00775 * (double) (1 << pDimRgn->EG2ControllerAttackInfluence)  * eg2controllervalue : 1.0;
-             double eg2decay   = (pDimRgn->EG2ControllerDecayInfluence)   ? 0.0001 * (double) (1 << pDimRgn->EG2ControllerDecayInfluence)   * eg2controllervalue : 0.0;
+             double eg2decay   = (pDimRgn->EG2ControllerDecayInfluence)   ? 1 + 0.00775 * (double) (1 << pDimRgn->EG2ControllerDecayInfluence)   * eg2controllervalue : 1.0;
-             double eg2release = (pDimRgn->EG2ControllerReleaseInfluence) ? 0.0001 * (double) (1 << pDimRgn->EG2ControllerReleaseInfluence) * eg2controllervalue : 0.0;
+             double eg2release = (pDimRgn->EG2ControllerReleaseInfluence) ? 1 + 0.00775 * (double) (1 << pDimRgn->EG2ControllerReleaseInfluence) * eg2controllervalue : 1.0;
-             pEG2->Trigger(pDimRgn->EG2PreAttack,
+             EG2.trigger(pDimRgn->EG2PreAttack,
-                           pDimRgn->EG2Attack + eg2attack,
+                         pDimRgn->EG2Attack * eg2attack,
-                           false,
+                         false,
-                           pSample->LoopStart,
+                         pDimRgn->EG2Decay1 * eg2decay * velrelease,
-                           pDimRgn->EG2Decay1 + eg2decay,
+                         pDimRgn->EG2Decay2 * eg2decay * velrelease,
-                           pDimRgn->EG2Decay2 + eg2decay,
+                         pDimRgn->EG2InfiniteSustain,
-                           pDimRgn->EG2InfiniteSustain,
+                         pDimRgn->EG2Sustain,
-                           pDimRgn->EG2Sustain,
+                         pDimRgn->EG2Release * eg2release * velrelease,
-                           pDimRgn->EG2Release + eg2release,
+                         velocityAttenuation,
-                           Delay);
+                         pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
          }
-     #endif // ENABLE_FILTER
          // setup EG 3 (VCO EG)
          {
-           double eg3depth = RTMath::CentsToFreqRatio(pDimRgn->EG3Depth);
+             // if portamento mode is on, we dedicate EG3 purely for portamento, otherwise if portamento is off we do as told by the patch
-           pEG3->Trigger(eg3depth, pDimRgn->EG3Attack, Delay);
+             bool  bPortamento = pEngineChannel->PortamentoMode && pEngineChannel->PortamentoPos >= 0.0f;
+             float eg3depth = (bPortamento)
+                                  ? RTMath::CentsToFreqRatio((pEngineChannel->PortamentoPos - (float) MIDIKey) * 100)
+                                  : RTMath::CentsToFreqRatio(pDimRgn->EG3Depth);
+             float eg3time = (bPortamento)
+                                 ? pEngineChannel->PortamentoTime
+                                 : pDimRgn->EG3Attack;
+             EG3.trigger(eg3depth, eg3time, pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
+             dmsg(5,("PortamentoPos=%f, depth=%f, time=%f\n", pEngineChannel->PortamentoPos, eg3depth, eg3time));
          }
-Line 398 
 namespace LinuxSampler { namespace gig {
+Line 324 
 namespace LinuxSampler { namespace gig {
                  case ::gig::lfo1_ctrl_internal:
                      lfo1_internal_depth  = pDimRgn->LFO1InternalDepth;
                      pLFO1->ExtController = 0; // no external controller
+                     bLFO1Enabled         = (lfo1_internal_depth > 0);
                      break;
                  case ::gig::lfo1_ctrl_modwheel:
                      lfo1_internal_depth  = 0;
                      pLFO1->ExtController = 1; // MIDI controller 1
+                     bLFO1Enabled         = (pDimRgn->LFO1ControlDepth > 0);
                      break;
                  case ::gig::lfo1_ctrl_breath:
                      lfo1_internal_depth  = 0;
                      pLFO1->ExtController = 2; // MIDI controller 2
+                     bLFO1Enabled         = (pDimRgn->LFO1ControlDepth > 0);
                      break;
                  case ::gig::lfo1_ctrl_internal_modwheel:
                      lfo1_internal_depth  = pDimRgn->LFO1InternalDepth;
                      pLFO1->ExtController = 1; // MIDI controller 1
+                     bLFO1Enabled         = (lfo1_internal_depth > 0 || pDimRgn->LFO1ControlDepth > 0);
                      break;
                  case ::gig::lfo1_ctrl_internal_breath:
                      lfo1_internal_depth  = pDimRgn->LFO1InternalDepth;
                      pLFO1->ExtController = 2; // MIDI controller 2
+                     bLFO1Enabled         = (lfo1_internal_depth > 0 || pDimRgn->LFO1ControlDepth > 0);
                      break;
                  default:
                      lfo1_internal_depth  = 0;
                      pLFO1->ExtController = 0; // no external controller
+                     bLFO1Enabled         = false;
+             }
+             if (bLFO1Enabled) {
+                 pLFO1->trigger(pDimRgn->LFO1Frequency,
+                                start_level_min,
+                                lfo1_internal_depth,
+                                pDimRgn->LFO1ControlDepth,
+                                pDimRgn->LFO1FlipPhase,
+                                pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
+                 pLFO1->update(pLFO1->ExtController ? pEngineChannel->ControllerTable[pLFO1->ExtController] : 0);
              }
-             pLFO1->Trigger(pDimRgn->LFO1Frequency,
-                           lfo1_internal_depth,
-                           pDimRgn->LFO1ControlDepth,
-                           pEngine->ControllerTable[pLFO1->ExtController],
-                           pDimRgn->LFO1FlipPhase,
-                           pEngine->SampleRate,
-                           Delay);
          }
-     #if ENABLE_FILTER
          // setup LFO 2 (VCF Cutoff LFO)
          {
              uint16_t lfo2_internal_depth;
-Line 436 
 namespace LinuxSampler { namespace gig {
+Line 370 
 namespace LinuxSampler { namespace gig {
                  case ::gig::lfo2_ctrl_internal:
                      lfo2_internal_depth  = pDimRgn->LFO2InternalDepth;
                      pLFO2->ExtController = 0; // no external controller
+                     bLFO2Enabled         = (lfo2_internal_depth > 0);
                      break;
                  case ::gig::lfo2_ctrl_modwheel:
                      lfo2_internal_depth  = 0;
                      pLFO2->ExtController = 1; // MIDI controller 1
+                     bLFO2Enabled         = (pDimRgn->LFO2ControlDepth > 0);
                      break;
                  case ::gig::lfo2_ctrl_foot:
                      lfo2_internal_depth  = 0;
                      pLFO2->ExtController = 4; // MIDI controller 4
+                     bLFO2Enabled         = (pDimRgn->LFO2ControlDepth > 0);
                      break;
                  case ::gig::lfo2_ctrl_internal_modwheel:
                      lfo2_internal_depth  = pDimRgn->LFO2InternalDepth;
                      pLFO2->ExtController = 1; // MIDI controller 1
+                     bLFO2Enabled         = (lfo2_internal_depth > 0 || pDimRgn->LFO2ControlDepth > 0);
                      break;
                  case ::gig::lfo2_ctrl_internal_foot:
                      lfo2_internal_depth  = pDimRgn->LFO2InternalDepth;
                      pLFO2->ExtController = 4; // MIDI controller 4
+                     bLFO2Enabled         = (lfo2_internal_depth > 0 || pDimRgn->LFO2ControlDepth > 0);
                      break;
                  default:
                      lfo2_internal_depth  = 0;
                      pLFO2->ExtController = 0; // no external controller
+                     bLFO2Enabled         = false;
+             }
+             if (bLFO2Enabled) {
+                 pLFO2->trigger(pDimRgn->LFO2Frequency,
+                                start_level_max,
+                                lfo2_internal_depth,
+                                pDimRgn->LFO2ControlDepth,
+                                pDimRgn->LFO2FlipPhase,
+                                pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
+                 pLFO2->update(pLFO2->ExtController ? pEngineChannel->ControllerTable[pLFO2->ExtController] : 0);
              }
-             pLFO2->Trigger(pDimRgn->LFO2Frequency,
-                           lfo2_internal_depth,
-                           pDimRgn->LFO2ControlDepth,
-                           pEngine->ControllerTable[pLFO2->ExtController],
-                           pDimRgn->LFO2FlipPhase,
-                           pEngine->SampleRate,
-                           Delay);
          }
-     #endif // ENABLE_FILTER
          // setup LFO 3 (VCO LFO)
          {
-Line 474 
 namespace LinuxSampler { namespace gig {
+Line 416 
 namespace LinuxSampler { namespace gig {
                  case ::gig::lfo3_ctrl_internal:
                      lfo3_internal_depth  = pDimRgn->LFO3InternalDepth;
                      pLFO3->ExtController = 0; // no external controller
+                     bLFO3Enabled         = (lfo3_internal_depth > 0);
                      break;
                  case ::gig::lfo3_ctrl_modwheel:
                      lfo3_internal_depth  = 0;
                      pLFO3->ExtController = 1; // MIDI controller 1
+                     bLFO3Enabled         = (pDimRgn->LFO3ControlDepth > 0);
                      break;
                  case ::gig::lfo3_ctrl_aftertouch:
                      lfo3_internal_depth  = 0;
-                     pLFO3->ExtController = 0; // TODO: aftertouch not implemented yet
+                     pLFO3->ExtController = 128;
+                     bLFO3Enabled         = true;
                      break;
                  case ::gig::lfo3_ctrl_internal_modwheel:
                      lfo3_internal_depth  = pDimRgn->LFO3InternalDepth;
                      pLFO3->ExtController = 1; // MIDI controller 1
+                     bLFO3Enabled         = (lfo3_internal_depth > 0 || pDimRgn->LFO3ControlDepth > 0);
                      break;
                  case ::gig::lfo3_ctrl_internal_aftertouch:
                      lfo3_internal_depth  = pDimRgn->LFO3InternalDepth;
-                     pLFO1->ExtController = 0; // TODO: aftertouch not implemented yet
+                     pLFO1->ExtController = 128;
+                     bLFO3Enabled         = (lfo3_internal_depth > 0 || pDimRgn->LFO3ControlDepth > 0);
                      break;
                  default:
                      lfo3_internal_depth  = 0;
                      pLFO3->ExtController = 0; // no external controller
+                     bLFO3Enabled         = false;
+             }
+             if (bLFO3Enabled) {
+                 pLFO3->trigger(pDimRgn->LFO3Frequency,
+                                start_level_mid,
+                                lfo3_internal_depth,
+                                pDimRgn->LFO3ControlDepth,
+                                false,
+                                pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
+                 pLFO3->update(pLFO3->ExtController ? pEngineChannel->ControllerTable[pLFO3->ExtController] : 0);
              }
-             pLFO3->Trigger(pDimRgn->LFO3Frequency,
-                           lfo3_internal_depth,
-                           pDimRgn->LFO3ControlDepth,
-                           pEngine->ControllerTable[pLFO3->ExtController],
-                           false,
-                           pEngine->SampleRate,
-                           Delay);
          }
-     #if ENABLE_FILTER
-         #if FORCE_FILTER_USAGE
+         #if CONFIG_FORCE_FILTER
-         FilterLeft.Enabled = FilterRight.Enabled = true;
+         const bool bUseFilter = true;
          #else // use filter only if instrument file told so
-         FilterLeft.Enabled = FilterRight.Enabled = pDimRgn->VCFEnabled;
+         const bool bUseFilter = pDimRgn->VCFEnabled;
-         #endif // FORCE_FILTER_USAGE
+         #endif // CONFIG_FORCE_FILTER
-         if (pDimRgn->VCFEnabled) {
+         SYNTHESIS_MODE_SET_FILTER(SynthesisMode, bUseFilter);
-             #ifdef OVERRIDE_FILTER_CUTOFF_CTRL
+         if (bUseFilter) {
-             VCFCutoffCtrl.controller = OVERRIDE_FILTER_CUTOFF_CTRL;
+             #ifdef CONFIG_OVERRIDE_CUTOFF_CTRL
+             VCFCutoffCtrl.controller = CONFIG_OVERRIDE_CUTOFF_CTRL;
              #else // use the one defined in the instrument file
              switch (pDimRgn->VCFCutoffController) {
                  case ::gig::vcf_cutoff_ctrl_modwheel:
-Line 542 
 namespace LinuxSampler { namespace gig {
+Line 493 
 namespace LinuxSampler { namespace gig {
                  case ::gig::vcf_cutoff_ctrl_genpurpose8:
                      VCFCutoffCtrl.controller = 83;
                      break;
-                 case ::gig::vcf_cutoff_ctrl_aftertouch: //TODO: not implemented yet
+                 case ::gig::vcf_cutoff_ctrl_aftertouch:
+                     VCFCutoffCtrl.controller = 128;
+                     break;
                  case ::gig::vcf_cutoff_ctrl_none:
                  default:
                      VCFCutoffCtrl.controller = 0;
                      break;
              }
-             #endif // OVERRIDE_FILTER_CUTOFF_CTRL
+             #endif // CONFIG_OVERRIDE_CUTOFF_CTRL
-             #ifdef OVERRIDE_FILTER_RES_CTRL
+             #ifdef CONFIG_OVERRIDE_RESONANCE_CTRL
-             VCFResonanceCtrl.controller = OVERRIDE_FILTER_RES_CTRL;
+             VCFResonanceCtrl.controller = CONFIG_OVERRIDE_RESONANCE_CTRL;
              #else // use the one defined in the instrument file
              switch (pDimRgn->VCFResonanceController) {
                  case ::gig::vcf_res_ctrl_genpurpose3:
-Line 570 
 namespace LinuxSampler { namespace gig {
+Line 523 
 namespace LinuxSampler { namespace gig {
                  default:
                      VCFResonanceCtrl.controller = 0;
              }
-             #endif // OVERRIDE_FILTER_RES_CTRL
+             #endif // CONFIG_OVERRIDE_RESONANCE_CTRL
-             #ifndef OVERRIDE_FILTER_TYPE
+             #ifndef CONFIG_OVERRIDE_FILTER_TYPE
-             FilterLeft.SetType(pDimRgn->VCFType);
+             finalSynthesisParameters.filterLeft.SetType(pDimRgn->VCFType);
-             FilterRight.SetType(pDimRgn->VCFType);
+             finalSynthesisParameters.filterRight.SetType(pDimRgn->VCFType);
              #else // override filter type
-             FilterLeft.SetType(OVERRIDE_FILTER_TYPE);
+             finalSynthesisParameters.filterLeft.SetType(CONFIG_OVERRIDE_FILTER_TYPE);
-             FilterRight.SetType(OVERRIDE_FILTER_TYPE);
+             finalSynthesisParameters.filterRight.SetType(CONFIG_OVERRIDE_FILTER_TYPE);
-             #endif // OVERRIDE_FILTER_TYPE
+             #endif // CONFIG_OVERRIDE_FILTER_TYPE
-             VCFCutoffCtrl.value    = pEngine->ControllerTable[VCFCutoffCtrl.controller];
+             VCFCutoffCtrl.value    = pEngineChannel->ControllerTable[VCFCutoffCtrl.controller];
-             VCFResonanceCtrl.value = pEngine->ControllerTable[VCFResonanceCtrl.controller];
+             VCFResonanceCtrl.value = pEngineChannel->ControllerTable[VCFResonanceCtrl.controller];
              // calculate cutoff frequency
-             float cutoff = (!VCFCutoffCtrl.controller)
+             float cutoff = pDimRgn->GetVelocityCutoff(itNoteOnEvent->Param.Note.Velocity);
-                 ? exp((float) (127 - itNoteOnEvent->Param.Note.Velocity) * (float) pDimRgn->VCFVelocityScale * 6.2E-5f * FILTER_CUTOFF_COEFF) * FILTER_CUTOFF_MAX
-                 : exp((float) VCFCutoffCtrl.value * 0.00787402f * FILTER_CUTOFF_COEFF) * FILTER_CUTOFF_MAX;
-             // calculate resonance
-             float resonance = (float) VCFResonanceCtrl.value * 0.00787f;   // 0.0..1.0
              if (pDimRgn->VCFKeyboardTracking) {
-                 resonance += (float) (itNoteOnEvent->Param.Note.Key - pDimRgn->VCFKeyboardTrackingBreakpoint) * 0.00787f;
+                 cutoff *= exp((itNoteOnEvent->Param.Note.Key - pDimRgn->VCFKeyboardTrackingBreakpoint) * 0.057762265f); // (ln(2) / 12)
              }
-             Constrain(resonance, 0.0, 1.0); // correct resonance if outside allowed value range (0.0..1.0)
+             CutoffBase = cutoff;
-             VCFCutoffCtrl.fvalue    = cutoff - FILTER_CUTOFF_MIN;
+             int cvalue;
-             VCFResonanceCtrl.fvalue = resonance;
+             if (VCFCutoffCtrl.controller) {
+                 cvalue = pEngineChannel->ControllerTable[VCFCutoffCtrl.controller];
+                 if (pDimRgn->VCFCutoffControllerInvert) cvalue = 127 - cvalue;
+                 // VCFVelocityScale in this case means Minimum cutoff
+                 if (cvalue < pDimRgn->VCFVelocityScale) cvalue = pDimRgn->VCFVelocityScale;
+             }
+             else {
+                 cvalue = pDimRgn->VCFCutoff;
+             }
+             cutoff *= float(cvalue);
+             if (cutoff > 127.0f) cutoff = 127.0f;
-             FilterLeft.SetParameters(cutoff,  resonance, pEngine->SampleRate);
+             // calculate resonance
-             FilterRight.SetParameters(cutoff, resonance, pEngine->SampleRate);
+             float resonance = (float) (VCFResonanceCtrl.controller ? VCFResonanceCtrl.value : pDimRgn->VCFResonance);
-             FilterUpdateCounter = -1;
+             VCFCutoffCtrl.fvalue    = cutoff;
+             VCFResonanceCtrl.fvalue = resonance;
          }
          else {
              VCFCutoffCtrl.controller    = 0;
              VCFResonanceCtrl.controller = 0;
          }
-     #endif // ENABLE_FILTER
          return 0; // success
      }
-Line 625 
 namespace LinuxSampler { namespace gig {
+Line 583 
 namespace LinuxSampler { namespace gig {
       */
      void Voice::Render(uint Samples) {
-         // Reset the synthesis parameter matrix
+         // select default values for synthesis mode bits
-         pEngine->ResetSynthesisParameters(Event::destination_vca, this->Volume * this->CrossfadeVolume * pEngine->GlobalVolume);
+         SYNTHESIS_MODE_SET_LOOP(SynthesisMode, false);
-         pEngine->ResetSynthesisParameters(Event::destination_vco, this->PitchBase);
-     #if ENABLE_FILTER
-         pEngine->ResetSynthesisParameters(Event::destination_vcfc, VCFCutoffCtrl.fvalue);
-         pEngine->ResetSynthesisParameters(Event::destination_vcfr, VCFResonanceCtrl.fvalue);
-     #endif // ENABLE_FILTER
-         // Apply events to the synthesis parameter matrix
-         ProcessEvents(Samples);
-         // Let all modulators write their parameter changes to the synthesis parameter matrix for the current audio fragment
-         pEG1->Process(Samples, pEngine->pMIDIKeyInfo[MIDIKey].pEvents, itTriggerEvent, this->Pos, this->PitchBase * this->PitchBend, itKillEvent);
-     #if ENABLE_FILTER
-         pEG2->Process(Samples, pEngine->pMIDIKeyInfo[MIDIKey].pEvents, itTriggerEvent, this->Pos, this->PitchBase * this->PitchBend);
-     #endif // ENABLE_FILTER
-         pEG3->Process(Samples);
-         pLFO1->Process(Samples);
-     #if ENABLE_FILTER
-         pLFO2->Process(Samples);
-     #endif // ENABLE_FILTER
-         pLFO3->Process(Samples);
-     #if ENABLE_FILTER
-         CalculateBiquadParameters(Samples); // calculate the final biquad filter parameters
-     #endif // ENABLE_FILTER
          switch (this->PlaybackState) {
+             case playback_state_init:
+                 this->PlaybackState = playback_state_ram; // we always start playback from RAM cache and switch then to disk if needed
+                 // no break - continue with playback_state_ram
              case playback_state_ram: {
-                     if (RAMLoop) InterpolateAndLoop(Samples, (sample_t*) pSample->GetCache().pStart, Delay);
+                     if (RAMLoop) SYNTHESIS_MODE_SET_LOOP(SynthesisMode, true); // enable looping
-                     else         InterpolateNoLoop(Samples, (sample_t*) pSample->GetCache().pStart, Delay);
+                     // render current fragment
+                     Synthesize(Samples, (sample_t*) pSample->GetCache().pStart, Delay);
                      if (DiskVoice) {
                          // check if we reached the allowed limit of the sample RAM cache
-                         if (Pos > MaxRAMPos) {
+                         if (finalSynthesisParameters.dPos > MaxRAMPos) {
-                             dmsg(5,("Voice: switching to disk playback (Pos=%f)\n", Pos));
+                             dmsg(5,("Voice: switching to disk playback (Pos=%f)\n", finalSynthesisParameters.dPos));
                              this->PlaybackState = playback_state_disk;
                          }
-                     }
+                     } else if (finalSynthesisParameters.dPos >= pSample->GetCache().Size / pSample->FrameSize) {
-                     else if (Pos >= pSample->GetCache().Size / pSample->FrameSize) {
                          this->PlaybackState = playback_state_end;
                      }
                  }
-Line 683 
 namespace LinuxSampler { namespace gig {
+Line 619 
 namespace LinuxSampler { namespace gig {
                              KillImmediately();
                              return;
                          }
-                         DiskStreamRef.pStream->IncrementReadPos(pSample->Channels * (RTMath::DoubleToInt(Pos) - MaxRAMPos));
+                         DiskStreamRef.pStream->IncrementReadPos(pSample->Channels * (int(finalSynthesisParameters.dPos) - MaxRAMPos));
-                         Pos -= RTMath::DoubleToInt(Pos);
+                         finalSynthesisParameters.dPos -= int(finalSynthesisParameters.dPos);
+                         RealSampleWordsLeftToRead = -1; // -1 means no silence has been added yet
                      }
+                     const int sampleWordsLeftToRead = DiskStreamRef.pStream->GetReadSpace();
                      // add silence sample at the end if we reached the end of the stream (for the interpolator)
-                     if (DiskStreamRef.State == Stream::state_end && DiskStreamRef.pStream->GetReadSpace() < (pEngine->MaxSamplesPerCycle << MAX_PITCH) / pSample->Channels) {
+                     if (DiskStreamRef.State == Stream::state_end) {
-                         DiskStreamRef.pStream->WriteSilence((pEngine->MaxSamplesPerCycle << MAX_PITCH) / pSample->Channels);
+                         const int maxSampleWordsPerCycle = (pEngine->MaxSamplesPerCycle << CONFIG_MAX_PITCH) * pSample->Channels + 6; // +6 for the interpolator algorithm
-                         this->PlaybackState = playback_state_end;
+                         if (sampleWordsLeftToRead <= maxSampleWordsPerCycle) {
+                             // remember how many sample words there are before any silence has been added
+                             if (RealSampleWordsLeftToRead < 0) RealSampleWordsLeftToRead = sampleWordsLeftToRead;
+                             DiskStreamRef.pStream->WriteSilence(maxSampleWordsPerCycle - sampleWordsLeftToRead);
+                         }
                      }
-                     sample_t* ptr = DiskStreamRef.pStream->GetReadPtr(); // get the current read_ptr within the ringbuffer where we read the samples from
+                     sample_t* ptr = (sample_t*)DiskStreamRef.pStream->GetReadPtr(); // get the current read_ptr within the ringbuffer where we read the samples from
-                     InterpolateNoLoop(Samples, ptr, Delay);
-                     DiskStreamRef.pStream->IncrementReadPos(RTMath::DoubleToInt(Pos) * pSample->Channels);
+                     // render current audio fragment
-                     Pos -= RTMath::DoubleToInt(Pos);
+                     Synthesize(Samples, ptr, Delay);
+                     const int iPos = (int) finalSynthesisParameters.dPos;
+                     const int readSampleWords = iPos * pSample->Channels; // amount of sample words actually been read
+                     DiskStreamRef.pStream->IncrementReadPos(readSampleWords);
+                     finalSynthesisParameters.dPos -= iPos; // just keep fractional part of playback position
+                     // change state of voice to 'end' if we really reached the end of the sample data
+                     if (RealSampleWordsLeftToRead >= 0) {
+                         RealSampleWordsLeftToRead -= readSampleWords;
+                         if (RealSampleWordsLeftToRead <= 0) this->PlaybackState = playback_state_end;
+                     }
                  }
                  break;
-Line 705 
 namespace LinuxSampler { namespace gig {
+Line 659 
 namespace LinuxSampler { namespace gig {
                  break;
          }
-         // Reset synthesis event lists (except VCO, as VCO events apply channel wide currently)
-         pEngine->pSynthesisEvents[Event::destination_vca]->clear();
-     #if ENABLE_FILTER
-         pEngine->pSynthesisEvents[Event::destination_vcfc]->clear();
-         pEngine->pSynthesisEvents[Event::destination_vcfr]->clear();
-     #endif // ENABLE_FILTER
          // Reset delay
          Delay = 0;
          itTriggerEvent = Pool<Event>::Iterator();
          // If sample stream or release stage finished, kill the voice
-         if (PlaybackState == playback_state_end || pEG1->GetStage() == EGADSR::stage_end) KillImmediately();
+         if (PlaybackState == playback_state_end || EG1.getSegmentType() == EGADSR::segment_end) KillImmediately();
      }
      /**
-Line 727 
 namespace LinuxSampler { namespace gig {
+Line 673 
 namespace LinuxSampler { namespace gig {
       *  suspended / not running.
       */
      void Voice::Reset() {
-         pLFO1->Reset();
+         finalSynthesisParameters.filterLeft.Reset();
-         pLFO2->Reset();
+         finalSynthesisParameters.filterRight.Reset();
-         pLFO3->Reset();
          DiskStreamRef.pStream = NULL;
          DiskStreamRef.hStream = 0;
          DiskStreamRef.State   = Stream::state_unused;
-Line 740 
 namespace LinuxSampler { namespace gig {
+Line 685 
 namespace LinuxSampler { namespace gig {
      }
      /**
-      *  Process the control change event lists of the engine for the current
+      * Process given list of MIDI note on, note off and sustain pedal events
-      *  audio fragment. Event values will be applied to the synthesis parameter
+      * for the given time.
-      *  matrix.
       *
-      *  @param Samples - number of samples to be rendered in this audio fragment cycle
+      * @param itEvent - iterator pointing to the next event to be processed
+      * @param End     - youngest time stamp where processing should be stopped
       */
-     void Voice::ProcessEvents(uint Samples) {
+     void Voice::processTransitionEvents(RTList<Event>::Iterator& itEvent, uint End) {
+         for (; itEvent && itEvent->FragmentPos() <= End; ++itEvent) {
+             if (itEvent->Type == Event::type_release) {
+                 EG1.update(EGADSR::event_release, pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
+                 EG2.update(EGADSR::event_release, pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
+             } else if (itEvent->Type == Event::type_cancel_release) {
+                 EG1.update(EGADSR::event_cancel_release, pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
+                 EG2.update(EGADSR::event_cancel_release, pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
+             }
+         }
+     }
-         // dispatch control change events
+     /**
-         RTList<Event>::Iterator itCCEvent = pEngine->pCCEvents->first();
+      * Process given list of MIDI control change and pitch bend events for
-         if (Delay) { // skip events that happened before this voice was triggered
+      * the given time.
-             while (itCCEvent && itCCEvent->FragmentPos() <= Delay) ++itCCEvent;
+      *
-         }
+      * @param itEvent - iterator pointing to the next event to be processed
-         while (itCCEvent) {
+      * @param End     - youngest time stamp where processing should be stopped
-             if (itCCEvent->Param.CC.Controller) { // if valid MIDI controller
+      */
-                 #if ENABLE_FILTER
+     void Voice::processCCEvents(RTList<Event>::Iterator& itEvent, uint End) {
-                 if (itCCEvent->Param.CC.Controller == VCFCutoffCtrl.controller) {
+         for (; itEvent && itEvent->FragmentPos() <= End; ++itEvent) {
-                     *pEngine->pSynthesisEvents[Event::destination_vcfc]->allocAppend() = *itCCEvent;
+             if (itEvent->Type == Event::type_control_change &&
-                 }
+                 itEvent->Param.CC.Controller) { // if (valid) MIDI control change event
-                 if (itCCEvent->Param.CC.Controller == VCFResonanceCtrl.controller) {
+                 if (itEvent->Param.CC.Controller == VCFCutoffCtrl.controller) {
-                     *pEngine->pSynthesisEvents[Event::destination_vcfr]->allocAppend() = *itCCEvent;
+                     processCutoffEvent(itEvent);
+                 }
+                 if (itEvent->Param.CC.Controller == VCFResonanceCtrl.controller) {
+                     processResonanceEvent(itEvent);
                  }
-                 #endif // ENABLE_FILTER
+                 if (itEvent->Param.CC.Controller == pLFO1->ExtController) {
-                 if (itCCEvent->Param.CC.Controller == pLFO1->ExtController) {
+                     pLFO1->update(itEvent->Param.CC.Value);
-                     pLFO1->SendEvent(itCCEvent);
                  }
-                 #if ENABLE_FILTER
+                 if (itEvent->Param.CC.Controller == pLFO2->ExtController) {
-                 if (itCCEvent->Param.CC.Controller == pLFO2->ExtController) {
+                     pLFO2->update(itEvent->Param.CC.Value);
-                     pLFO2->SendEvent(itCCEvent);
                  }
-                 #endif // ENABLE_FILTER
+                 if (itEvent->Param.CC.Controller == pLFO3->ExtController) {
-                 if (itCCEvent->Param.CC.Controller == pLFO3->ExtController) {
+                     pLFO3->update(itEvent->Param.CC.Value);
-                     pLFO3->SendEvent(itCCEvent);
                  }
                  if (pDimRgn->AttenuationController.type == ::gig::attenuation_ctrl_t::type_controlchange &&
-                     itCCEvent->Param.CC.Controller == pDimRgn->AttenuationController.controller_number) { // if crossfade event
+                     itEvent->Param.CC.Controller == pDimRgn->AttenuationController.controller_number) {
-                     *pEngine->pSynthesisEvents[Event::destination_vca]->allocAppend() = *itCCEvent;
+                     CrossfadeSmoother.update(Engine::CrossfadeCurve[CrossfadeAttenuation(itEvent->Param.CC.Value)]);
-                 }
-             }
-             ++itCCEvent;
-         }
-         // process pitch events
-         {
-             RTList<Event>* pVCOEventList = pEngine->pSynthesisEvents[Event::destination_vco];
-             RTList<Event>::Iterator itVCOEvent = pVCOEventList->first();
-             if (Delay) { // skip events that happened before this voice was triggered
-                 while (itVCOEvent && itVCOEvent->FragmentPos() <= Delay) ++itVCOEvent;
-             }
-             // apply old pitchbend value until first pitch event occurs
-             if (this->PitchBend != 1.0) {
-                 uint end = (itVCOEvent) ? itVCOEvent->FragmentPos() : Samples;
-                 for (uint i = Delay; i < end; i++) {
-                     pEngine->pSynthesisParameters[Event::destination_vco][i] *= this->PitchBend;
                  }
-             }
+                 if (itEvent->Param.CC.Controller == 7) { // volume
-             float pitch;
+                     VolumeSmoother.update(Engine::VolumeCurve[itEvent->Param.CC.Value]);
-             while (itVCOEvent) {
+                 } else if (itEvent->Param.CC.Controller == 10) { // panpot
-                 RTList<Event>::Iterator itNextVCOEvent = itVCOEvent;
+                     PanLeftSmoother.update(Engine::PanCurve[128 - itEvent->Param.CC.Value]);
-                 ++itNextVCOEvent;
+                     PanRightSmoother.update(Engine::PanCurve[itEvent->Param.CC.Value]);
-                 // calculate the influence length of this event (in sample points)
-                 uint end = (itNextVCOEvent) ? itNextVCOEvent->FragmentPos() : Samples;
-                 pitch = RTMath::CentsToFreqRatio(((double) itVCOEvent->Param.Pitch.Pitch / 8192.0) * 200.0); // +-two semitones = +-200 cents
-                 // apply pitch value to the pitch parameter sequence
-                 for (uint i = itVCOEvent->FragmentPos(); i < end; i++) {
-                     pEngine->pSynthesisParameters[Event::destination_vco][i] *= pitch;
                  }
+             } else if (itEvent->Type == Event::type_pitchbend) { // if pitch bend event
-                 itVCOEvent = itNextVCOEvent;
+                 processPitchEvent(itEvent);
              }
-             if (!pVCOEventList->isEmpty()) this->PitchBend = pitch;
          }
+     }
-         // process volume / attenuation events (TODO: we only handle and _expect_ crossfade events here ATM !)
+     void Voice::processPitchEvent(RTList<Event>::Iterator& itEvent) {
-         {
+         PitchBend = RTMath::CentsToFreqRatio(itEvent->Param.Pitch.Pitch / 8192.0 * 100.0 * pEngineChannel->pInstrument->PitchbendRange);
-             RTList<Event>* pVCAEventList = pEngine->pSynthesisEvents[Event::destination_vca];
+     }
-             RTList<Event>::Iterator itVCAEvent = pVCAEventList->first();
-             if (Delay) { // skip events that happened before this voice was triggered
-                 while (itVCAEvent && itVCAEvent->FragmentPos() <= Delay) ++itVCAEvent;
-             }
-             float crossfadevolume;
-             while (itVCAEvent) {
-                 RTList<Event>::Iterator itNextVCAEvent = itVCAEvent;
-                 ++itNextVCAEvent;
-                 // calculate the influence length of this event (in sample points)
-                 uint end = (itNextVCAEvent) ? itNextVCAEvent->FragmentPos() : Samples;
-                 crossfadevolume = CrossfadeAttenuation(itVCAEvent->Param.CC.Value);
-                 float effective_volume = crossfadevolume * this->Volume * pEngine->GlobalVolume;
-                 // apply volume value to the volume parameter sequence
-                 for (uint i = itVCAEvent->FragmentPos(); i < end; i++) {
-                     pEngine->pSynthesisParameters[Event::destination_vca][i] = effective_volume;
-                 }
-                 itVCAEvent = itNextVCAEvent;
-             }
-             if (!pVCAEventList->isEmpty()) this->CrossfadeVolume = crossfadevolume;
-         }
-     #if ENABLE_FILTER
-         // process filter cutoff events
-         {
-             RTList<Event>* pCutoffEventList = pEngine->pSynthesisEvents[Event::destination_vcfc];
-             RTList<Event>::Iterator itCutoffEvent = pCutoffEventList->first();
-             if (Delay) { // skip events that happened before this voice was triggered
-                 while (itCutoffEvent && itCutoffEvent->FragmentPos() <= Delay) ++itCutoffEvent;
-             }
-             float cutoff;
-             while (itCutoffEvent) {
-                 RTList<Event>::Iterator itNextCutoffEvent = itCutoffEvent;
-                 ++itNextCutoffEvent;
-                 // calculate the influence length of this event (in sample points)
-                 uint end = (itNextCutoffEvent) ? itNextCutoffEvent->FragmentPos() : Samples;
-                 cutoff = exp((float) itCutoffEvent->Param.CC.Value * 0.00787402f * FILTER_CUTOFF_COEFF) * FILTER_CUTOFF_MAX - FILTER_CUTOFF_MIN;
-                 // apply cutoff frequency to the cutoff parameter sequence
-                 for (uint i = itCutoffEvent->FragmentPos(); i < end; i++) {
-                     pEngine->pSynthesisParameters[Event::destination_vcfc][i] = cutoff;
-                 }
-                 itCutoffEvent = itNextCutoffEvent;
-             }
-             if (!pCutoffEventList->isEmpty()) VCFCutoffCtrl.fvalue = cutoff; // needed for initialization of parameter matrix next time
-         }
-         // process filter resonance events
+     void Voice::processCutoffEvent(RTList<Event>::Iterator& itEvent) {
-         {
+         int ccvalue = itEvent->Param.CC.Value;
-             RTList<Event>* pResonanceEventList = pEngine->pSynthesisEvents[Event::destination_vcfr];
+         if (VCFCutoffCtrl.value == ccvalue) return;
-             RTList<Event>::Iterator itResonanceEvent = pResonanceEventList->first();
+         VCFCutoffCtrl.value == ccvalue;
-             if (Delay) { // skip events that happened before this voice was triggered
+         if (pDimRgn->VCFCutoffControllerInvert)  ccvalue = 127 - ccvalue;
-                 while (itResonanceEvent && itResonanceEvent->FragmentPos() <= Delay) ++itResonanceEvent;
+         if (ccvalue < pDimRgn->VCFVelocityScale) ccvalue = pDimRgn->VCFVelocityScale;
-             }
+         float cutoff = CutoffBase * float(ccvalue);
-             while (itResonanceEvent) {
+         if (cutoff > 127.0f) cutoff = 127.0f;
-                 RTList<Event>::Iterator itNextResonanceEvent = itResonanceEvent;
-                 ++itNextResonanceEvent;
-                 // calculate the influence length of this event (in sample points)
-                 uint end = (itNextResonanceEvent) ? itNextResonanceEvent->FragmentPos() : Samples;
-                 // convert absolute controller value to differential
-                 int ctrldelta = itResonanceEvent->Param.CC.Value - VCFResonanceCtrl.value;
-                 VCFResonanceCtrl.value = itResonanceEvent->Param.CC.Value;
-                 float resonancedelta = (float) ctrldelta * 0.00787f; // 0.0..1.0
-                 // apply cutoff frequency to the cutoff parameter sequence
-                 for (uint i = itResonanceEvent->FragmentPos(); i < end; i++) {
-                     pEngine->pSynthesisParameters[Event::destination_vcfr][i] += resonancedelta;
-                 }
-                 itResonanceEvent = itNextResonanceEvent;
+         VCFCutoffCtrl.fvalue = cutoff; // needed for initialization of fFinalCutoff next time
-             }
+         fFinalCutoff = cutoff;
-             if (!pResonanceEventList->isEmpty()) VCFResonanceCtrl.fvalue = pResonanceEventList->last()->Param.CC.Value * 0.00787f; // needed for initialization of parameter matrix next time
-         }
-     #endif // ENABLE_FILTER
      }
-     #if ENABLE_FILTER
+     void Voice::processResonanceEvent(RTList<Event>::Iterator& itEvent) {
-     /**
+         // convert absolute controller value to differential
-      * Calculate all necessary, final biquad filter parameters.
+         const int ctrldelta = itEvent->Param.CC.Value - VCFResonanceCtrl.value;
-      *
+         VCFResonanceCtrl.value = itEvent->Param.CC.Value;
-      * @param Samples - number of samples to be rendered in this audio fragment cycle
+         const float resonancedelta = (float) ctrldelta;
-      */
+         fFinalResonance += resonancedelta;
-     void Voice::CalculateBiquadParameters(uint Samples) {
+         // needed for initialization of parameter
-         if (!FilterLeft.Enabled) return;
+         VCFResonanceCtrl.fvalue = itEvent->Param.CC.Value;
-         biquad_param_t bqbase;
-         biquad_param_t bqmain;
-         float prev_cutoff = pEngine->pSynthesisParameters[Event::destination_vcfc][0];
-         float prev_res    = pEngine->pSynthesisParameters[Event::destination_vcfr][0];
-         FilterLeft.SetParameters(&bqbase, &bqmain, prev_cutoff, prev_res, pEngine->SampleRate);
-         pEngine->pBasicFilterParameters[0] = bqbase;
-         pEngine->pMainFilterParameters[0]  = bqmain;
-         float* bq;
-         for (int i = 1; i < Samples; i++) {
-             // recalculate biquad parameters if cutoff or resonance differ from previous sample point
-             if (!(i & FILTER_UPDATE_MASK)) if (pEngine->pSynthesisParameters[Event::destination_vcfr][i] != prev_res ||
-                                                pEngine->pSynthesisParameters[Event::destination_vcfc][i] != prev_cutoff) {
-                 prev_cutoff = pEngine->pSynthesisParameters[Event::destination_vcfc][i];
-                 prev_res    = pEngine->pSynthesisParameters[Event::destination_vcfr][i];
-                 FilterLeft.SetParameters(&bqbase, &bqmain, prev_cutoff, prev_res, pEngine->SampleRate);
-             }
-             //same as 'pEngine->pBasicFilterParameters[i] = bqbase;'
-             bq    = (float*) &pEngine->pBasicFilterParameters[i];
-             bq[0] = bqbase.a1;
-             bq[1] = bqbase.a2;
-             bq[2] = bqbase.b0;
-             bq[3] = bqbase.b1;
-             bq[4] = bqbase.b2;
-             // same as 'pEngine->pMainFilterParameters[i] = bqmain;'
-             bq    = (float*) &pEngine->pMainFilterParameters[i];
-             bq[0] = bqmain.a1;
-             bq[1] = bqmain.a2;
-             bq[2] = bqmain.b0;
-             bq[3] = bqmain.b1;
-             bq[4] = bqmain.b2;
-         }
      }
-     #endif // ENABLE_FILTER
      /**
-      *  Interpolates the input audio data (without looping).
+      *  Synthesizes the current audio fragment for this voice.
       *
       *  @param Samples - number of sample points to be rendered in this audio
       *                   fragment cycle
       *  @param pSrc    - pointer to input sample data
       *  @param Skip    - number of sample points to skip in output buffer
       */
-     void Voice::InterpolateNoLoop(uint Samples, sample_t* pSrc, uint Skip) {
+     void Voice::Synthesize(uint Samples, sample_t* pSrc, uint Skip) {
-         int i = Skip;
+         finalSynthesisParameters.pOutLeft  = &pEngineChannel->pChannelLeft->Buffer()[Skip];
+         finalSynthesisParameters.pOutRight = &pEngineChannel->pChannelRight->Buffer()[Skip];
+         finalSynthesisParameters.pSrc      = pSrc;
+         RTList<Event>::Iterator itCCEvent = pEngineChannel->pEvents->first();
+         RTList<Event>::Iterator itNoteEvent = pEngineChannel->pMIDIKeyInfo[MIDIKey].pEvents->first();
-         // FIXME: assuming either mono or stereo
+         if (itTriggerEvent) { // skip events that happened before this voice was triggered
-         if (this->pSample->Channels == 2) { // Stereo Sample
+             while (itCCEvent && itCCEvent->FragmentPos() <= Skip) ++itCCEvent;
-             while (i < Samples) InterpolateStereo(pSrc, i);
+             // we can't simply compare the timestamp here, because note events
+             // might happen on the same time stamp, so we have to deal on the
+             // actual sequence the note events arrived instead (see bug #112)
+             for (; itNoteEvent; ++itNoteEvent) {
+                 if (itTriggerEvent == itNoteEvent) {
+                     ++itNoteEvent;
+                     break;
+                 }
+             }
          }
-         else { // Mono Sample
-             while (i < Samples) InterpolateMono(pSrc, i);
+         uint killPos;
+         if (itKillEvent) {
+             int maxFadeOutPos = Samples - pEngine->MinFadeOutSamples;
+             if (maxFadeOutPos < 0) {
+                 // There's not enough space in buffer to do a fade out
+                 // from max volume (this can only happen for audio
+                 // drivers that use Samples < MaxSamplesPerCycle).
+                 // End the EG1 here, at pos 0, with a shorter max fade
+                 // out time.
+                 EG1.enterFadeOutStage(Samples / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
+                 itKillEvent = Pool<Event>::Iterator();
+             } else {
+                 killPos = RTMath::Min(itKillEvent->FragmentPos(), maxFadeOutPos);
+             }
          }
-     }
-     /**
+         uint i = Skip;
-      *  Interpolates the input audio data, this method honors looping.
+         while (i < Samples) {
-      *
+             int iSubFragmentEnd = RTMath::Min(i + CONFIG_DEFAULT_SUBFRAGMENT_SIZE, Samples);
-      *  @param Samples - number of sample points to be rendered in this audio
-      *                   fragment cycle
-      *  @param pSrc    - pointer to input sample data
-      *  @param Skip    - number of sample points to skip in output buffer
-      */
-     void Voice::InterpolateAndLoop(uint Samples, sample_t* pSrc, uint Skip) {
-         int i = Skip;
-         // FIXME: assuming either mono or stereo
+             // initialize all final synthesis parameters
-         if (pSample->Channels == 2) { // Stereo Sample
+             fFinalCutoff    = VCFCutoffCtrl.fvalue;
-             if (pSample->LoopPlayCount) {
+             fFinalResonance = VCFResonanceCtrl.fvalue;
-                 // render loop (loop count limited)
-                 while (i < Samples && LoopCyclesLeft) {
+             // process MIDI control change and pitchbend events for this subfragment
-                     InterpolateStereo(pSrc, i);
+             processCCEvents(itCCEvent, iSubFragmentEnd);
-                     if (Pos > pSample->LoopEnd) {
-                         Pos = pSample->LoopStart + fmod(Pos - pSample->LoopEnd, pSample->LoopSize);;
+             finalSynthesisParameters.fFinalPitch = PitchBase * PitchBend;
-                         LoopCyclesLeft--;
+             float fFinalVolume = VolumeSmoother.render() * CrossfadeSmoother.render();
-                     }
+ #ifdef CONFIG_PROCESS_MUTED_CHANNELS
-                 }
+             if (pEngineChannel->GetMute()) fFinalVolume = 0;
-                 // render on without loop
+ #endif
-                 while (i < Samples) InterpolateStereo(pSrc, i);
+             // process transition events (note on, note off & sustain pedal)
+             processTransitionEvents(itNoteEvent, iSubFragmentEnd);
+             // if the voice was killed in this subfragment, or if the
+             // filter EG is finished, switch EG1 to fade out stage
+             if ((itKillEvent && killPos <= iSubFragmentEnd) ||
+                 (SYNTHESIS_MODE_GET_FILTER(SynthesisMode) &&
+                  EG2.getSegmentType() == EGADSR::segment_end)) {
+                 EG1.enterFadeOutStage();
+                 itKillEvent = Pool<Event>::Iterator();
              }
-             else { // render loop (endless loop)
-                 while (i < Samples) {
+             // process envelope generators
-                     InterpolateStereo(pSrc, i);
+             switch (EG1.getSegmentType()) {
-                     if (Pos > pSample->LoopEnd) {
+                 case EGADSR::segment_lin:
-                         Pos = pSample->LoopStart + fmod(Pos - pSample->LoopEnd, pSample->LoopSize);
+                     fFinalVolume *= EG1.processLin();
-                     }
+                     break;
-                 }
+                 case EGADSR::segment_exp:
+                     fFinalVolume *= EG1.processExp();
+                     break;
+                 case EGADSR::segment_end:
+                     fFinalVolume *= EG1.getLevel();
+                     break; // noop
              }
-         }
+             switch (EG2.getSegmentType()) {
-         else { // Mono Sample
+                 case EGADSR::segment_lin:
-             if (pSample->LoopPlayCount) {
+                     fFinalCutoff *= EG2.processLin();
-                 // render loop (loop count limited)
+                     break;
-                 while (i < Samples && LoopCyclesLeft) {
+                 case EGADSR::segment_exp:
-                     InterpolateMono(pSrc, i);
+                     fFinalCutoff *= EG2.processExp();
-                     if (Pos > pSample->LoopEnd) {
+                     break;
-                         Pos = pSample->LoopStart + fmod(Pos - pSample->LoopEnd, pSample->LoopSize);;
+                 case EGADSR::segment_end:
-                         LoopCyclesLeft--;
+                     fFinalCutoff *= EG2.getLevel();
-                     }
+                     break; // noop
-                 }
-                 // render on without loop
-                 while (i < Samples) InterpolateMono(pSrc, i);
              }
-             else { // render loop (endless loop)
+             if (EG3.active()) finalSynthesisParameters.fFinalPitch *= EG3.render();
-                 while (i < Samples) {
-                     InterpolateMono(pSrc, i);
+             // process low frequency oscillators
-                     if (Pos > pSample->LoopEnd) {
+             if (bLFO1Enabled) fFinalVolume *= (1.0f - pLFO1->render());
-                         Pos = pSample->LoopStart + fmod(Pos - pSample->LoopEnd, pSample->LoopSize);;
+             if (bLFO2Enabled) fFinalCutoff *= pLFO2->render();
-                     }
+             if (bLFO3Enabled) finalSynthesisParameters.fFinalPitch *= RTMath::CentsToFreqRatio(pLFO3->render());
+             // limit the pitch so we don't read outside the buffer
+             finalSynthesisParameters.fFinalPitch = RTMath::Min(finalSynthesisParameters.fFinalPitch, float(1 << CONFIG_MAX_PITCH));
+             // if filter enabled then update filter coefficients
+             if (SYNTHESIS_MODE_GET_FILTER(SynthesisMode)) {
+                 finalSynthesisParameters.filterLeft.SetParameters(fFinalCutoff, fFinalResonance, pEngine->SampleRate);
+                 finalSynthesisParameters.filterRight.SetParameters(fFinalCutoff, fFinalResonance, pEngine->SampleRate);
+             }
+             // do we need resampling?
+             const float __PLUS_ONE_CENT  = 1.000577789506554859250142541782224725466f;
+             const float __MINUS_ONE_CENT = 0.9994225441413807496009516495583113737666f;
+             const bool bResamplingRequired = !(finalSynthesisParameters.fFinalPitch <= __PLUS_ONE_CENT &&
+                                                finalSynthesisParameters.fFinalPitch >= __MINUS_ONE_CENT);
+             SYNTHESIS_MODE_SET_INTERPOLATE(SynthesisMode, bResamplingRequired);
+             // prepare final synthesis parameters structure
+             finalSynthesisParameters.uiToGo            = iSubFragmentEnd - i;
+ #ifdef CONFIG_INTERPOLATE_VOLUME
+             finalSynthesisParameters.fFinalVolumeDeltaLeft  =
+                 (fFinalVolume * VolumeLeft  * PanLeftSmoother.render() -
+                  finalSynthesisParameters.fFinalVolumeLeft) / finalSynthesisParameters.uiToGo;
+             finalSynthesisParameters.fFinalVolumeDeltaRight =
+                 (fFinalVolume * VolumeRight * PanRightSmoother.render() -
+                  finalSynthesisParameters.fFinalVolumeRight) / finalSynthesisParameters.uiToGo;
+ #else
+             finalSynthesisParameters.fFinalVolumeLeft  =
+                 fFinalVolume * VolumeLeft  * PanLeftSmoother.render();
+             finalSynthesisParameters.fFinalVolumeRight =
+                 fFinalVolume * VolumeRight * PanRightSmoother.render();
+ #endif
+             // render audio for one subfragment
+             RunSynthesisFunction(SynthesisMode, &finalSynthesisParameters, &loop);
+             // stop the rendering if volume EG is finished
+             if (EG1.getSegmentType() == EGADSR::segment_end) break;
+             const double newPos = Pos + (iSubFragmentEnd - i) * finalSynthesisParameters.fFinalPitch;
+             // increment envelopes' positions
+             if (EG1.active()) {
+                 // if sample has a loop and loop start has been reached in this subfragment, send a special event to EG1 to let it finish the attack hold stage
+                 if (pDimRgn->SampleLoops && Pos <= pDimRgn->pSampleLoops[0].LoopStart && pDimRgn->pSampleLoops[0].LoopStart < newPos) {
+                     EG1.update(EGADSR::event_hold_end, pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
                  }
+                 EG1.increment(1);
+                 if (!EG1.toStageEndLeft()) EG1.update(EGADSR::event_stage_end, pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
+             }
+             if (EG2.active()) {
+                 EG2.increment(1);
+                 if (!EG2.toStageEndLeft()) EG2.update(EGADSR::event_stage_end, pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
              }
+             EG3.increment(1);
+             if (!EG3.toEndLeft()) EG3.update(); // neutralize envelope coefficient if end reached
+             Pos = newPos;
+             i = iSubFragmentEnd;
          }
      }
+     /** @brief Update current portamento position.
+      *
+      * Will be called when portamento mode is enabled to get the final
+      * portamento position of this active voice from where the next voice(s)
+      * might continue to slide on.
+      *
+      * @param itNoteOffEvent - event which causes this voice to die soon
+      */
+     void Voice::UpdatePortamentoPos(Pool<Event>::Iterator& itNoteOffEvent) {
+         const float fFinalEG3Level = EG3.level(itNoteOffEvent->FragmentPos());
+         pEngineChannel->PortamentoPos = (float) MIDIKey + RTMath::FreqRatioToCents(fFinalEG3Level) * 0.01f;
+     }
      /**
       *  Immediately kill the voice. This method should not be used to kill
       *  a normal, active voice, because it doesn't take care of things like
       *  fading down the volume level to avoid clicks and regular processing
       *  until the kill event actually occured!
       *
-      *  @see Kill()
+      * If it's necessary to know when the voice's disk stream was actually
+      * deleted, then one can set the optional @a bRequestNotification
+      * parameter and this method will then return the handle of the disk
+      * stream (unique identifier) and one can use this handle to poll the
+      * disk thread if this stream has been deleted. In any case this method
+      * will return immediately and will not block until the stream actually
+      * was deleted.
+      *
+      * @param bRequestNotification - (optional) whether the disk thread shall
+      *                                provide a notification once it deleted
+      *                               the respective disk stream
+      *                               (default=false)
+      * @returns handle to the voice's disk stream or @c Stream::INVALID_HANDLE
+      *          if the voice did not use a disk stream at all
+      * @see Kill()
       */
-     void Voice::KillImmediately() {
+     Stream::Handle Voice::KillImmediately(bool bRequestNotification) {
+         Stream::Handle hStream = Stream::INVALID_HANDLE;
          if (DiskVoice && DiskStreamRef.State != Stream::state_unused) {
-             pDiskThread->OrderDeletionOfStream(&DiskStreamRef);
+             pDiskThread->OrderDeletionOfStream(&DiskStreamRef, bRequestNotification);
+             hStream = DiskStreamRef.hStream;
          }
          Reset();
+         return hStream;
      }
      /**
-Line 1056 
 namespace LinuxSampler { namespace gig {
+Line 993 
 namespace LinuxSampler { namespace gig {
       *  @param itKillEvent - event which caused the voice to be killed
       */
      void Voice::Kill(Pool<Event>::Iterator& itKillEvent) {
+         #if CONFIG_DEVMODE
+         if (!itKillEvent) dmsg(1,("gig::Voice::Kill(): ERROR, !itKillEvent !!!\n"));
+         if (itKillEvent && !itKillEvent.isValid()) dmsg(1,("gig::Voice::Kill(): ERROR, itKillEvent invalid !!!\n"));
+         #endif // CONFIG_DEVMODE
          if (itTriggerEvent && itKillEvent->FragmentPos() <= itTriggerEvent->FragmentPos()) return;
          this->itKillEvent = itKillEvent;
      }

 Legend:



Removed from v.285
 


changed lines


 
Added in v.1895
 Legend:



Removed from v.285
 


changed lines


 
Added in v.1895
-Removed from v.285
+Added in v.1895

	ViewVC Help
Powered by ViewVC