--- linuxsampler/trunk/src/engines/gig/Voice.cpp	2009/03/07 19:23:10	1857
+++ linuxsampler/trunk/src/engines/gig/Voice.cpp	2009/10/23 17:53:17	2012
@@ -24,6 +24,8 @@
 #include "../../common/Features.h"
 #include "Synthesizer.h"
 #include "Profiler.h"
+#include "Engine.h"
+#include "EngineChannel.h"
 
 #include "Voice.h"
 
@@ -56,9 +58,10 @@
         if (pLFO3) delete pLFO3;
     }
 
-    void Voice::SetEngine(Engine* pEngine) {
-        this->pEngine     = pEngine;
-        this->pDiskThread = pEngine->pDiskThread;
+    void Voice::SetEngine(LinuxSampler::Engine* pEngine) {
+        Engine* engine = static_cast<Engine*>(pEngine);
+        this->pEngine     = engine;
+        this->pDiskThread = engine->pDiskThread;
         dmsg(6,("Voice::SetEngine()\n"));
     }
 
@@ -156,7 +159,16 @@
         const DLS::sample_loop_t& loopinfo = pDimRgn->pSampleLoops[0];
 
         if (DiskVoice) { // voice to be streamed from disk
-            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)
+            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
             RAMLoop = (pDimRgn->SampleLoops && (loopinfo.LoopStart + loopinfo.LoopLength) <= MaxRAMPos);
@@ -183,15 +195,16 @@
 
         // calculate initial pitch value
         {
-            double pitchbasecents = pDimRgn->FineTune + (int) pEngine->ScaleTuning[MIDIKey % 12];
+            double pitchbasecents = pEngineChannel->pInstrument->FineTune + pDimRgn->FineTune + pEngine->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 (pDimRgn->PitchTrack && (MIDIKey - (int) pDimRgn->UnityNote) < 40) pitchbasecents += (MIDIKey - (int) pDimRgn->UnityNote) * 100;
 
-            this->PitchBase = RTMath::CentsToFreqRatio(pitchbasecents) * (double(pSample->SamplesPerSecond) / double(pEngine->SampleRate));
-            this->PitchBend = RTMath::CentsToFreqRatio(((double) PitchBend / 8192.0) * 200.0); // pitchbend wheel +-2 semitones = 200 cents
+            this->PitchBase = RTMath::CentsToFreqRatioUnlimited(pitchbasecents) * (double(pSample->SamplesPerSecond) / double(pEngine->SampleRate));
+            this->PitchBendRange = 1.0 / 8192.0 * 100.0 * pEngineChannel->pInstrument->PitchbendRange;
+            this->PitchBend = RTMath::CentsToFreqRatio(PitchBend * PitchBendRange);
         }
 
         // the length of the decay and release curves are dependent on the velocity
@@ -737,9 +750,7 @@
     }
 
     void Voice::processPitchEvent(RTList<Event>::Iterator& itEvent) {
-        const float pitch = RTMath::CentsToFreqRatio(((double) itEvent->Param.Pitch.Pitch / 8192.0) * 200.0); // +-two semitones = +-200 cents
-        finalSynthesisParameters.fFinalPitch *= pitch;
-        PitchBend = pitch;
+        PitchBend = RTMath::CentsToFreqRatio(itEvent->Param.Pitch.Pitch * PitchBendRange);
     }
 
     void Voice::processCutoffEvent(RTList<Event>::Iterator& itEvent) {
@@ -815,13 +826,13 @@
             int iSubFragmentEnd = RTMath::Min(i + CONFIG_DEFAULT_SUBFRAGMENT_SIZE, Samples);
 
             // initialize all final synthesis parameters
-            finalSynthesisParameters.fFinalPitch = PitchBase * PitchBend;
             fFinalCutoff    = VCFCutoffCtrl.fvalue;
             fFinalResonance = VCFResonanceCtrl.fvalue;
 
             // process MIDI control change and pitchbend events for this subfragment
             processCCEvents(itCCEvent, iSubFragmentEnd);
 
+            finalSynthesisParameters.fFinalPitch = PitchBase * PitchBend;
             float fFinalVolume = VolumeSmoother.render() * CrossfadeSmoother.render();
 #ifdef CONFIG_PROCESS_MUTED_CHANNELS
             if (pEngineChannel->GetMute()) fFinalVolume = 0;
@@ -869,6 +880,9 @@
             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);