--- linuxsampler/trunk/src/engines/gig/Engine.cpp	2005/06/21 13:33:19	669
+++ linuxsampler/trunk/src/engines/gig/Engine.cpp	2005/07/24 06:57:30	716
@@ -240,8 +240,19 @@
 
         // FIXME: audio drivers with varying fragment sizes might be a problem here
         MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * CONFIG_EG_MIN_RELEASE_TIME) - 1;
-        if (MaxFadeOutPos < 0)
-            throw LinuxSamplerException("CONFIG_EG_MIN_RELEASE_TIME too big for current audio fragment size / sampling rate!");
+        if (MaxFadeOutPos < 0) {
+            std::cerr << "gig::Engine: WARNING, CONFIG_EG_MIN_RELEASE_TIME "
+                      << "too big for current audio fragment size & sampling rate! "
+                      << "May lead to click sounds if voice stealing chimes in!\n" << std::flush;
+            // force volume ramp downs at the beginning of each fragment
+            MaxFadeOutPos = 0;
+            // lower minimum release time
+            const float minReleaseTime = (float) MaxSamplesPerCycle / (float) SampleRate;
+            for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
+                iterVoice->pEG1->CalculateFadeOutCoeff(minReleaseTime, SampleRate);
+            }
+            pVoicePool->clear();
+        }
 
         // (re)create disk thread
         if (this->pDiskThread) {
@@ -481,6 +492,10 @@
      *                         this audio fragment cycle
      */
     void Engine::RenderActiveVoices(EngineChannel* pEngineChannel, uint Samples) {
+        #if !CONFIG_PROCESS_MUTED_CHANNELS
+        if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted
+        #endif
+
         RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
         RTList<uint>::Iterator end    = pEngineChannel->pActiveKeys->end();
         while (iuiKey != end) { // iterate through all active keys
@@ -609,6 +624,9 @@
      *  @param itNoteOnEvent - key, velocity and time stamp of the event
      */
     void Engine::ProcessNoteOn(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {
+        #if !CONFIG_PROCESS_MUTED_CHANNELS
+        if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted
+        #endif
 
         const int key = itNoteOnEvent->Param.Note.Key;
 
@@ -668,8 +686,11 @@
      *  @param itNoteOffEvent - key, velocity and time stamp of the event
      */
     void Engine::ProcessNoteOff(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOffEvent) {
-        midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itNoteOffEvent->Param.Note.Key];
+        #if !CONFIG_PROCESS_MUTED_CHANNELS
+        if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted
+        #endif
 
+        midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itNoteOffEvent->Param.Note.Key];
         pKey->KeyPressed = false; // the MIDI key was now released
 
         // release voices on this key if needed
@@ -1170,6 +1191,10 @@
                     dmsg(4,("PEDAL DOWN\n"));
                     pEngineChannel->SustainPedal = true;
 
+                    #if !CONFIG_PROCESS_MUTED_CHANNELS
+                    if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted
+                    #endif
+
                     // cancel release process of voices if necessary
                     RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
                     for (; iuiKey; ++iuiKey) {
@@ -1188,6 +1213,10 @@
                     dmsg(4,("PEDAL UP\n"));
                     pEngineChannel->SustainPedal = false;
 
+                    #if !CONFIG_PROCESS_MUTED_CHANNELS
+                    if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted
+                    #endif
+
                     // release voices if their respective key is not pressed
                     RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
                     for (; iuiKey; ++iuiKey) {
@@ -1412,7 +1441,7 @@
     }
 
     String Engine::Version() {
-        String s = "$Revision: 1.47 $";
+        String s = "$Revision: 1.51 $";
         return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword
     }