--- linuxsampler/trunk/src/engines/common/AbstractVoice.cpp	2011/12/11 20:50:31	2299
+++ linuxsampler/trunk/src/engines/common/AbstractVoice.cpp	2014/05/18 17:38:25	2559
@@ -4,7 +4,7 @@
  *                                                                         *
  *   Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck    *
  *   Copyright (C) 2005-2008 Christian Schoenebeck                         *
- *   Copyright (C) 2009-2011 Christian Schoenebeck and Grigor Iliev        *
+ *   Copyright (C) 2009-2012 Christian Schoenebeck and Grigor Iliev        *
  *                                                                         *
  *   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  *
@@ -112,8 +112,6 @@
         Type            = VoiceType;
         MIDIKey         = itNoteOnEvent->Param.Note.Key;
         MIDIVelocity    = itNoteOnEvent->Param.Note.Velocity;
-        MIDIPan         = pEngineChannel->ControllerTable[10];
-        if (MIDIPan == 0 && pEngineChannel->GlobalPanRight == 1) MIDIPan = 64; // workaround used to determine whether the MIDI pan has not been set
         PlaybackState   = playback_state_init; // mark voice as triggered, but no audio rendered yet
         Delay           = itNoteOnEvent->FragmentPos();
         itTriggerEvent  = itNoteOnEvent;
@@ -126,6 +124,8 @@
         RgnInfo    = GetRegionInfo();
         InstrInfo  = GetInstrumentInfo();
         
+        MIDIPan    = CalculatePan(pEngineChannel->iLastPanRequest);
+
         AboutToTrigger();
 
         // calculate volume
@@ -141,14 +141,12 @@
         // get starting crossfade volume level
         float crossfadeVolume = CalculateCrossfadeVolume(itNoteOnEvent->Param.Note.Velocity);
 
-        VolumeLeft  = volume * pKeyInfo->PanLeft  * AbstractEngine::PanCurve[64 - RgnInfo.Pan];
-        VolumeRight = volume * pKeyInfo->PanRight * AbstractEngine::PanCurve[64 + RgnInfo.Pan];
+        VolumeLeft  = volume * pKeyInfo->PanLeft;
+        VolumeRight = volume * pKeyInfo->PanRight;
 
         float subfragmentRate = GetEngine()->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE;
         CrossfadeSmoother.trigger(crossfadeVolume, subfragmentRate);
         VolumeSmoother.trigger(pEngineChannel->MidiVolume, subfragmentRate);
-        PanLeftSmoother.trigger(pEngineChannel->GlobalPanLeft, subfragmentRate);
-        PanRightSmoother.trigger(pEngineChannel->GlobalPanRight, subfragmentRate);
 
         // Check if the sample needs disk streaming or is too short for that
         long cachedsamples = GetSampleCacheSize() / SmplInfo.FrameSize;
@@ -204,6 +202,11 @@
             pSignalUnitRack->Trigger();
         }
 
+        uint8_t pan = MIDIPan;
+        if (pSignalUnitRack) pan = pSignalUnitRack->GetEndpointUnit()->CalculatePan(MIDIPan);
+        PanLeftSmoother.trigger(AbstractEngine::PanCurve[128 - pan], subfragmentRate);
+        PanRightSmoother.trigger(AbstractEngine::PanCurve[pan], subfragmentRate);
+
 #ifdef CONFIG_INTERPOLATE_VOLUME
         // setup initial volume in synthesis parameters
     #ifdef CONFIG_PROCESS_MUTED_CHANNELS
@@ -221,8 +224,8 @@
                 finalVolume = pEngineChannel->MidiVolume * crossfadeVolume * pSignalUnitRack->GetEndpointUnit()->GetVolume();
             }
 
-            finalSynthesisParameters.fFinalVolumeLeft  = finalVolume * VolumeLeft  * pEngineChannel->GlobalPanLeft;
-            finalSynthesisParameters.fFinalVolumeRight = finalVolume * VolumeRight * pEngineChannel->GlobalPanRight;
+            finalSynthesisParameters.fFinalVolumeLeft  = finalVolume * VolumeLeft  * PanLeftSmoother.render();
+            finalSynthesisParameters.fFinalVolumeRight = finalVolume * VolumeRight * PanRightSmoother.render();
         }
     #endif
 #endif
@@ -379,7 +382,7 @@
         GetFirstEventOnKey(MIDIKey, itNoteEvent);
 
         RTList<Event>::Iterator itGroupEvent;
-        if (pGroupEvents) itGroupEvent = pGroupEvents->first();
+        if (pGroupEvents && !Orphan) itGroupEvent = pGroupEvents->first();
 
         if (itTriggerEvent) { // skip events that happened before this voice was triggered
             while (itCCEvent && itCCEvent->FragmentPos() <= Skip) ++itCCEvent;
@@ -408,7 +411,7 @@
                 if (pSignalUnitRack == NULL) {
                     pEG1->enterFadeOutStage(Samples / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
                 } else {
-                    // TODO: 
+                    pSignalUnitRack->EnterFadeOutStage(Samples / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
                 }
                 itKillEvent = Pool<Event>::Iterator();
             } else {
@@ -424,10 +427,10 @@
             fFinalCutoff    = VCFCutoffCtrl.fvalue;
             fFinalResonance = VCFResonanceCtrl.fvalue;
 
-            // process MIDI control change and pitchbend events for this subfragment
+            // process MIDI control change, aftertouch and pitchbend events for this subfragment
             processCCEvents(itCCEvent, iSubFragmentEnd);
             uint8_t pan = MIDIPan;
-            if (pSignalUnitRack != NULL) pan = pSignalUnitRack->GetEndpointUnit()->CaluclatePan(pan);
+            if (pSignalUnitRack != NULL) pan = pSignalUnitRack->GetEndpointUnit()->CalculatePan(MIDIPan);
             
             PanLeftSmoother.update(AbstractEngine::PanCurve[128 - pan]);
             PanRightSmoother.update(AbstractEngine::PanCurve[pan]);
@@ -488,11 +491,15 @@
                 if (bLFO2Enabled) fFinalCutoff *= pLFO2->render();
                 if (bLFO3Enabled) finalSynthesisParameters.fFinalPitch *= RTMath::CentsToFreqRatio(pLFO3->render());
             } else {
-                // 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) &&
-                    pEG2->getSegmentType() == EG::segment_end)) {
+                // if the voice was killed in this subfragment, enter fade out stage
+                if (itKillEvent && killPos <= iSubFragmentEnd) {
+                    pSignalUnitRack->EnterFadeOutStage();
+                    itKillEvent = Pool<Event>::Iterator();
+                }
+                
+                // if the filter EG is finished, switch EG1 to fade out stage
+                /*if (SYNTHESIS_MODE_GET_FILTER(SynthesisMode) &&
+                    pEG2->getSegmentType() == EG::segment_end) {
                     pEG1->enterFadeOutStage();
                     itKillEvent = Pool<Event>::Iterator();
                 }*/
@@ -604,8 +611,8 @@
     }
 
     /**
-     * Process given list of MIDI control change and pitch bend events for
-     * the given time.
+     * Process given list of MIDI control change, aftertouch and pitch bend
+     * events for the given time.
      *
      * @param itEvent - iterator pointing to the next event to be processed
      * @param End     - youngest time stamp where processing should be stopped
@@ -633,10 +640,14 @@
                 if (itEvent->Param.CC.Controller == 7) { // volume
                     VolumeSmoother.update(AbstractEngine::VolumeCurve[itEvent->Param.CC.Value]);
                 } else if (itEvent->Param.CC.Controller == 10) { // panpot
-                    MIDIPan = itEvent->Param.CC.Value;
+                    MIDIPan = CalculatePan(itEvent->Param.CC.Value);
                 }
             } else if (itEvent->Type == Event::type_pitchbend) { // if pitch bend event
                 processPitchEvent(itEvent);
+            } else if (itEvent->Type == Event::type_channel_pressure) {
+                ProcessChannelPressureEvent(itEvent);
+            } else if (itEvent->Type == Event::type_note_pressure) {
+                ProcessPolyphonicKeyPressureEvent(itEvent);
             }
 
             ProcessCCEvent(itEvent);
@@ -748,6 +759,19 @@
 
         return pitch;
     }
+    
+    void AbstractVoice::onScaleTuningChanged() {
+        PitchInfo pitch = this->Pitch;
+        double pitchbasecents = InstrInfo.FineTune + RgnInfo.FineTune + GetEngine()->ScaleTuning[MIDIKey % 12];
+        
+        // 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 (!SmplInfo.Unpitched && (MIDIKey - (int) RgnInfo.UnityNote) < 40) pitchbasecents += (MIDIKey - (int) RgnInfo.UnityNote) * 100;
+        
+        pitch.PitchBase = RTMath::CentsToFreqRatioUnlimited(pitchbasecents) * (double(SmplInfo.SampleRate) / double(GetEngine()->SampleRate));
+        this->Pitch = pitch;
+    }
 
     double AbstractVoice::CalculateVolume(double velocityAttenuation) {
         // For 16 bit samples, we downscale by 32768 to convert from