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

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

Parent Directory | Revision Log | View Patch Patch

-revision 466 by schoenebeck,
Tue Mar 15 19:27:01 2005 UTC
+revision 1297 by iliev,
Thu Aug 16 15:55:21 2007 UTC
 Line 2
   *                                                                         *
   *   LinuxSampler - modular, streaming capable sampler                     *
   *                                                                         *
-  *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
+  *   Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck   *
-  *   Copyright (C) 2005 Christian Schoenebeck                              *
+  *   Copyright (C) 2005-2007 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 29
  #include "Engine.h"
- #if defined(__APPLE__)
- # include <stdlib.h>
- #else
- # include <malloc.h>
- #endif
  namespace LinuxSampler { namespace gig {
      InstrumentResourceManager Engine::instruments;
-Line 57 
 namespace LinuxSampler { namespace gig {
+Line 51 
 namespace LinuxSampler { namespace gig {
          if (engines.count(pDevice)) {
              dmsg(4,("Using existing gig::Engine.\n"));
              pEngine = engines[pDevice];
+             // Disable the engine while the new engine channel is
+             // added and initialized. The engine will be enabled again
+             // in EngineChannel::Connect.
+             pEngine->DisableAndLock();
          } else { // create a new engine (and disk thread) instance for the given audio output device
              dmsg(4,("Creating new gig::Engine.\n"));
              pEngine = (Engine*) EngineFactory::Create("gig");
-Line 96 
 namespace LinuxSampler { namespace gig {
+Line 95 
 namespace LinuxSampler { namespace gig {
          else dmsg(4,("This gig::Engine has now %d EngineChannels.\n",pEngine->engineChannels.size()));
      }
+     /**
+      * Constructor
+      */
      Engine::Engine() {
          pAudioOutputDevice = NULL;
          pDiskThread        = NULL;
          pEventGenerator    = NULL;
-         pSysexBuffer       = new RingBuffer<uint8_t>(SYSEX_BUFFER_SIZE, 0);
+         pSysexBuffer       = new RingBuffer<uint8_t,false>(CONFIG_SYSEX_BUFFER_SIZE, 0);
-         pEventQueue        = new RingBuffer<Event>(MAX_EVENTS_PER_FRAGMENT, 0);
+         pEventQueue        = new RingBuffer<Event,false>(CONFIG_MAX_EVENTS_PER_FRAGMENT, 0);
-         pEventPool         = new Pool<Event>(MAX_EVENTS_PER_FRAGMENT);
+         pEventPool         = new Pool<Event>(CONFIG_MAX_EVENTS_PER_FRAGMENT);
-         pVoicePool         = new Pool<Voice>(MAX_AUDIO_VOICES);
+         pVoicePool         = new Pool<Voice>(CONFIG_MAX_VOICES);
+         pDimRegionsInUse   = new ::gig::DimensionRegion*[CONFIG_MAX_VOICES + 1];
          pVoiceStealingQueue = new RTList<Event>(pEventPool);
          pGlobalEvents      = new RTList<Event>(pEventPool);
+         InstrumentChangeQueue      = new RingBuffer<instrument_change_command_t,false>(1, 0);
+         InstrumentChangeReplyQueue = new RingBuffer<instrument_change_reply_t,false>(1, 0);
          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
              iterVoice->SetEngine(this);
          }
          pVoicePool->clear();
-         pSynthesisParameters[0] = NULL; // we allocate when an audio device is connected
-         pBasicFilterParameters  = NULL;
-         pMainFilterParameters   = NULL;
          ResetInternal();
+         ResetScaleTuning();
      }
+     /**
+      * Destructor
+      */
      Engine::~Engine() {
+         MidiInputPort::RemoveSysexListener(this);
          if (pDiskThread) {
              dmsg(1,("Stopping disk thread..."));
              pDiskThread->StopThread();
-Line 132 
 namespace LinuxSampler { namespace gig {
+Line 139 
 namespace LinuxSampler { namespace gig {
              delete pVoicePool;
          }
          if (pEventGenerator) delete pEventGenerator;
-         if (pMainFilterParameters) delete[] pMainFilterParameters;
-         if (pBasicFilterParameters) delete[] pBasicFilterParameters;
-         if (pSynthesisParameters[0]) free(pSynthesisParameters[0]);
          if (pVoiceStealingQueue) delete pVoiceStealingQueue;
          if (pSysexBuffer) delete pSysexBuffer;
-         EngineFactory::Destroy(this);
+         if (pGlobalEvents) delete pGlobalEvents;
+         if (InstrumentChangeQueue) delete InstrumentChangeQueue;
+         if (InstrumentChangeReplyQueue) delete InstrumentChangeReplyQueue;
+         if (pDimRegionsInUse) delete[] pDimRegionsInUse;
+         Unregister();
      }
      void Engine::Enable() {
-Line 165 
 namespace LinuxSampler { namespace gig {
+Line 173 
 namespace LinuxSampler { namespace gig {
      void Engine::Reset() {
          DisableAndLock();
          ResetInternal();
+         ResetScaleTuning();
          Enable();
      }
      /**
       *  Reset all voices and disk thread and clear input event queue and all
-      *  control and status variables. This method is not thread safe!
+      *  control and status variables. This method is protected by a mutex.
       */
      void Engine::ResetInternal() {
+         ResetInternalMutex.Lock();
+         // make sure that the engine does not get any sysex messages
+         // while it's reseting
+         bool sysexDisabled = MidiInputPort::RemoveSysexListener(this);
          ActiveVoiceCount    = 0;
          ActiveVoiceCountMax = 0;
          // reset voice stealing parameters
          pVoiceStealingQueue->clear();
-         itLastStolenVoice  = RTList<Voice>::Iterator();
+         itLastStolenVoice          = RTList<Voice>::Iterator();
-         iuiLastStolenKey   = RTList<uint>::Iterator();
+         itLastStolenVoiceGlobally  = RTList<Voice>::Iterator();
-         pLastStolenChannel = NULL;
+         iuiLastStolenKey           = RTList<uint>::Iterator();
+         iuiLastStolenKeyGlobally   = RTList<uint>::Iterator();
-         // reset to normal chromatic scale (means equal temper)
+         pLastStolenChannel         = NULL;
-         memset(&ScaleTuning[0], 0x00, 12);
          // reset all voices
          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
-Line 196 
 namespace LinuxSampler { namespace gig {
+Line 209 
 namespace LinuxSampler { namespace gig {
          // delete all input events
          pEventQueue->init();
+         pSysexBuffer->init();
+         if (sysexDisabled) MidiInputPort::AddSysexListener(this);
+         ResetInternalMutex.Unlock();
      }
+     /**
+      * Reset to normal, chromatic scale (means equal tempered).
+      */
+     void Engine::ResetScaleTuning() {
+         memset(&ScaleTuning[0], 0x00, 12);
+     }
+     /**
+      * Connect this engine instance with the given audio output device.
+      * This method will be called when an Engine instance is created.
+      * All of the engine's data structures which are dependant to the used
+      * audio output device / driver will be (re)allocated and / or
+      * adjusted appropriately.
+      *
+      * @param pAudioOut - audio output device to connect to
+      */
      void Engine::Connect(AudioOutputDevice* pAudioOut) {
          pAudioOutputDevice = pAudioOut;
-Line 209 
 namespace LinuxSampler { namespace gig {
+Line 241 
 namespace LinuxSampler { namespace gig {
          }
          catch (AudioOutputException e) {
              String msg = "Audio output device unable to provide 2 audio channels, cause: " + e.Message();
-             throw LinuxSamplerException(msg);
+             throw Exception(msg);
          }
          this->MaxSamplesPerCycle = pAudioOutputDevice->MaxSamplesPerCycle();
          this->SampleRate         = pAudioOutputDevice->SampleRate();
          // FIXME: audio drivers with varying fragment sizes might be a problem here
-         MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * EG_MIN_RELEASE_TIME) - 1;
+         MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * CONFIG_EG_MIN_RELEASE_TIME) - 1;
-         if (MaxFadeOutPos < 0)
+         if (MaxFadeOutPos < 0) {
-             throw LinuxSamplerException("EG_MIN_RELEASE_TIME in EGADSR.h too big for current audio fragment size / sampling rate!");
+             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->EG1.CalculateFadeOutCoeff(minReleaseTime, SampleRate);
+             }
+             pVoicePool->clear();
+         }
          // (re)create disk thread
          if (this->pDiskThread) {
-Line 227 
 namespace LinuxSampler { namespace gig {
+Line 270 
 namespace LinuxSampler { namespace gig {
              delete this->pDiskThread;
              dmsg(1,("OK\n"));
          }
-         this->pDiskThread = new DiskThread(((pAudioOut->MaxSamplesPerCycle() << MAX_PITCH) << 1) + 6); //FIXME: assuming stereo
+         this->pDiskThread = new DiskThread(((pAudioOut->MaxSamplesPerCycle() << CONFIG_MAX_PITCH) << 1) + 6, //FIXME: assuming stereo
+                                            &instruments);
          if (!pDiskThread) {
              dmsg(0,("gig::Engine  new diskthread = NULL\n"));
              exit(EXIT_FAILURE);
-Line 243 
 namespace LinuxSampler { namespace gig {
+Line 287 
 namespace LinuxSampler { namespace gig {
          if (pEventGenerator) delete pEventGenerator;
          pEventGenerator = new EventGenerator(pAudioOut->SampleRate());
-         // (re)allocate synthesis parameter matrix
-         if (pSynthesisParameters[0]) free(pSynthesisParameters[0]);
-         #if defined(__APPLE__)
-         pSynthesisParameters[0] = (float *) malloc(Event::destination_count * sizeof(float) * pAudioOut->MaxSamplesPerCycle());
-         #else
-         pSynthesisParameters[0] = (float *) memalign(16,(Event::destination_count * sizeof(float) * pAudioOut->MaxSamplesPerCycle()));
-         #endif
-         for (int dst = 1; dst < Event::destination_count; dst++)
-             pSynthesisParameters[dst] = pSynthesisParameters[dst - 1] + pAudioOut->MaxSamplesPerCycle();
-         // (re)allocate biquad filter parameter sequence
-         if (pBasicFilterParameters) delete[] pBasicFilterParameters;
-         if (pMainFilterParameters)  delete[] pMainFilterParameters;
-         pBasicFilterParameters = new biquad_param_t[pAudioOut->MaxSamplesPerCycle()];
-         pMainFilterParameters  = new biquad_param_t[pAudioOut->MaxSamplesPerCycle()];
          dmsg(1,("Starting disk thread..."));
          pDiskThread->StartThread();
          dmsg(1,("OK\n"));
-Line 272 
 namespace LinuxSampler { namespace gig {
+Line 299 
 namespace LinuxSampler { namespace gig {
          }
      }
+     /**
+      * Clear all engine global event lists.
+      */
      void Engine::ClearEventLists() {
          pGlobalEvents->clear();
      }
-Line 290 
 namespace LinuxSampler { namespace gig {
+Line 320 
 namespace LinuxSampler { namespace gig {
       *                  current audio cycle
       */
      void Engine::ImportEvents(uint Samples) {
-         RingBuffer<Event>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();
+         RingBuffer<Event,false>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();
          Event* pEvent;
          while (true) {
              // get next event from input event queue
-Line 313 
 namespace LinuxSampler { namespace gig {
+Line 343 
 namespace LinuxSampler { namespace gig {
      }
      /**
-      *  Let this engine proceed to render the given amount of sample points. The
+      * Let this engine proceed to render the given amount of sample points.
-      *  calculated audio data of all voices of this engine will be placed into
+      * The engine will iterate through all engine channels and render audio
-      *  the engine's audio sum buffer which has to be copied and eventually be
+      * for each engine channel independently. The calculated audio data of
-      *  converted to the appropriate value range by the audio output class (e.g.
+      * all voices of each engine channel will be placed into the audio sum
-      *  AlsaIO or JackIO) right after.
+      * buffers of the respective audio output device, connected to the
+      * respective engine channel.
       *
       *  @param Samples - number of sample points to be rendered
       *  @returns       0 on success
       */
      int Engine::RenderAudio(uint Samples) {
-         dmsg(5,("RenderAudio(Samples=%d)\n", Samples));
+         dmsg(7,("RenderAudio(Samples=%d)\n", Samples));
          // return if engine disabled
          if (EngineDisabled.Pop()) {
-Line 334 
 namespace LinuxSampler { namespace gig {
+Line 365 
 namespace LinuxSampler { namespace gig {
          // update time of start and end of this audio fragment (as events' time stamps relate to this)
          pEventGenerator->UpdateFragmentTime(Samples);
+         // We only allow a maximum of CONFIG_MAX_VOICES voices to be spawned
+         // in each audio fragment. All subsequent request for spawning new
+         // voices in the same audio fragment will be ignored.
+         VoiceSpawnsLeft = CONFIG_MAX_VOICES;
          // get all events from the engine's global input event queue which belong to the current fragment
          // (these are usually just SysEx messages)
          ImportEvents(Samples);
-Line 352 
 namespace LinuxSampler { namespace gig {
+Line 388 
 namespace LinuxSampler { namespace gig {
              }
          }
-         // We only allow a maximum of MAX_AUDIO_VOICES voices to be stolen
-         // in each audio fragment. All subsequent request for spawning new
-         // voices in the same audio fragment will be ignored.
-         VoiceTheftsLeft = MAX_AUDIO_VOICES;
          // reset internal voice counter (just for statistic of active voices)
          ActiveVoiceCountTemp = 0;
+         // handle instrument change commands
+         instrument_change_command_t command;
+         if (InstrumentChangeQueue->pop(&command) > 0) {
+             EngineChannel* pEngineChannel = command.pEngineChannel;
+             pEngineChannel->pInstrument = command.pInstrument;
+             // iterate through all active voices and mark their
+             // dimension regions as "in use". The instrument resource
+             // manager may delete all of the instrument except the
+             // dimension regions and samples that are in use.
+             int i = 0;
+             RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
+             RTList<uint>::Iterator end    = pEngineChannel->pActiveKeys->end();
+             while (iuiKey != end) { // iterate through all active keys
+                 midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
+                 ++iuiKey;
+                 RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
+                 RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
+                 for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
+                     if (!itVoice->Orphan) {
+                         itVoice->Orphan = true;
+                         pDimRegionsInUse[i++] = itVoice->pDimRgn;
+                     }
+                 }
+             }
+             pDimRegionsInUse[i] = 0; // end of list
+             // send a reply to the calling thread, which is waiting
+             instrument_change_reply_t reply;
+             InstrumentChangeReplyQueue->push(&reply);
+         }
          // handle events on all engine channels
          for (int i = 0; i < engineChannels.size(); i++) {
-             if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded
              ProcessEvents(engineChannels[i], Samples);
          }
          // render all 'normal', active voices on all engine channels
          for (int i = 0; i < engineChannels.size(); i++) {
-             if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded
              RenderActiveVoices(engineChannels[i], Samples);
          }
          // now that all ordinary voices on ALL engine channels are rendered, render new stolen voices
          RenderStolenVoices(Samples);
+         // handle audio routing for engine channels with FX sends
+         for (int i = 0; i < engineChannels.size(); i++) {
+             if (engineChannels[i]->fxSends.empty()) continue; // ignore if no FX sends
+             RouteAudio(engineChannels[i], Samples);
+         }
          // handle cleanup on all engine channels for the next audio fragment
          for (int i = 0; i < engineChannels.size(); i++) {
-             if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded
              PostProcess(engineChannels[i]);
          }
-Line 388 
 namespace LinuxSampler { namespace gig {
+Line 454 
 namespace LinuxSampler { namespace gig {
          // reset voice stealing for the next audio fragment
          pVoiceStealingQueue->clear();
-         itLastStolenVoice  = RTList<Voice>::Iterator();
-         iuiLastStolenKey   = RTList<uint>::Iterator();
-         pLastStolenChannel = NULL;
          // just some statistics about this engine instance
          ActiveVoiceCount = ActiveVoiceCountTemp;
          if (ActiveVoiceCount > ActiveVoiceCountMax) ActiveVoiceCountMax = ActiveVoiceCount;
+         FrameTime += Samples;
          return 0;
      }
+     /**
+      * Dispatch and handle all events in this audio fragment for the given
+      * engine channel.
+      *
+      * @param pEngineChannel - engine channel on which events should be
+      *                         processed
+      * @param Samples        - amount of sample points to be processed in
+      *                         this audio fragment cycle
+      */
      void Engine::ProcessEvents(EngineChannel* pEngineChannel, uint Samples) {
          // get all events from the engine channels's input event queue which belong to the current fragment
          // (these are the common events like NoteOn, NoteOff, ControlChange, etc.)
-Line 429 
 namespace LinuxSampler { namespace gig {
+Line 503 
 namespace LinuxSampler { namespace gig {
                  }
              }
          }
+         // reset voice stealing for the next engine channel (or next audio fragment)
+         itLastStolenVoice         = RTList<Voice>::Iterator();
+         itLastStolenVoiceGlobally = RTList<Voice>::Iterator();
+         iuiLastStolenKey          = RTList<uint>::Iterator();
+         iuiLastStolenKeyGlobally  = RTList<uint>::Iterator();
+         pLastStolenChannel        = NULL;
      }
+     /**
+      * Render all 'normal' voices (that is voices which were not stolen in
+      * this fragment) on the given engine channel.
+      *
+      * @param pEngineChannel - engine channel on which audio should be
+      *                         rendered
+      * @param Samples        - amount of sample points to be rendered in
+      *                         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
+         uint vc = 0;
+         uint sc = 0;
          RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
          RTList<uint>::Iterator end    = pEngineChannel->pActiveKeys->end();
          while (iuiKey != end) { // iterate through all active keys
-Line 443 
 namespace LinuxSampler { namespace gig {
+Line 539 
 namespace LinuxSampler { namespace gig {
              for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
                  // now render current voice
                  itVoice->Render(Samples);
-                 if (itVoice->IsActive()) ActiveVoiceCountTemp++; // still active
+                 if (itVoice->IsActive()) { // still active
-                 else { // voice reached end, is now inactive
+                     ActiveVoiceCountTemp++;
+                     vc++;
+                     if (itVoice->PlaybackState == Voice::playback_state_disk) {
+                         if ((itVoice->DiskStreamRef).State == Stream::state_active) sc++;
+                     }
+                 }  else { // voice reached end, is now inactive
                      FreeVoice(pEngineChannel, itVoice); // remove voice from the list of active voices
                  }
              }
          }
+         pEngineChannel->SetVoiceCount(vc);
+         pEngineChannel->SetDiskStreamCount(sc);
      }
+     /**
+      * Render all stolen voices (only voices which were stolen in this
+      * fragment) on the given engine channel. Stolen voices are rendered
+      * after all normal voices have been rendered; this is needed to render
+      * audio of those voices which were selected for voice stealing until
+      * the point were the stealing (that is the take over of the voice)
+      * actually happened.
+      *
+      * @param pEngineChannel - engine channel on which audio should be
+      *                         rendered
+      * @param Samples        - amount of sample points to be rendered in
+      *                         this audio fragment cycle
+      */
      void Engine::RenderStolenVoices(uint Samples) {
          RTList<Event>::Iterator itVoiceStealEvent = pVoiceStealingQueue->first();
          RTList<Event>::Iterator end               = pVoiceStealingQueue->end();
          for (; itVoiceStealEvent != end; ++itVoiceStealEvent) {
              EngineChannel* pEngineChannel = (EngineChannel*) itVoiceStealEvent->pEngineChannel;
+             if (!pEngineChannel->pInstrument) continue; // ignore if no instrument loaded
              Pool<Voice>::Iterator itNewVoice =
-                 LaunchVoice(pEngineChannel, itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false);
+                 LaunchVoice(pEngineChannel, itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false, false);
              if (itNewVoice) {
                  itNewVoice->Render(Samples);
-                 if (itNewVoice->IsActive()) ActiveVoiceCountTemp++; // still active
+                 if (itNewVoice->IsActive()) { // still active
-                 else { // voice reached end, is now inactive
+                     ActiveVoiceCountTemp++;
+                     pEngineChannel->SetVoiceCount(pEngineChannel->GetVoiceCount() + 1);
+                     if (itNewVoice->PlaybackState == Voice::playback_state_disk) {
+                         if (itNewVoice->DiskStreamRef.State == Stream::state_active) {
+                             pEngineChannel->SetDiskStreamCount(pEngineChannel->GetDiskStreamCount() + 1);
+                         }
+                     }
+                 } else { // voice reached end, is now inactive
                      FreeVoice(pEngineChannel, itNewVoice); // remove voice from the list of active voices
                  }
              }
              else dmsg(1,("gig::Engine: ERROR, voice stealing didn't work out!\n"));
+             // we need to clear the key's event list explicitly here in case key was never active
+             midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itVoiceStealEvent->Param.Note.Key];
+             pKey->VoiceTheftsQueued--;
+             if (!pKey->Active && !pKey->VoiceTheftsQueued) pKey->pEvents->clear();
+         }
+     }
+     /**
+      * Will be called in case the respective engine channel sports FX send
+      * channels. In this particular case, engine channel local buffers are
+      * used to render and mix all voices to. This method is responsible for
+      * copying the audio data from those local buffers to the master audio
+      * output channels as well as to the FX send audio output channels with
+      * their respective FX send levels.
+      *
+      * @param pEngineChannel - engine channel from which audio should be
+      *                         routed
+      * @param Samples        - amount of sample points to be routed in
+      *                         this audio fragment cycle
+      */
+     void Engine::RouteAudio(EngineChannel* pEngineChannel, uint Samples) {
+         // route master signal
+         {
+             AudioChannel* pDstL = pAudioOutputDevice->Channel(pEngineChannel->AudioDeviceChannelLeft);
+             AudioChannel* pDstR = pAudioOutputDevice->Channel(pEngineChannel->AudioDeviceChannelRight);
+             pEngineChannel->pChannelLeft->MixTo(pDstL, Samples);
+             pEngineChannel->pChannelRight->MixTo(pDstR, Samples);
          }
+         // route FX send signal
+         {
+             for (int iFxSend = 0; iFxSend < pEngineChannel->GetFxSendCount(); iFxSend++) {
+                 FxSend* pFxSend = pEngineChannel->GetFxSend(iFxSend);
+                 // left channel
+                 const int iDstL = pFxSend->DestinationChannel(0);
+                 if (iDstL < 0) {
+                     dmsg(1,("Engine::RouteAudio() Error: invalid FX send (L) destination channel"));
+                 } else {
+                     AudioChannel* pDstL = pAudioOutputDevice->Channel(iDstL);
+                     if (!pDstL) {
+                         dmsg(1,("Engine::RouteAudio() Error: invalid FX send (L) destination channel"));
+                     } else pEngineChannel->pChannelLeft->MixTo(pDstL, Samples, pFxSend->Level());
+                 }
+                 // right channel
+                 const int iDstR = pFxSend->DestinationChannel(1);
+                 if (iDstR < 0) {
+                     dmsg(1,("Engine::RouteAudio() Error: invalid FX send (R) destination channel"));
+                 } else {
+                     AudioChannel* pDstR = pAudioOutputDevice->Channel(iDstR);
+                     if (!pDstR) {
+                         dmsg(1,("Engine::RouteAudio() Error: invalid FX send (R) destination channel"));
+                     } else pEngineChannel->pChannelRight->MixTo(pDstR, Samples, pFxSend->Level());
+                 }
+             }
+         }
+         // reset buffers with silence (zero out) for the next audio cycle
+         pEngineChannel->pChannelLeft->Clear();
+         pEngineChannel->pChannelRight->Clear();
      }
+     /**
+      * Free all keys which have turned inactive in this audio fragment, from
+      * the list of active keys and clear all event lists on that engine
+      * channel.
+      *
+      * @param pEngineChannel - engine channel to cleanup
+      */
      void Engine::PostProcess(EngineChannel* pEngineChannel) {
          // free all keys which have no active voices left
          {
-Line 478 
 namespace LinuxSampler { namespace gig {
+Line 669 
 namespace LinuxSampler { namespace gig {
                  midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
                  ++iuiKey;
                  if (pKey->pActiveVoices->isEmpty()) FreeKey(pEngineChannel, pKey);
-                 #if DEVMODE
+                 #if CONFIG_DEVMODE
-                 else { // FIXME: should be removed before the final release (purpose: just a sanity check for debugging)
+                 else { // just a sanity check for debugging
                      RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
                      RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
                      for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
-Line 488 
 namespace LinuxSampler { namespace gig {
+Line 679 
 namespace LinuxSampler { namespace gig {
                          }
                      }
                  }
-                 #endif // DEVMODE
+                 #endif // CONFIG_DEVMODE
              }
          }
-Line 523 
 namespace LinuxSampler { namespace gig {
+Line 714 
 namespace LinuxSampler { namespace gig {
                  // finally place sysex event into input event queue
                  pEventQueue->push(&event);
              }
-             else dmsg(1,("Engine: Sysex message too large (%d byte) for input buffer (%d byte)!",Size,SYSEX_BUFFER_SIZE));
+             else dmsg(1,("Engine: Sysex message too large (%d byte) for input buffer (%d byte)!",Size,CONFIG_SYSEX_BUFFER_SIZE));
          }
          else dmsg(1,("Engine: Input event queue full!"));
      }
-Line 535 
 namespace LinuxSampler { namespace gig {
+Line 726 
 namespace LinuxSampler { namespace gig {
       *  @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
+         if (!pEngineChannel->pInstrument) return; // ignore if no instrument loaded
+         //HACK: we should better add the transpose value only to the most mandatory places (like for retrieving the region and calculating the tuning), because otherwise voices will unintendedly survive when changing transpose while playing
+         itNoteOnEvent->Param.Note.Key += pEngineChannel->GlobalTranspose;
          const int key = itNoteOnEvent->Param.Note.Key;
+         midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[key];
+         // move note on event to the key's own event list
+         RTList<Event>::Iterator itNoteOnEventOnKeyList = itNoteOnEvent.moveToEndOf(pKey->pEvents);
+         // if Solo Mode then kill all already active voices
+         if (pEngineChannel->SoloMode) {
+             Pool<uint>::Iterator itYoungestKey = pEngineChannel->pActiveKeys->last();
+             if (itYoungestKey) {
+                 const int iYoungestKey = *itYoungestKey;
+                 const midi_key_info_t* pOtherKey = &pEngineChannel->pMIDIKeyInfo[iYoungestKey];
+                 if (pOtherKey->Active) {
+                     // get final portamento position of currently active voice
+                     if (pEngineChannel->PortamentoMode) {
+                         RTList<Voice>::Iterator itVoice = pOtherKey->pActiveVoices->last();
+                         if (itVoice) itVoice->UpdatePortamentoPos(itNoteOnEventOnKeyList);
+                     }
+                     // kill all voices on the (other) key
+                     RTList<Voice>::Iterator itVoiceToBeKilled = pOtherKey->pActiveVoices->first();
+                     RTList<Voice>::Iterator end               = pOtherKey->pActiveVoices->end();
+                     for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) {
+                         if (itVoiceToBeKilled->Type != Voice::type_release_trigger)
+                             itVoiceToBeKilled->Kill(itNoteOnEventOnKeyList);
+                     }
+                 }
+             }
+             // set this key as 'currently active solo key'
+             pEngineChannel->SoloKey = key;
+         }
          // Change key dimension value if key is in keyswitching area
          {
              const ::gig::Instrument* pInstrument = pEngineChannel->pInstrument;
              if (key >= pInstrument->DimensionKeyRange.low && key <= pInstrument->DimensionKeyRange.high)
-                 pEngineChannel->CurrentKeyDimension = ((key - pInstrument->DimensionKeyRange.low) * 128) /
+                 pEngineChannel->CurrentKeyDimension = float(key - pInstrument->DimensionKeyRange.low) /
                      (pInstrument->DimensionKeyRange.high - pInstrument->DimensionKeyRange.low + 1);
          }
-         midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[key];
          pKey->KeyPressed = true; // the MIDI key was now pressed down
+         pKey->Velocity   = itNoteOnEventOnKeyList->Param.Note.Velocity;
+         pKey->NoteOnTime = FrameTime + itNoteOnEventOnKeyList->FragmentPos(); // will be used to calculate note length
          // cancel release process of voices on this key if needed
          if (pKey->Active && !pEngineChannel->SustainPedal) {
              RTList<Event>::Iterator itCancelReleaseEvent = pKey->pEvents->allocAppend();
              if (itCancelReleaseEvent) {
-                 *itCancelReleaseEvent = *itNoteOnEvent;                  // copy event
+                 *itCancelReleaseEvent = *itNoteOnEventOnKeyList;         // copy event
                  itCancelReleaseEvent->Type = Event::type_cancel_release; // transform event type
              }
              else dmsg(1,("Event pool emtpy!\n"));
          }
-         // move note on event to the key's own event list
-         RTList<Event>::Iterator itNoteOnEventOnKeyList = itNoteOnEvent.moveToEndOf(pKey->pEvents);
          // allocate and trigger new voice(s) for the key
          {
              // first, get total amount of required voices (dependant on amount of layers)
-Line 571 
 namespace LinuxSampler { namespace gig {
+Line 796 
 namespace LinuxSampler { namespace gig {
                  int voicesRequired = pRegion->Layers;
                  // now launch the required amount of voices
                  for (int i = 0; i < voicesRequired; i++)
-                     LaunchVoice(pEngineChannel, itNoteOnEventOnKeyList, i, false, true);
+                     LaunchVoice(pEngineChannel, itNoteOnEventOnKeyList, i, false, true, true);
              }
          }
+         // if neither a voice was spawned or postponed then remove note on event from key again
+         if (!pKey->Active && !pKey->VoiceTheftsQueued)
+             pKey->pEvents->free(itNoteOnEventOnKeyList);
+         if (!pEngineChannel->SoloMode || pEngineChannel->PortamentoPos < 0.0f) pEngineChannel->PortamentoPos = (float) key;
          pKey->RoundRobinIndex++;
      }
-Line 588 
 namespace LinuxSampler { namespace gig {
+Line 818 
 namespace LinuxSampler { namespace gig {
       *  @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
-         pKey->KeyPressed = false; // the MIDI key was now released
+         //HACK: we should better add the transpose value only to the most mandatory places (like for retrieving the region and calculating the tuning), because otherwise voices will unintendedly survive when changing transpose while playing
+         itNoteOffEvent->Param.Note.Key += pEngineChannel->GlobalTranspose;
-         // release voices on this key if needed
+         const int iKey = itNoteOffEvent->Param.Note.Key;
-         if (pKey->Active && !pEngineChannel->SustainPedal) {
+         midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[iKey];
-             itNoteOffEvent->Type = Event::type_release; // transform event type
+         pKey->KeyPressed = false; // the MIDI key was now released
-         }
          // move event to the key's own event list
          RTList<Event>::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents);
-         // spawn release triggered voice(s) if needed
+         bool bShouldRelease = pKey->Active && ShouldReleaseVoice(pEngineChannel, itNoteOffEventOnKeyList->Param.Note.Key);
-         if (pKey->ReleaseTrigger) {
-             // first, get total amount of required voices (dependant on amount of layers)
+         // in case Solo Mode is enabled, kill all voices on this key and respawn a voice on the highest pressed key (if any)
-             ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOffEventOnKeyList->Param.Note.Key);
+         if (pEngineChannel->SoloMode && pEngineChannel->pInstrument) { //TODO: this feels like too much code just for handling solo mode :P
-             if (pRegion) {
+             bool bOtherKeysPressed = false;
-                 int voicesRequired = pRegion->Layers;
+             if (iKey == pEngineChannel->SoloKey) {
-                 // now launch the required amount of voices
+                 pEngineChannel->SoloKey = -1;
-                 for (int i = 0; i < voicesRequired; i++)
+                 // if there's still a key pressed down, respawn a voice (group) on the highest key
-                     LaunchVoice(pEngineChannel, itNoteOffEventOnKeyList, i, true, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples
+                 for (int i = 127; i > 0; i--) {
+                     midi_key_info_t* pOtherKey = &pEngineChannel->pMIDIKeyInfo[i];
+                     if (pOtherKey->KeyPressed) {
+                         bOtherKeysPressed = true;
+                         // make the other key the new 'currently active solo key'
+                         pEngineChannel->SoloKey = i;
+                         // get final portamento position of currently active voice
+                         if (pEngineChannel->PortamentoMode) {
+                             RTList<Voice>::Iterator itVoice = pKey->pActiveVoices->first();
+                             if (itVoice) itVoice->UpdatePortamentoPos(itNoteOffEventOnKeyList);
+                         }
+                         // create a pseudo note on event
+                         RTList<Event>::Iterator itPseudoNoteOnEvent = pOtherKey->pEvents->allocAppend();
+                         if (itPseudoNoteOnEvent) {
+                             // copy event
+                             *itPseudoNoteOnEvent = *itNoteOffEventOnKeyList;
+                             // transform event to a note on event
+                             itPseudoNoteOnEvent->Type                = Event::type_note_on;
+                             itPseudoNoteOnEvent->Param.Note.Key      = i;
+                             itPseudoNoteOnEvent->Param.Note.Velocity = pOtherKey->Velocity;
+                             // allocate and trigger new voice(s) for the other key
+                             {
+                                 // first, get total amount of required voices (dependant on amount of layers)
+                                 ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(i);
+                                 if (pRegion) {
+                                     int voicesRequired = pRegion->Layers;
+                                     // now launch the required amount of voices
+                                     for (int iLayer = 0; iLayer < voicesRequired; iLayer++)
+                                         LaunchVoice(pEngineChannel, itPseudoNoteOnEvent, iLayer, false, true, false);
+                                 }
+                             }
+                             // if neither a voice was spawned or postponed then remove note on event from key again
+                             if (!pOtherKey->Active && !pOtherKey->VoiceTheftsQueued)
+                                 pOtherKey->pEvents->free(itPseudoNoteOnEvent);
+                         } else dmsg(1,("Could not respawn voice, no free event left\n"));
+                         break; // done
+                     }
+                 }
              }
-             pKey->ReleaseTrigger = false;
+             if (bOtherKeysPressed) {
+                 if (pKey->Active) { // kill all voices on this key
+                     bShouldRelease = false; // no need to release, as we kill it here
+                     RTList<Voice>::Iterator itVoiceToBeKilled = pKey->pActiveVoices->first();
+                     RTList<Voice>::Iterator end               = pKey->pActiveVoices->end();
+                     for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) {
+                         if (itVoiceToBeKilled->Type != Voice::type_release_trigger)
+                             itVoiceToBeKilled->Kill(itNoteOffEventOnKeyList);
+                     }
+                 }
+             } else pEngineChannel->PortamentoPos = -1.0f;
          }
+         // if no solo mode (the usual case) or if solo mode and no other key pressed, then release voices on this key if needed
+         if (bShouldRelease) {
+             itNoteOffEventOnKeyList->Type = Event::type_release; // transform event type
+             // spawn release triggered voice(s) if needed
+             if (pKey->ReleaseTrigger && pEngineChannel->pInstrument) {
+                 // first, get total amount of required voices (dependant on amount of layers)
+                 ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOffEventOnKeyList->Param.Note.Key);
+                 if (pRegion) {
+                     int voicesRequired = pRegion->Layers;
+                     // MIDI note-on velocity is used instead of note-off velocity
+                     itNoteOffEventOnKeyList->Param.Note.Velocity = pKey->Velocity;
+                     // now launch the required amount of voices
+                     for (int i = 0; i < voicesRequired; i++)
+                         LaunchVoice(pEngineChannel, itNoteOffEventOnKeyList, i, true, false, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples
+                 }
+                 pKey->ReleaseTrigger = false;
+             }
+         }
+         // if neither a voice was spawned or postponed on this key then remove note off event from key again
+         if (!pKey->Active && !pKey->VoiceTheftsQueued)
+             pKey->pEvents->free(itNoteOffEventOnKeyList);
      }
      /**
-      *  Moves pitchbend event from the general (input) event list to the pitch
+      *  Moves pitchbend event from the general (input) event list to the engine
-      *  event list.
+      *  channel's event list. It will actually processed later by the
+      *  respective voice.
       *
       *  @param pEngineChannel - engine channel on which this event occured on
       *  @param itPitchbendEvent - absolute pitch value and time stamp of the event
       */
      void Engine::ProcessPitchbend(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itPitchbendEvent) {
          pEngineChannel->Pitch = itPitchbendEvent->Param.Pitch.Pitch; // store current pitch value
-         itPitchbendEvent.moveToEndOf(pEngineChannel->pSynthesisEvents[Event::destination_vco]);
      }
      /**
-Line 640 
 namespace LinuxSampler { namespace gig {
+Line 946 
 namespace LinuxSampler { namespace gig {
       *  @param VoiceStealing       - if voice stealing should be performed
       *                               when there is no free voice
       *                               (optional, default = true)
+      *  @param HandleKeyGroupConflicts - if voices should be killed due to a
+      *                                   key group conflict
       *  @returns pointer to new voice or NULL if there was no free voice or
       *           if the voice wasn't triggered (for example when no region is
       *           defined for the given key).
       */
-     Pool<Voice>::Iterator Engine::LaunchVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent, int iLayer, bool ReleaseTriggerVoice, bool VoiceStealing) {
+     Pool<Voice>::Iterator Engine::LaunchVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent, int iLayer, bool ReleaseTriggerVoice, bool VoiceStealing, bool HandleKeyGroupConflicts) {
-         midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];
+         int MIDIKey            = itNoteOnEvent->Param.Note.Key;
+         midi_key_info_t* pKey  = &pEngineChannel->pMIDIKeyInfo[MIDIKey];
+         ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(MIDIKey);
+         // if nothing defined for this key
+         if (!pRegion) return Pool<Voice>::Iterator(); // nothing to do
+         // only mark the first voice of a layered voice (group) to be in a
+         // key group, so the layered voices won't kill each other
+         int iKeyGroup = (iLayer == 0 && !ReleaseTriggerVoice) ? pRegion->KeyGroup : 0;
+         // handle key group (a.k.a. exclusive group) conflicts
+         if (HandleKeyGroupConflicts) {
+             if (iKeyGroup) { // if this voice / key belongs to a key group
+                 uint** ppKeyGroup = &pEngineChannel->ActiveKeyGroups[iKeyGroup];
+                 if (*ppKeyGroup) { // if there's already an active key in that key group
+                     midi_key_info_t* pOtherKey = &pEngineChannel->pMIDIKeyInfo[**ppKeyGroup];
+                     // kill all voices on the (other) key
+                     RTList<Voice>::Iterator itVoiceToBeKilled = pOtherKey->pActiveVoices->first();
+                     RTList<Voice>::Iterator end               = pOtherKey->pActiveVoices->end();
+                     for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) {
+                         if (itVoiceToBeKilled->Type != Voice::type_release_trigger) {
+                             itVoiceToBeKilled->Kill(itNoteOnEvent);
+                             --VoiceSpawnsLeft; //FIXME: just a hack, we should better check in StealVoice() if the voice was killed due to key conflict
+                         }
+                     }
+                 }
+             }
+         }
+         Voice::type_t VoiceType = Voice::type_normal;
+         // get current dimension values to select the right dimension region
+         //TODO: for stolen voices this dimension region selection block is processed twice, this should be changed
+         //FIXME: controller values for selecting the dimension region here are currently not sample accurate
+         uint DimValues[8] = { 0 };
+         for (int i = pRegion->Dimensions - 1; i >= 0; i--) {
+             switch (pRegion->pDimensionDefinitions[i].dimension) {
+                 case ::gig::dimension_samplechannel:
+                     DimValues[i] = 0; //TODO: we currently ignore this dimension
+                     break;
+                 case ::gig::dimension_layer:
+                     DimValues[i] = iLayer;
+                     break;
+                 case ::gig::dimension_velocity:
+                     DimValues[i] = itNoteOnEvent->Param.Note.Velocity;
+                     break;
+                 case ::gig::dimension_channelaftertouch:
+                     DimValues[i] = pEngineChannel->ControllerTable[128];
+                     break;
+                 case ::gig::dimension_releasetrigger:
+                     VoiceType = (ReleaseTriggerVoice) ? Voice::type_release_trigger : (!iLayer) ? Voice::type_release_trigger_required : Voice::type_normal;
+                     DimValues[i] = (uint) ReleaseTriggerVoice;
+                     break;
+                 case ::gig::dimension_keyboard:
+                     DimValues[i] = (uint) (pEngineChannel->CurrentKeyDimension * pRegion->pDimensionDefinitions[i].zones);
+                     break;
+                 case ::gig::dimension_roundrobin:
+                     DimValues[i] = (uint) pEngineChannel->pMIDIKeyInfo[MIDIKey].RoundRobinIndex; // incremented for each note on
+                     break;
+                 case ::gig::dimension_random:
+                     RandomSeed   = RandomSeed * 1103515245 + 12345; // classic pseudo random number generator
+                     DimValues[i] = (uint) RandomSeed >> (32 - pRegion->pDimensionDefinitions[i].bits); // highest bits are most random
+                     break;
+                 case ::gig::dimension_modwheel:
+                     DimValues[i] = pEngineChannel->ControllerTable[1];
+                     break;
+                 case ::gig::dimension_breath:
+                     DimValues[i] = pEngineChannel->ControllerTable[2];
+                     break;
+                 case ::gig::dimension_foot:
+                     DimValues[i] = pEngineChannel->ControllerTable[4];
+                     break;
+                 case ::gig::dimension_portamentotime:
+                     DimValues[i] = pEngineChannel->ControllerTable[5];
+                     break;
+                 case ::gig::dimension_effect1:
+                     DimValues[i] = pEngineChannel->ControllerTable[12];
+                     break;
+                 case ::gig::dimension_effect2:
+                     DimValues[i] = pEngineChannel->ControllerTable[13];
+                     break;
+                 case ::gig::dimension_genpurpose1:
+                     DimValues[i] = pEngineChannel->ControllerTable[16];
+                     break;
+                 case ::gig::dimension_genpurpose2:
+                     DimValues[i] = pEngineChannel->ControllerTable[17];
+                     break;
+                 case ::gig::dimension_genpurpose3:
+                     DimValues[i] = pEngineChannel->ControllerTable[18];
+                     break;
+                 case ::gig::dimension_genpurpose4:
+                     DimValues[i] = pEngineChannel->ControllerTable[19];
+                     break;
+                 case ::gig::dimension_sustainpedal:
+                     DimValues[i] = pEngineChannel->ControllerTable[64];
+                     break;
+                 case ::gig::dimension_portamento:
+                     DimValues[i] = pEngineChannel->ControllerTable[65];
+                     break;
+                 case ::gig::dimension_sostenutopedal:
+                     DimValues[i] = pEngineChannel->ControllerTable[66];
+                     break;
+                 case ::gig::dimension_softpedal:
+                     DimValues[i] = pEngineChannel->ControllerTable[67];
+                     break;
+                 case ::gig::dimension_genpurpose5:
+                     DimValues[i] = pEngineChannel->ControllerTable[80];
+                     break;
+                 case ::gig::dimension_genpurpose6:
+                     DimValues[i] = pEngineChannel->ControllerTable[81];
+                     break;
+                 case ::gig::dimension_genpurpose7:
+                     DimValues[i] = pEngineChannel->ControllerTable[82];
+                     break;
+                 case ::gig::dimension_genpurpose8:
+                     DimValues[i] = pEngineChannel->ControllerTable[83];
+                     break;
+                 case ::gig::dimension_effect1depth:
+                     DimValues[i] = pEngineChannel->ControllerTable[91];
+                     break;
+                 case ::gig::dimension_effect2depth:
+                     DimValues[i] = pEngineChannel->ControllerTable[92];
+                     break;
+                 case ::gig::dimension_effect3depth:
+                     DimValues[i] = pEngineChannel->ControllerTable[93];
+                     break;
+                 case ::gig::dimension_effect4depth:
+                     DimValues[i] = pEngineChannel->ControllerTable[94];
+                     break;
+                 case ::gig::dimension_effect5depth:
+                     DimValues[i] = pEngineChannel->ControllerTable[95];
+                     break;
+                 case ::gig::dimension_none:
+                     std::cerr << "gig::Engine::LaunchVoice() Error: dimension=none\n" << std::flush;
+                     break;
+                 default:
+                     std::cerr << "gig::Engine::LaunchVoice() Error: Unknown dimension\n" << std::flush;
+             }
+         }
+         // return if this is a release triggered voice and there is no
+         // releasetrigger dimension (could happen if an instrument
+         // change has occured between note on and off)
+         if (ReleaseTriggerVoice && VoiceType != Voice::type_release_trigger) return Pool<Voice>::Iterator();
+         ::gig::DimensionRegion* pDimRgn = pRegion->GetDimensionRegionByValue(DimValues);
+         // no need to continue if sample is silent
+         if (!pDimRgn->pSample || !pDimRgn->pSample->SamplesTotal) return Pool<Voice>::Iterator();
          // allocate a new voice for the key
          Pool<Voice>::Iterator itNewVoice = pKey->pActiveVoices->allocAppend();
          if (itNewVoice) {
              // launch the new voice
-             if (itNewVoice->Trigger(pEngineChannel, itNoteOnEvent, pEngineChannel->Pitch, pEngineChannel->pInstrument, iLayer, ReleaseTriggerVoice, VoiceStealing) < 0) {
+             if (itNewVoice->Trigger(pEngineChannel, itNoteOnEvent, pEngineChannel->Pitch, pDimRgn, VoiceType, iKeyGroup) < 0) {
                  dmsg(4,("Voice not triggered\n"));
                  pKey->pActiveVoices->free(itNewVoice);
              }
              else { // on success
-                 uint** ppKeyGroup = NULL;
+                 --VoiceSpawnsLeft;
-                 if (itNewVoice->KeyGroup) { // if this voice / key belongs to a key group
-                     ppKeyGroup = &pEngineChannel->ActiveKeyGroups[itNewVoice->KeyGroup];
-                     if (*ppKeyGroup) { // if there's already an active key in that key group
-                         midi_key_info_t* pOtherKey = &pEngineChannel->pMIDIKeyInfo[**ppKeyGroup];
-                         // kill all voices on the (other) key
-                         RTList<Voice>::Iterator itVoiceToBeKilled = pOtherKey->pActiveVoices->first();
-                         RTList<Voice>::Iterator end               = pOtherKey->pActiveVoices->end();
-                         for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) {
-                             if (itVoiceToBeKilled->Type != Voice::type_release_trigger) itVoiceToBeKilled->Kill(itNoteOnEvent);
-                         }
-                     }
-                 }
                  if (!pKey->Active) { // mark as active key
                      pKey->Active = true;
                      pKey->itSelf = pEngineChannel->pActiveKeys->allocAppend();
                      *pKey->itSelf = itNoteOnEvent->Param.Note.Key;
                  }
                  if (itNewVoice->KeyGroup) {
+                     uint** ppKeyGroup = &pEngineChannel->ActiveKeyGroups[itNewVoice->KeyGroup];
                      *ppKeyGroup = &*pKey->itSelf; // put key as the (new) active key to its key group
                  }
                  if (itNewVoice->Type == Voice::type_release_trigger_required) pKey->ReleaseTrigger = true; // mark key for the need of release triggered voice(s)
-Line 682 
 namespace LinuxSampler { namespace gig {
+Line 1128 
 namespace LinuxSampler { namespace gig {
              }
          }
          else if (VoiceStealing) {
              // try to steal one voice
-             StealVoice(pEngineChannel, itNoteOnEvent);
+             int result = StealVoice(pEngineChannel, itNoteOnEvent);
+             if (!result) { // voice stolen successfully
-             // put note-on event into voice-stealing queue, so it will be reprocessed after killed voice died
+                 // put note-on event into voice-stealing queue, so it will be reprocessed after killed voice died
-             RTList<Event>::Iterator itStealEvent = pVoiceStealingQueue->allocAppend();
+                 RTList<Event>::Iterator itStealEvent = pVoiceStealingQueue->allocAppend();
-             if (itStealEvent) {
+                 if (itStealEvent) {
-                 *itStealEvent = *itNoteOnEvent; // copy event
+                     *itStealEvent = *itNoteOnEvent; // copy event
-                 itStealEvent->Param.Note.Layer = iLayer;
+                     itStealEvent->Param.Note.Layer = iLayer;
-                 itStealEvent->Param.Note.ReleaseTrigger = ReleaseTriggerVoice;
+                     itStealEvent->Param.Note.ReleaseTrigger = ReleaseTriggerVoice;
+                     pKey->VoiceTheftsQueued++;
+                 }
+                 else dmsg(1,("Voice stealing queue full!\n"));
              }
-             else dmsg(1,("Voice stealing queue full!\n"));
          }
          return Pool<Voice>::Iterator(); // no free voice or error
-Line 707 
 namespace LinuxSampler { namespace gig {
+Line 1154 
 namespace LinuxSampler { namespace gig {
       *
       *  @param pEngineChannel - engine channel on which this event occured on
       *  @param itNoteOnEvent - key, velocity and time stamp of the event
+      *  @returns 0 on success, a value < 0 if no active voice could be picked for voice stealing
       */
-     void Engine::StealVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {
+     int Engine::StealVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {
-         if (!VoiceTheftsLeft) {
+         if (VoiceSpawnsLeft <= 0) {
-             dmsg(1,("Max. voice thefts per audio fragment reached (you may raise MAX_AUDIO_VOICES).\n"));
+             dmsg(1,("Max. voice thefts per audio fragment reached (you may raise CONFIG_MAX_VOICES).\n"));
-             return;
+             return -1;
          }
          if (!pEventPool->poolIsEmpty()) {
              RTList<Voice>::Iterator itSelectedVoice;
              // Select one voice for voice stealing
-             switch (VOICE_STEAL_ALGORITHM) {
+             switch (CONFIG_VOICE_STEAL_ALGO) {
                  // try to pick the oldest voice on the key where the new
                  // voice should be spawned, if there is no voice on that
-                 // key, or no voice left to kill there, then procceed with
+                 // key, or no voice left to kill, then procceed with
                  // 'oldestkey' algorithm
                  case voice_steal_algo_oldestvoiceonkey: {
-                 #if 0 // FIXME: broken
                      midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];
-                     if (this->itLastStolenVoice) {
+                     itSelectedVoice = pSelectedKey->pActiveVoices->first();
-                         itSelectedVoice = this->itLastStolenVoice;
+                     // proceed iterating if voice was created in this fragment cycle
-                         ++itSelectedVoice;
+                     while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice;
-                     }
+                     // if we haven't found a voice then proceed with algorithm 'oldestkey'
-                     else { // no voice stolen in this audio fragment cycle yet
+                     if (itSelectedVoice && itSelectedVoice->IsStealable()) break;
-                         itSelectedVoice = pSelectedKey->pActiveVoices->first();
-                     }
-                     if (itSelectedVoice) {
-                         iuiSelectedKey = pSelectedKey->itSelf;
-                         break; // selection succeeded
-                     }
-                 #endif
                  } // no break - intentional !
                  // try to pick the oldest voice on the oldest active key
+                 // from the same engine channel
                  // (caution: must stay after 'oldestvoiceonkey' algorithm !)
                  case voice_steal_algo_oldestkey: {
+                     // if we already stole in this fragment, try to proceed on same key
                      if (this->itLastStolenVoice) {
                          itSelectedVoice = this->itLastStolenVoice;
-                         ++itSelectedVoice;
+                         do {
-                         if (itSelectedVoice) break; // selection succeeded
+                             ++itSelectedVoice;
-                         RTList<uint>::Iterator iuiSelectedKey = this->iuiLastStolenKey;
+                         } while (itSelectedVoice && !itSelectedVoice->IsStealable()); // proceed iterating if voice was created in this fragment cycle
-                         ++iuiSelectedKey;
+                         // found a "stealable" voice ?
-                         if (iuiSelectedKey) {
+                         if (itSelectedVoice && itSelectedVoice->IsStealable()) {
-                             this->iuiLastStolenKey = iuiSelectedKey;
+                             // remember which voice we stole, so we can simply proceed on next voice stealing
-                             midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];
+                             this->itLastStolenVoice = itSelectedVoice;
-                             itSelectedVoice = pSelectedKey->pActiveVoices->first();
                              break; // selection succeeded
                          }
                      }
+                     // get (next) oldest key
+                     RTList<uint>::Iterator iuiSelectedKey = (this->iuiLastStolenKey) ? ++this->iuiLastStolenKey : pEngineChannel->pActiveKeys->first();
+                     while (iuiSelectedKey) {
+                         midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];
+                         itSelectedVoice = pSelectedKey->pActiveVoices->first();
+                         // proceed iterating if voice was created in this fragment cycle
+                         while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice;
+                         // found a "stealable" voice ?
+                         if (itSelectedVoice && itSelectedVoice->IsStealable()) {
+                             // remember which voice on which key we stole, so we can simply proceed on next voice stealing
+                             this->iuiLastStolenKey  = iuiSelectedKey;
+                             this->itLastStolenVoice = itSelectedVoice;
+                             break; // selection succeeded
+                         }
+                         ++iuiSelectedKey; // get next oldest key
+                     }
                      break;
                  }
-Line 764 
 namespace LinuxSampler { namespace gig {
+Line 1221 
 namespace LinuxSampler { namespace gig {
                  case voice_steal_algo_none:
                  default: {
                      dmsg(1,("No free voice (voice stealing disabled)!\n"));
-                     return;
+                     return -1;
                  }
              }
-             // steal oldest voice on the oldest key from this or any other engine channel
+             // if we couldn't steal a voice from the same engine channel then
-             if (!itSelectedVoice) {
+             // steal oldest voice on the oldest key from any other engine channel
-                 EngineChannel* pSelectedChannel = (pLastStolenChannel) ? pLastStolenChannel : pEngineChannel;
+             // (the smaller engine channel number, the higher priority)
-                 int iChannelIndex = pSelectedChannel->iEngineIndexSelf;
+             if (!itSelectedVoice || !itSelectedVoice->IsStealable()) {
-                 while (true) {
+                 EngineChannel* pSelectedChannel;
-                     RTList<uint>::Iterator iuiSelectedKey = pSelectedChannel->pActiveKeys->first();
+                 int            iChannelIndex;
-                     if (iuiSelectedKey) {
+                 // select engine channel
+                 if (pLastStolenChannel) {
+                     pSelectedChannel = pLastStolenChannel;
+                     iChannelIndex    = pSelectedChannel->iEngineIndexSelf;
+                 } else { // pick the engine channel followed by this engine channel
+                     iChannelIndex    = (pEngineChannel->iEngineIndexSelf + 1) % engineChannels.size();
+                     pSelectedChannel = engineChannels[iChannelIndex];
+                 }
+                 // if we already stole in this fragment, try to proceed on same key
+                 if (this->itLastStolenVoiceGlobally) {
+                     itSelectedVoice = this->itLastStolenVoiceGlobally;
+                     do {
+                         ++itSelectedVoice;
+                     } while (itSelectedVoice && !itSelectedVoice->IsStealable()); // proceed iterating if voice was created in this fragment cycle
+                 }
+                 #if CONFIG_DEVMODE
+                 EngineChannel* pBegin = pSelectedChannel; // to detect endless loop
+                 #endif // CONFIG_DEVMODE
+                 // did we find a 'stealable' voice?
+                 if (itSelectedVoice && itSelectedVoice->IsStealable()) {
+                     // remember which voice we stole, so we can simply proceed on next voice stealing
+                     this->itLastStolenVoiceGlobally = itSelectedVoice;
+                 } else while (true) { // iterate through engine channels
+                     // get (next) oldest key
+                     RTList<uint>::Iterator iuiSelectedKey = (this->iuiLastStolenKeyGlobally) ? ++this->iuiLastStolenKeyGlobally : pSelectedChannel->pActiveKeys->first();
+                     this->iuiLastStolenKeyGlobally = RTList<uint>::Iterator(); // to prevent endless loop (see line above)
+                     while (iuiSelectedKey) {
                          midi_key_info_t* pSelectedKey = &pSelectedChannel->pMIDIKeyInfo[*iuiSelectedKey];
-                         itSelectedVoice    = pSelectedKey->pActiveVoices->first();
+                         itSelectedVoice = pSelectedKey->pActiveVoices->first();
-                         iuiLastStolenKey   = iuiSelectedKey;
+                         // proceed iterating if voice was created in this fragment cycle
-                         pLastStolenChannel = pSelectedChannel;
+                         while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice;
-                         break; // selection succeeded
+                         // found a "stealable" voice ?
+                         if (itSelectedVoice && itSelectedVoice->IsStealable()) {
+                             // remember which voice on which key on which engine channel we stole, so we can simply proceed on next voice stealing
+                             this->iuiLastStolenKeyGlobally  = iuiSelectedKey;
+                             this->itLastStolenVoiceGlobally = itSelectedVoice;
+                             this->pLastStolenChannel        = pSelectedChannel;
+                             goto stealable_voice_found; // selection succeeded
+                         }
+                         ++iuiSelectedKey; // get next key on current engine channel
                      }
+                     // get next engine channel
                      iChannelIndex    = (iChannelIndex + 1) % engineChannels.size();
-                     pSelectedChannel =  engineChannels[iChannelIndex];
+                     pSelectedChannel = engineChannels[iChannelIndex];
+                     #if CONFIG_DEVMODE
+                     if (pSelectedChannel == pBegin) {
+                         dmsg(1,("FATAL ERROR: voice stealing endless loop!\n"));
+                         dmsg(1,("VoiceSpawnsLeft=%d.\n", VoiceSpawnsLeft));
+                         dmsg(1,("Exiting.\n"));
+                         exit(-1);
+                     }
+                     #endif // CONFIG_DEVMODE
                  }
              }
-             //FIXME: can be removed, just a sanity check for debugging
+             // jump point if a 'stealable' voice was found
-             if (!itSelectedVoice->IsActive()) dmsg(1,("gig::Engine: ERROR, tried to steal a voice which was not active !!!\n"));
+             stealable_voice_found:
+             #if CONFIG_DEVMODE
+             if (!itSelectedVoice->IsActive()) {
+                 dmsg(1,("gig::Engine: ERROR, tried to steal a voice which was not active !!!\n"));
+                 return -1;
+             }
+             #endif // CONFIG_DEVMODE
              // now kill the selected voice
              itSelectedVoice->Kill(itNoteOnEvent);
-             // remember which voice we stole, so we can simply proceed for the next voice stealing
+             --VoiceSpawnsLeft;
-             itLastStolenVoice = itSelectedVoice;
-             --VoiceTheftsLeft;
+             return 0; // success
+         }
+         else {
+             dmsg(1,("Event pool emtpy!\n"));
+             return -1;
          }
-         else dmsg(1,("Event pool emtpy!\n"));
      }
      /**
-Line 815 
 namespace LinuxSampler { namespace gig {
+Line 1328 
 namespace LinuxSampler { namespace gig {
              uint keygroup = itVoice->KeyGroup;
+             // if the sample and dimension region belong to an
+             // instrument that is unloaded, tell the disk thread to
+             // release them
+             if (itVoice->Orphan) {
+                 pDiskThread->OrderDeletionOfDimreg(itVoice->pDimRgn);
+             }
              // free the voice object
              pVoicePool->free(itVoice);
-Line 856 
 namespace LinuxSampler { namespace gig {
+Line 1376 
 namespace LinuxSampler { namespace gig {
      void Engine::ProcessControlChange(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itControlChangeEvent) {
          dmsg(4,("Engine::ContinuousController cc=%d v=%d\n", itControlChangeEvent->Param.CC.Controller, itControlChangeEvent->Param.CC.Value));
+         // update controller value in the engine channel's controller table
+         pEngineChannel->ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value;
+         // handle hard coded MIDI controllers
          switch (itControlChangeEvent->Param.CC.Controller) {
+             case 5: { // portamento time
+                 pEngineChannel->PortamentoTime = (float) itControlChangeEvent->Param.CC.Value / 127.0f * (float) CONFIG_PORTAMENTO_TIME_MAX + (float) CONFIG_PORTAMENTO_TIME_MIN;
+                 break;
+             }
+             case 6: { // data entry (currently only used for RPN controllers)
+                 if (pEngineChannel->GetMidiRpnController() == 2) { // coarse tuning in half tones
+                     int transpose = (int) itControlChangeEvent->Param.CC.Value - 64;
+                     // limit to +- two octaves for now
+                     transpose = RTMath::Min(transpose,  24);
+                     transpose = RTMath::Max(transpose, -24);
+                     pEngineChannel->GlobalTranspose = transpose;
+                     // workaround, so we won't have hanging notes
+                     ReleaseAllVoices(pEngineChannel, itControlChangeEvent);
+                 }
+                 // to avoid other MIDI CC #6 messages to be misenterpreted as RPN controller data
+                 pEngineChannel->ResetMidiRpnController();
+                 break;
+             }
              case 7: { // volume
                  //TODO: not sample accurate yet
-                 pEngineChannel->GlobalVolume = (float) itControlChangeEvent->Param.CC.Value / 127.0f;
+                 pEngineChannel->MidiVolume = VolumeCurve[itControlChangeEvent->Param.CC.Value];
+                 pEngineChannel->bStatusChanged = true; // engine channel status has changed, so set notify flag
                  break;
              }
              case 10: { // panpot
                  //TODO: not sample accurate yet
-                 const int pan = (int) itControlChangeEvent->Param.CC.Value - 64;
+                 pEngineChannel->GlobalPanLeft  = PanCurve[128 - itControlChangeEvent->Param.CC.Value];
-                 pEngineChannel->GlobalPanLeft  = 1.0f - float(RTMath::Max(pan, 0)) /  63.0f;
+                 pEngineChannel->GlobalPanRight = PanCurve[itControlChangeEvent->Param.CC.Value];
-                 pEngineChannel->GlobalPanRight = 1.0f - float(RTMath::Min(pan, 0)) / -64.0f;
                  break;
              }
              case 64: { // sustain
                  if (itControlChangeEvent->Param.CC.Value >= 64 && !pEngineChannel->SustainPedal) {
-                     dmsg(4,("PEDAL DOWN\n"));
+                     dmsg(4,("DAMPER (RIGHT) 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();
-                     if (iuiKey) {
+                     for (; iuiKey; ++iuiKey) {
-                         itControlChangeEvent->Type = Event::type_cancel_release; // transform event type
+                         midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
-                         while (iuiKey) {
+                         if (!pKey->KeyPressed) {
-                             midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
+                             RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
-                             ++iuiKey;
+                             if (itNewEvent) {
-                             if (!pKey->KeyPressed) {
+                                 *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list
-                                 RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
+                                 itNewEvent->Type = Event::type_cancel_release; // transform event type
-                                 if (itNewEvent) *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list
-                                 else dmsg(1,("Event pool emtpy!\n"));
                              }
+                             else dmsg(1,("Event pool emtpy!\n"));
                          }
                      }
                  }
                  if (itControlChangeEvent->Param.CC.Value < 64 && pEngineChannel->SustainPedal) {
-                     dmsg(4,("PEDAL UP\n"));
+                     dmsg(4,("DAMPER (RIGHT) 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();
-                     if (iuiKey) {
+                     for (; iuiKey; ++iuiKey) {
-                         itControlChangeEvent->Type = Event::type_release; // transform event type
+                         midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
-                         while (iuiKey) {
+                         if (!pKey->KeyPressed && ShouldReleaseVoice(pEngineChannel, *iuiKey)) {
-                             midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
+                             RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
-                             ++iuiKey;
+                             if (itNewEvent) {
-                             if (!pKey->KeyPressed) {
+                                 *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list
-                                 RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
+                                 itNewEvent->Type = Event::type_release; // transform event type
-                                 if (itNewEvent) *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list
-                                 else dmsg(1,("Event pool emtpy!\n"));
                              }
+                             else dmsg(1,("Event pool emtpy!\n"));
                          }
                      }
                  }
                  break;
              }
-         }
+             case 65: { // portamento on / off
+                 KillAllVoices(pEngineChannel, itControlChangeEvent);
+                 pEngineChannel->PortamentoMode = itControlChangeEvent->Param.CC.Value >= 64;
+                 break;
+             }
+             case 66: { // sostenuto
+                 if (itControlChangeEvent->Param.CC.Value >= 64 && !pEngineChannel->SostenutoPedal) {
+                     dmsg(4,("SOSTENUTO (CENTER) PEDAL DOWN\n"));
+                     pEngineChannel->SostenutoPedal = true;
+                     #if !CONFIG_PROCESS_MUTED_CHANNELS
+                     if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted
+                     #endif
+                     SostenutoKeyCount = 0;
+                     // Remeber the pressed keys
+                     RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
+                     for (; iuiKey; ++iuiKey) {
+                         midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
+                         if (pKey->KeyPressed && SostenutoKeyCount < 128) SostenutoKeys[SostenutoKeyCount++] = *iuiKey;
+                     }
+                 }
+                 if (itControlChangeEvent->Param.CC.Value < 64 && pEngineChannel->SostenutoPedal) {
+                     dmsg(4,("SOSTENUTO (CENTER) PEDAL UP\n"));
+                     pEngineChannel->SostenutoPedal = false;
+                     #if !CONFIG_PROCESS_MUTED_CHANNELS
+                     if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted
+                     #endif
+                     // release voices if the damper pedal is up and their respective key is not pressed
+                     for (int i = 0; i < SostenutoKeyCount; i++) {
+                         midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[SostenutoKeys[i]];
+                         if (!pKey->KeyPressed && !pEngineChannel->SustainPedal) {
+                             RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
+                             if (itNewEvent) {
+                                 *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list
+                                 itNewEvent->Type = Event::type_release; // transform event type
+                             }
+                             else dmsg(1,("Event pool emtpy!\n"));
+                         }
+                     }
+                 }
+                 break;
+             }
+             case 100: { // RPN controller LSB
+                 pEngineChannel->SetMidiRpnControllerLsb(itControlChangeEvent->Param.CC.Value);
+                 break;
+             }
+             case 101: { // RPN controller MSB
+                 pEngineChannel->SetMidiRpnControllerMsb(itControlChangeEvent->Param.CC.Value);
+                 break;
+             }
-         // update controller value in the engine's controller table
-         pEngineChannel->ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value;
-         // move event from the unsorted event list to the control change event list
+             // Channel Mode Messages
-         itControlChangeEvent.moveToEndOf(pEngineChannel->pCCEvents);
+             case 120: { // all sound off
+                 KillAllVoices(pEngineChannel, itControlChangeEvent);
+                 break;
+             }
+             case 121: { // reset all controllers
+                 pEngineChannel->ResetControllers();
+                 break;
+             }
+             case 123: { // all notes off
+                 #if CONFIG_PROCESS_ALL_NOTES_OFF
+                 ReleaseAllVoices(pEngineChannel, itControlChangeEvent);
+                 #endif // CONFIG_PROCESS_ALL_NOTES_OFF
+                 break;
+             }
+             case 126: { // mono mode on
+                 KillAllVoices(pEngineChannel, itControlChangeEvent);
+                 pEngineChannel->SoloMode = true;
+                 break;
+             }
+             case 127: { // poly mode on
+                 KillAllVoices(pEngineChannel, itControlChangeEvent);
+                 pEngineChannel->SoloMode = false;
+                 break;
+             }
+         }
+         // handle FX send controllers
+         if (!pEngineChannel->fxSends.empty()) {
+             for (int iFxSend = 0; iFxSend < pEngineChannel->GetFxSendCount(); iFxSend++) {
+                 FxSend* pFxSend = pEngineChannel->GetFxSend(iFxSend);
+                 if (pFxSend->MidiController() == itControlChangeEvent->Param.CC.Controller)
+                     pFxSend->SetLevel(itControlChangeEvent->Param.CC.Value);
+                     pFxSend->SetInfoChanged(true);
+             }
+         }
      }
      /**
-Line 925 
 namespace LinuxSampler { namespace gig {
+Line 1558 
 namespace LinuxSampler { namespace gig {
       *  @param itSysexEvent - sysex data size and time stamp of the sysex event
       */
      void Engine::ProcessSysex(Pool<Event>::Iterator& itSysexEvent) {
-         RingBuffer<uint8_t>::NonVolatileReader reader = pSysexBuffer->get_non_volatile_reader();
+         RingBuffer<uint8_t,false>::NonVolatileReader reader = pSysexBuffer->get_non_volatile_reader();
          uint8_t exclusive_status, id;
          if (!reader.pop(&exclusive_status)) goto free_sysex_data;
-Line 934 
 namespace LinuxSampler { namespace gig {
+Line 1567 
 namespace LinuxSampler { namespace gig {
          switch (id) {
              case 0x41: { // Roland
+                 dmsg(3,("Roland Sysex\n"));
                  uint8_t device_id, model_id, cmd_id;
                  if (!reader.pop(&device_id)) goto free_sysex_data;
                  if (!reader.pop(&model_id))  goto free_sysex_data;
-Line 943 
 namespace LinuxSampler { namespace gig {
+Line 1577 
 namespace LinuxSampler { namespace gig {
                  // command address
                  uint8_t addr[3]; // 2 byte addr MSB, followed by 1 byte addr LSB)
-                 const RingBuffer<uint8_t>::NonVolatileReader checksum_reader = reader; // so we can calculate the check sum later
+                 const RingBuffer<uint8_t,false>::NonVolatileReader checksum_reader = reader; // so we can calculate the check sum later
                  if (reader.read(&addr[0], 3) != 3) goto free_sysex_data;
                  if (addr[0] == 0x40 && addr[1] == 0x00) { // System Parameters
+                     dmsg(3,("\tSystem Parameter\n"));
                  }
                  else if (addr[0] == 0x40 && addr[1] == 0x01) { // Common Parameters
+                     dmsg(3,("\tCommon Parameter\n"));
                  }
                  else if (addr[0] == 0x40 && (addr[1] & 0xf0) == 0x10) { // Part Parameters (1)
-                     switch (addr[3]) {
+                     dmsg(3,("\tPart Parameter\n"));
+                     switch (addr[2]) {
                          case 0x40: { // scale tuning
+                             dmsg(3,("\t\tScale Tuning\n"));
                              uint8_t scale_tunes[12]; // detuning of all 12 semitones of an octave
                              if (reader.read(&scale_tunes[0], 12) != 12) goto free_sysex_data;
                              uint8_t checksum;
-                             if (!reader.pop(&checksum))                      goto free_sysex_data;
+                             if (!reader.pop(&checksum)) goto free_sysex_data;
-                             if (GSCheckSum(checksum_reader, 12) != checksum) goto free_sysex_data;
+                             #if CONFIG_ASSERT_GS_SYSEX_CHECKSUM
+                             if (GSCheckSum(checksum_reader, 12)) goto free_sysex_data;
+                             #endif // CONFIG_ASSERT_GS_SYSEX_CHECKSUM
                              for (int i = 0; i < 12; i++) scale_tunes[i] -= 64;
                              AdjustScale((int8_t*) scale_tunes);
+                             dmsg(3,("\t\t\tNew scale applied.\n"));
                              break;
                          }
                      }
-Line 983 
 namespace LinuxSampler { namespace gig {
+Line 1624 
 namespace LinuxSampler { namespace gig {
       *                     question
       * @param DataSize   - size of the GS message data (in bytes)
       */
-     uint8_t Engine::GSCheckSum(const RingBuffer<uint8_t>::NonVolatileReader AddrReader, uint DataSize) {
+     uint8_t Engine::GSCheckSum(const RingBuffer<uint8_t,false>::NonVolatileReader AddrReader, uint DataSize) {
-         RingBuffer<uint8_t>::NonVolatileReader reader = AddrReader;
+         RingBuffer<uint8_t,false>::NonVolatileReader reader = AddrReader;
          uint bytes = 3 /*addr*/ + DataSize;
          uint8_t addr_and_data[bytes];
          reader.read(&addr_and_data[0], bytes);
-Line 1003 
 namespace LinuxSampler { namespace gig {
+Line 1644 
 namespace LinuxSampler { namespace gig {
      }
      /**
-      * Initialize the parameter sequence for the modulation destination given by
+      * Releases all voices on an engine channel. All voices will go into
-      * by 'dst' with the constant value given by val.
+      * the release stage and thus it might take some time (e.g. dependant to
+      * their envelope release time) until they actually die.
+      *
+      * @param pEngineChannel - engine channel on which all voices should be released
+      * @param itReleaseEvent - event which caused this releasing of all voices
+      */
+     void Engine::ReleaseAllVoices(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itReleaseEvent) {
+         RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
+         while (iuiKey) {
+             midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
+             ++iuiKey;
+             // append a 'release' event to the key's own event list
+             RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
+             if (itNewEvent) {
+                 *itNewEvent = *itReleaseEvent; // copy original event (to the key's event list)
+                 itNewEvent->Type = Event::type_release; // transform event type
+             }
+             else dmsg(1,("Event pool emtpy!\n"));
+         }
+     }
+     /**
+      * Kills all voices on an engine channel as soon as possible. Voices
+      * won't get into release state, their volume level will be ramped down
+      * as fast as possible.
+      *
+      * @param pEngineChannel - engine channel on which all voices should be killed
+      * @param itKillEvent    - event which caused this killing of all voices
       */
-     void Engine::ResetSynthesisParameters(Event::destination_t dst, float val) {
+     void Engine::KillAllVoices(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itKillEvent) {
-         int maxsamples = pAudioOutputDevice->MaxSamplesPerCycle();
+         RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
-         float* m = &pSynthesisParameters[dst][0];
+         RTList<uint>::Iterator end    = pEngineChannel->pActiveKeys->end();
-         for (int i = 0; i < maxsamples; i += 4) {
+         while (iuiKey != end) { // iterate through all active keys
-            m[i]   = val;
+             midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
-            m[i+1] = val;
+             ++iuiKey;
-            m[i+2] = val;
+             RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
-            m[i+3] = val;
+             RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
+             for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
+                 itVoice->Kill(itKillEvent);
+                 --VoiceSpawnsLeft; //FIXME: just a temporary workaround, we should check the cause in StealVoice() instead
+             }
          }
      }
+     /**
+      * Determines whether the specified voice should be released.
+      *
+      * @param pEngineChannel - The engine channel on which the voice should be checked
+      * @param Key - The key number
+      * @returns true if the specified should be released, false otherwise.
+      */
+     bool Engine::ShouldReleaseVoice(EngineChannel* pEngineChannel, int Key) {
+         if (pEngineChannel->SustainPedal) return false;
+         if (pEngineChannel->SostenutoPedal) {
+             for (int i = 0; i < SostenutoKeyCount; i++)
+                 if (Key == SostenutoKeys[i]) return false;
+         }
+         return true;
+     }
      uint Engine::VoiceCount() {
          return ActiveVoiceCount;
      }
-Line 1046 
 namespace LinuxSampler { namespace gig {
+Line 1736 
 namespace LinuxSampler { namespace gig {
      }
      String Engine::EngineName() {
-         return "GigEngine";
+         return LS_GIG_ENGINE_NAME;
      }
      String Engine::Description() {
-Line 1054 
 namespace LinuxSampler { namespace gig {
+Line 1744 
 namespace LinuxSampler { namespace gig {
      }
      String Engine::Version() {
-         String s = "$Revision: 1.32 $";
+         String s = "$Revision: 1.78 $";
          return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword
      }
+     InstrumentManager* Engine::GetInstrumentManager() {
+         return &instruments;
+     }
+     // static constant initializers
+     const float* Engine::VolumeCurve(InitVolumeCurve());
+     const float* Engine::PanCurve(InitPanCurve());
+     const float* Engine::CrossfadeCurve(InitCrossfadeCurve());
+     float* Engine::InitVolumeCurve() {
+         // line-segment approximation
+         const float segments[] = {
+, 0, 2, 0.0046, 16, 0.016, 31, 0.051, 45, 0.115, 54.5, 0.2,
+.5, 0.39, 74, 0.74, 92, 1.03, 114, 1.94, 119.2, 2.2, 127, 2.2
+         };
+         return InitCurve(segments);
+     }
+     float* Engine::InitPanCurve() {
+         // line-segment approximation
+         const float segments[] = {
+, 0, 1, 0,
+, 0.05, 31.5, 0.7, 51, 0.851, 74.5, 1.12,
+, 1.41, 128, 1.41
+         };
+         return InitCurve(segments, 129);
+     }
+     float* Engine::InitCrossfadeCurve() {
+         // line-segment approximation
+         const float segments[] = {
+, 0, 1, 0.03, 10, 0.1, 51, 0.58, 127, 1
+         };
+         return InitCurve(segments);
+     }
+     float* Engine::InitCurve(const float* segments, int size) {
+         float* y = new float[size];
+         for (int x = 0 ; x < size ; x++) {
+             if (x > segments[2]) segments += 2;
+             y[x] = segments[1] + (x - segments[0]) *
+                 (segments[3] - segments[1]) / (segments[2] - segments[0]);
+         }
+         return y;
+     }
+     /**
+      * Changes the instrument for an engine channel.
+      *
+      * @param pEngineChannel - engine channel on which the instrument
+      *                         should be changed
+      * @param pInstrument - new instrument
+      * @returns a list of dimension regions from the old instrument
+      *          that are still in use
+      */
+     ::gig::DimensionRegion** Engine::ChangeInstrument(EngineChannel* pEngineChannel, ::gig::Instrument* pInstrument) {
+         instrument_change_command_t command;
+         command.pEngineChannel = pEngineChannel;
+         command.pInstrument = pInstrument;
+         InstrumentChangeQueue->push(&command);
+         // wait for the audio thread to confirm that the instrument
+         // change has been done
+         instrument_change_reply_t reply;
+         while (InstrumentChangeReplyQueue->pop(&reply) == 0) {
+             usleep(10000);
+         }
+         return pDimRegionsInUse;
+     }
  }} // namespace LinuxSampler::gig

 Legend:



Removed from v.466
 


changed lines


 
Added in v.1297
 Legend:



Removed from v.466
 


changed lines


 
Added in v.1297
-Removed from v.466
+Added in v.1297

	ViewVC Help
Powered by ViewVC