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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 438 by persson, Wed Mar 9 22:12:15 2005 UTC revision 690 by schoenebeck, Fri Jul 15 16:43:56 2005 UTC
# Line 64  namespace LinuxSampler { namespace gig { Line 64  namespace LinuxSampler { namespace gig {
64              engines[pDevice] = pEngine;              engines[pDevice] = pEngine;
65          }          }
66          // register engine channel to the engine instance          // register engine channel to the engine instance
67          pEngine->engineChannels.push_back(pChannel);          pEngine->engineChannels.add(pChannel);
68            // remember index in the ArrayList
69            pChannel->iEngineIndexSelf = pEngine->engineChannels.size() - 1;
70          dmsg(4,("This gig::Engine has now %d EngineChannels.\n",pEngine->engineChannels.size()));          dmsg(4,("This gig::Engine has now %d EngineChannels.\n",pEngine->engineChannels.size()));
71          return pEngine;          return pEngine;
72      }      }
# Line 94  namespace LinuxSampler { namespace gig { Line 96  namespace LinuxSampler { namespace gig {
96          else dmsg(4,("This gig::Engine has now %d EngineChannels.\n",pEngine->engineChannels.size()));          else dmsg(4,("This gig::Engine has now %d EngineChannels.\n",pEngine->engineChannels.size()));
97      }      }
98    
99        /**
100         * Constructor
101         */
102      Engine::Engine() {      Engine::Engine() {
103          pAudioOutputDevice = NULL;          pAudioOutputDevice = NULL;
104          pDiskThread        = NULL;          pDiskThread        = NULL;
105          pEventGenerator    = NULL;          pEventGenerator    = NULL;
106          pSysexBuffer       = new RingBuffer<uint8_t>(SYSEX_BUFFER_SIZE, 0);          pSysexBuffer       = new RingBuffer<uint8_t>(CONFIG_SYSEX_BUFFER_SIZE, 0);
107          pEventQueue        = new RingBuffer<Event>(MAX_EVENTS_PER_FRAGMENT, 0);          pEventQueue        = new RingBuffer<Event>(CONFIG_MAX_EVENTS_PER_FRAGMENT, 0);
108          pEventPool         = new Pool<Event>(MAX_EVENTS_PER_FRAGMENT);          pEventPool         = new Pool<Event>(CONFIG_MAX_EVENTS_PER_FRAGMENT);
109          pVoicePool         = new Pool<Voice>(MAX_AUDIO_VOICES);          pVoicePool         = new Pool<Voice>(CONFIG_MAX_VOICES);
110          pVoiceStealingQueue = new RTList<Event>(pEventPool);          pVoiceStealingQueue = new RTList<Event>(pEventPool);
111          pEvents            = new RTList<Event>(pEventPool);          pGlobalEvents      = new RTList<Event>(pEventPool);
         pCCEvents          = new RTList<Event>(pEventPool);  
   
         for (uint i = 0; i < Event::destination_count; i++) {  
             pSynthesisEvents[i] = new RTList<Event>(pEventPool);  
         }  
112          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
113              iterVoice->SetEngine(this);              iterVoice->SetEngine(this);
114          }          }
# Line 119  namespace LinuxSampler { namespace gig { Line 119  namespace LinuxSampler { namespace gig {
119          pMainFilterParameters   = NULL;          pMainFilterParameters   = NULL;
120    
121          ResetInternal();          ResetInternal();
122            ResetScaleTuning();
123      }      }
124    
125        /**
126         * Destructor
127         */
128      Engine::~Engine() {      Engine::~Engine() {
129          if (pDiskThread) {          if (pDiskThread) {
130              dmsg(1,("Stopping disk thread..."));              dmsg(1,("Stopping disk thread..."));
# Line 128  namespace LinuxSampler { namespace gig { Line 132  namespace LinuxSampler { namespace gig {
132              delete pDiskThread;              delete pDiskThread;
133              dmsg(1,("OK\n"));              dmsg(1,("OK\n"));
134          }          }
         for (uint i = 0; i < Event::destination_count; i++) {  
             if (pSynthesisEvents[i]) delete pSynthesisEvents[i];  
         }  
         if (pEvents)     delete pEvents;  
         if (pCCEvents)   delete pCCEvents;  
135          if (pEventQueue) delete pEventQueue;          if (pEventQueue) delete pEventQueue;
136          if (pEventPool)  delete pEventPool;          if (pEventPool)  delete pEventPool;
137          if (pVoicePool) {          if (pVoicePool) {
# Line 173  namespace LinuxSampler { namespace gig { Line 172  namespace LinuxSampler { namespace gig {
172      void Engine::Reset() {      void Engine::Reset() {
173          DisableAndLock();          DisableAndLock();
174          ResetInternal();          ResetInternal();
175            ResetScaleTuning();
176          Enable();          Enable();
177      }      }
178    
# Line 186  namespace LinuxSampler { namespace gig { Line 186  namespace LinuxSampler { namespace gig {
186    
187          // reset voice stealing parameters          // reset voice stealing parameters
188          pVoiceStealingQueue->clear();          pVoiceStealingQueue->clear();
189            itLastStolenVoice          = RTList<Voice>::Iterator();
190          // reset to normal chromatic scale (means equal temper)          itLastStolenVoiceGlobally  = RTList<Voice>::Iterator();
191          memset(&ScaleTuning[0], 0x00, 12);          iuiLastStolenKey           = RTList<uint>::Iterator();
192            iuiLastStolenKeyGlobally   = RTList<uint>::Iterator();
193            pLastStolenChannel         = NULL;
194    
195          // reset all voices          // reset all voices
196          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
# Line 203  namespace LinuxSampler { namespace gig { Line 205  namespace LinuxSampler { namespace gig {
205          pEventQueue->init();          pEventQueue->init();
206      }      }
207    
208        /**
209         * Reset to normal, chromatic scale (means equal tempered).
210         */
211        void Engine::ResetScaleTuning() {
212            memset(&ScaleTuning[0], 0x00, 12);
213        }
214    
215        /**
216         * Connect this engine instance with the given audio output device.
217         * This method will be called when an Engine instance is created.
218         * All of the engine's data structures which are dependant to the used
219         * audio output device / driver will be (re)allocated and / or
220         * adjusted appropriately.
221         *
222         * @param pAudioOut - audio output device to connect to
223         */
224      void Engine::Connect(AudioOutputDevice* pAudioOut) {      void Engine::Connect(AudioOutputDevice* pAudioOut) {
225          pAudioOutputDevice = pAudioOut;          pAudioOutputDevice = pAudioOut;
226    
# Line 217  namespace LinuxSampler { namespace gig { Line 235  namespace LinuxSampler { namespace gig {
235              throw LinuxSamplerException(msg);              throw LinuxSamplerException(msg);
236          }          }
237    
238          this->MaxSamplesPerCycle      = pAudioOutputDevice->MaxSamplesPerCycle();          this->MaxSamplesPerCycle = pAudioOutputDevice->MaxSamplesPerCycle();
239          this->SampleRate              = pAudioOutputDevice->SampleRate();          this->SampleRate         = pAudioOutputDevice->SampleRate();
240    
241          // FIXME: audio drivers with varying fragment sizes might be a problem here          // FIXME: audio drivers with varying fragment sizes might be a problem here
242          MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * EG_MIN_RELEASE_TIME) - 1;          MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * CONFIG_EG_MIN_RELEASE_TIME) - 1;
243          if (MaxFadeOutPos < 0)          if (MaxFadeOutPos < 0) {
244              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 "
245                          << "too big for current audio fragment size & sampling rate! "
246                          << "May lead to click sounds if voice stealing chimes in!\n" << std::flush;
247                // force volume ramp downs at the beginning of each fragment
248                MaxFadeOutPos = 0;
249                // lower minimum release time
250                const float minReleaseTime = (float) MaxSamplesPerCycle / (float) SampleRate;
251                for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
252                    iterVoice->pEG1->CalculateFadeOutCoeff(minReleaseTime, SampleRate);
253                }
254                pVoicePool->clear();
255            }
256    
257          // (re)create disk thread          // (re)create disk thread
258          if (this->pDiskThread) {          if (this->pDiskThread) {
# Line 232  namespace LinuxSampler { namespace gig { Line 261  namespace LinuxSampler { namespace gig {
261              delete this->pDiskThread;              delete this->pDiskThread;
262              dmsg(1,("OK\n"));              dmsg(1,("OK\n"));
263          }          }
264          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
265          if (!pDiskThread) {          if (!pDiskThread) {
266              dmsg(0,("gig::Engine  new diskthread = NULL\n"));              dmsg(0,("gig::Engine  new diskthread = NULL\n"));
267              exit(EXIT_FAILURE);              exit(EXIT_FAILURE);
# Line 277  namespace LinuxSampler { namespace gig { Line 306  namespace LinuxSampler { namespace gig {
306          }          }
307      }      }
308    
309        /**
310         * Clear all engine global event lists.
311         */
312      void Engine::ClearEventLists() {      void Engine::ClearEventLists() {
313          pEvents->clear();          pGlobalEvents->clear();
         pCCEvents->clear();  
         for (uint i = 0; i < Event::destination_count; i++) {  
             pSynthesisEvents[i]->clear();  
         }  
314      }      }
315    
316      /**      /**
317       * Copy all events from the given input queue buffer to the engine's       * Copy all events from the engine's global input queue buffer to the
318       * internal event list. This will be done at the beginning of each audio       * engine's internal event list. This will be done at the beginning of
319       * cycle (that is each RenderAudio() call) to get all events which have       * each audio cycle (that is each RenderAudio() call) to distinguish
320       * to be processed in the current audio cycle. Each EngineChannel has       * all global events which have to be processed in the current audio
321       * it's own input event queue for the common channel specific events       * cycle. These events are usually just SysEx messages. Every
322       * (like NoteOn, NoteOff and ControlChange events). Beside that, the       * EngineChannel has it's own input event queue buffer and event list
323       * engine also has a input event queue for global events (usually SysEx       * to handle common events like NoteOn, NoteOff and ControlChange
324       * message).       * events.
325       *       *
326       * @param pEventQueue - input event buffer to read from       * @param Samples - number of sample points to be processed in the
327       * @param Samples     - number of sample points to be processed in the       *                  current audio cycle
      *                      current audio cycle  
328       */       */
329      void Engine::ImportEvents(RingBuffer<Event>* pEventQueue, uint Samples) {      void Engine::ImportEvents(uint Samples) {
330          RingBuffer<Event>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();          RingBuffer<Event>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();
331          Event* pEvent;          Event* pEvent;
332          while (true) {          while (true) {
# Line 313  namespace LinuxSampler { namespace gig { Line 340  namespace LinuxSampler { namespace gig {
340                  break;                  break;
341              }              }
342              // copy event to internal event list              // copy event to internal event list
343              if (pEvents->poolIsEmpty()) {              if (pGlobalEvents->poolIsEmpty()) {
344                  dmsg(1,("Event pool emtpy!\n"));                  dmsg(1,("Event pool emtpy!\n"));
345                  break;                  break;
346              }              }
347              *pEvents->allocAppend() = *pEvent;              *pGlobalEvents->allocAppend() = *pEvent;
348          }          }
349          eventQueueReader.free(); // free all copied events from input queue          eventQueueReader.free(); // free all copied events from input queue
350      }      }
# Line 344  namespace LinuxSampler { namespace gig { Line 371  namespace LinuxSampler { namespace gig {
371          // update time of start and end of this audio fragment (as events' time stamps relate to this)          // update time of start and end of this audio fragment (as events' time stamps relate to this)
372          pEventGenerator->UpdateFragmentTime(Samples);          pEventGenerator->UpdateFragmentTime(Samples);
373    
374          // empty the engine's event lists for the new fragment          // We only allow a maximum of CONFIG_MAX_VOICES voices to be spawned
375          ClearEventLists();          // in each audio fragment. All subsequent request for spawning new
376            // voices in the same audio fragment will be ignored.
377            VoiceSpawnsLeft = CONFIG_MAX_VOICES;
378    
379          // get all events from the engine's global input event queue which belong to the current fragment          // get all events from the engine's global input event queue which belong to the current fragment
380          // (these are usually just SysEx messages)          // (these are usually just SysEx messages)
381          ImportEvents(this->pEventQueue, Samples);          ImportEvents(Samples);
382    
383          // process engine global events (these are currently only MIDI System Exclusive messages)          // process engine global events (these are currently only MIDI System Exclusive messages)
384          {          {
385              RTList<Event>::Iterator itEvent = pEvents->first();              RTList<Event>::Iterator itEvent = pGlobalEvents->first();
386              RTList<Event>::Iterator end     = pEvents->end();              RTList<Event>::Iterator end     = pGlobalEvents->end();
387              for (; itEvent != end; ++itEvent) {              for (; itEvent != end; ++itEvent) {
388                  switch (itEvent->Type) {                  switch (itEvent->Type) {
389                      case Event::type_sysex:                      case Event::type_sysex:
# Line 368  namespace LinuxSampler { namespace gig { Line 397  namespace LinuxSampler { namespace gig {
397          // reset internal voice counter (just for statistic of active voices)          // reset internal voice counter (just for statistic of active voices)
398          ActiveVoiceCountTemp = 0;          ActiveVoiceCountTemp = 0;
399    
400          // render audio for all engine channels          // handle events on all engine channels
401          // TODO: should we make voice stealing engine globally? unfortunately this would mean other disadvantages so I left voice stealing in the engine channel space for now          for (int i = 0; i < engineChannels.size(); i++) {
402          {              if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded
403              std::list<EngineChannel*>::iterator itChannel = engineChannels.begin();              ProcessEvents(engineChannels[i], Samples);
404              std::list<EngineChannel*>::iterator end       = engineChannels.end();          }
405              for (; itChannel != end; itChannel++) {  
406                  if (!(*itChannel)->pInstrument) continue; // ignore if no instrument loaded          // render all 'normal', active voices on all engine channels
407                  RenderAudio(*itChannel, Samples);          for (int i = 0; i < engineChannels.size(); i++) {
408              }              if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded
409                RenderActiveVoices(engineChannels[i], Samples);
410            }
411    
412            // now that all ordinary voices on ALL engine channels are rendered, render new stolen voices
413            RenderStolenVoices(Samples);
414    
415            // handle cleanup on all engine channels for the next audio fragment
416            for (int i = 0; i < engineChannels.size(); i++) {
417                if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded
418                PostProcess(engineChannels[i]);
419          }          }
420    
421    
422            // empty the engine's event list for the next audio fragment
423            ClearEventLists();
424    
425            // reset voice stealing for the next audio fragment
426            pVoiceStealingQueue->clear();
427    
428          // just some statistics about this engine instance          // just some statistics about this engine instance
429          ActiveVoiceCount = ActiveVoiceCountTemp;          ActiveVoiceCount = ActiveVoiceCountTemp;
430          if (ActiveVoiceCount > ActiveVoiceCountMax) ActiveVoiceCountMax = ActiveVoiceCount;          if (ActiveVoiceCount > ActiveVoiceCountMax) ActiveVoiceCountMax = ActiveVoiceCount;
431    
432            FrameTime += Samples;
433    
434          return 0;          return 0;
435      }      }
436    
437      void Engine::RenderAudio(EngineChannel* pEngineChannel, uint Samples) {      /**
438          // empty the engine's event lists for the new fragment       * Dispatch and handle all events in this audio fragment for the given
439          ClearEventLists();       * engine channel.
440          // empty the engine channel's, MIDI key specific event lists       *
441          {       * @param pEngineChannel - engine channel on which events should be
442              RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();       *                         processed
443              RTList<uint>::Iterator end    = pEngineChannel->pActiveKeys->end();       * @param Samples        - amount of sample points to be processed in
444              for(; iuiKey != end; ++iuiKey) {       *                         this audio fragment cycle
445                  pEngineChannel->pMIDIKeyInfo[*iuiKey].pEvents->clear(); // free all events on the key       */
446              }      void Engine::ProcessEvents(EngineChannel* pEngineChannel, uint Samples) {
         }  
   
   
447          // get all events from the engine channels's input event queue which belong to the current fragment          // get all events from the engine channels's input event queue which belong to the current fragment
448          // (these are the common events like NoteOn, NoteOff, ControlChange, etc.)          // (these are the common events like NoteOn, NoteOff, ControlChange, etc.)
449          ImportEvents(pEngineChannel->pEventQueue, Samples);          pEngineChannel->ImportEvents(Samples);
   
450    
451          // process events          // process events
452          {          {
453              RTList<Event>::Iterator itEvent = pEvents->first();              RTList<Event>::Iterator itEvent = pEngineChannel->pEvents->first();
454              RTList<Event>::Iterator end     = pEvents->end();              RTList<Event>::Iterator end     = pEngineChannel->pEvents->end();
455              for (; itEvent != end; ++itEvent) {              for (; itEvent != end; ++itEvent) {
456                  switch (itEvent->Type) {                  switch (itEvent->Type) {
457                      case Event::type_note_on:                      case Event::type_note_on:
# Line 430  namespace LinuxSampler { namespace gig { Line 474  namespace LinuxSampler { namespace gig {
474              }              }
475          }          }
476    
477            // reset voice stealing for the next engine channel (or next audio fragment)
478            itLastStolenVoice         = RTList<Voice>::Iterator();
479            itLastStolenVoiceGlobally = RTList<Voice>::Iterator();
480            iuiLastStolenKey          = RTList<uint>::Iterator();
481            iuiLastStolenKeyGlobally  = RTList<uint>::Iterator();
482            pLastStolenChannel        = NULL;
483        }
484    
485          // render audio from all active voices      /**
486          {       * Render all 'normal' voices (that is voices which were not stolen in
487              RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();       * this fragment) on the given engine channel.
488              RTList<uint>::Iterator end    = pEngineChannel->pActiveKeys->end();       *
489              while (iuiKey != end) { // iterate through all active keys       * @param pEngineChannel - engine channel on which audio should be
490                  midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];       *                         rendered
491                  ++iuiKey;       * @param Samples        - amount of sample points to be rendered in
492         *                         this audio fragment cycle
493                  RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();       */
494                  RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();      void Engine::RenderActiveVoices(EngineChannel* pEngineChannel, uint Samples) {
495                  for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key          RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
496                      // now render current voice          RTList<uint>::Iterator end    = pEngineChannel->pActiveKeys->end();
497                      itVoice->Render(Samples);          while (iuiKey != end) { // iterate through all active keys
498                      if (itVoice->IsActive()) ActiveVoiceCountTemp++; // still active              midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
499                      else { // voice reached end, is now inactive              ++iuiKey;
500                          FreeVoice(pEngineChannel, itVoice); // remove voice from the list of active voices  
501                      }              RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
502                RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
503                for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
504                    // now render current voice
505                    itVoice->Render(Samples);
506                    if (itVoice->IsActive()) ActiveVoiceCountTemp++; // still active
507                    else { // voice reached end, is now inactive
508                        FreeVoice(pEngineChannel, itVoice); // remove voice from the list of active voices
509                  }                  }
510              }              }
511          }          }
512        }
513    
514        /**
515          // now render all postponed voices from voice stealing       * Render all stolen voices (only voices which were stolen in this
516          {       * fragment) on the given engine channel. Stolen voices are rendered
517              RTList<Event>::Iterator itVoiceStealEvent = pVoiceStealingQueue->first();       * after all normal voices have been rendered; this is needed to render
518              RTList<Event>::Iterator end               = pVoiceStealingQueue->end();       * audio of those voices which were selected for voice stealing until
519              for (; itVoiceStealEvent != end; ++itVoiceStealEvent) {       * the point were the stealing (that is the take over of the voice)
520                  Pool<Voice>::Iterator itNewVoice =       * actually happened.
521                      LaunchVoice(pEngineChannel, itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false);       *
522                  if (itNewVoice) {       * @param pEngineChannel - engine channel on which audio should be
523                      for (; itNewVoice; itNewVoice = itNewVoice->itChildVoice) {       *                         rendered
524                          itNewVoice->Render(Samples);       * @param Samples        - amount of sample points to be rendered in
525                          if (itNewVoice->IsActive()) ActiveVoiceCountTemp++; // still active       *                         this audio fragment cycle
526                          else { // voice reached end, is now inactive       */
527                              FreeVoice(pEngineChannel, itNewVoice); // remove voice from the list of active voices      void Engine::RenderStolenVoices(uint Samples) {
528                          }          RTList<Event>::Iterator itVoiceStealEvent = pVoiceStealingQueue->first();
529                      }          RTList<Event>::Iterator end               = pVoiceStealingQueue->end();
530            for (; itVoiceStealEvent != end; ++itVoiceStealEvent) {
531                EngineChannel* pEngineChannel = (EngineChannel*) itVoiceStealEvent->pEngineChannel;
532                Pool<Voice>::Iterator itNewVoice =
533                    LaunchVoice(pEngineChannel, itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false, false);
534                if (itNewVoice) {
535                    itNewVoice->Render(Samples);
536                    if (itNewVoice->IsActive()) ActiveVoiceCountTemp++; // still active
537                    else { // voice reached end, is now inactive
538                        FreeVoice(pEngineChannel, itNewVoice); // remove voice from the list of active voices
539                  }                  }
                 else dmsg(1,("gig::Engine: ERROR, voice stealing didn't work out!\n"));  
540              }              }
541          }              else dmsg(1,("gig::Engine: ERROR, voice stealing didn't work out!\n"));
         // reset voice stealing for the new fragment  
         pVoiceStealingQueue->clear();  
         pEngineChannel->itLastStolenVoice = RTList<Voice>::Iterator();  
         pEngineChannel->iuiLastStolenKey  = RTList<uint>::Iterator();  
542    
543                // we need to clear the key's event list explicitly here in case key was never active
544                midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itVoiceStealEvent->Param.Note.Key];
545                pKey->VoiceTheftsQueued--;
546                if (!pKey->Active && !pKey->VoiceTheftsQueued) pKey->pEvents->clear();
547            }
548        }
549    
550        /**
551         * Free all keys which have turned inactive in this audio fragment, from
552         * the list of active keys and clear all event lists on that engine
553         * channel.
554         *
555         * @param pEngineChannel - engine channel to cleanup
556         */
557        void Engine::PostProcess(EngineChannel* pEngineChannel) {
558          // free all keys which have no active voices left          // free all keys which have no active voices left
559          {          {
560              RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();              RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
# Line 486  namespace LinuxSampler { namespace gig { Line 563  namespace LinuxSampler { namespace gig {
563                  midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];                  midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
564                  ++iuiKey;                  ++iuiKey;
565                  if (pKey->pActiveVoices->isEmpty()) FreeKey(pEngineChannel, pKey);                  if (pKey->pActiveVoices->isEmpty()) FreeKey(pEngineChannel, pKey);
566                  #if DEVMODE                  #if CONFIG_DEVMODE
567                  else { // FIXME: should be removed before the final release (purpose: just a sanity check for debugging)                  else { // just a sanity check for debugging
568                      RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();                      RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
569                      RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();                      RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
570                      for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key                      for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
# Line 496  namespace LinuxSampler { namespace gig { Line 573  namespace LinuxSampler { namespace gig {
573                          }                          }
574                      }                      }
575                  }                  }
576                  #endif // DEVMODE                  #endif // CONFIG_DEVMODE
577              }              }
578          }          }
579    
580            // empty the engine channel's own event lists
581            pEngineChannel->ClearEventLists();
582      }      }
583    
584      /**      /**
# Line 528  namespace LinuxSampler { namespace gig { Line 608  namespace LinuxSampler { namespace gig {
608                  // finally place sysex event into input event queue                  // finally place sysex event into input event queue
609                  pEventQueue->push(&event);                  pEventQueue->push(&event);
610              }              }
611              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));
612          }          }
613          else dmsg(1,("Engine: Input event queue full!"));          else dmsg(1,("Engine: Input event queue full!"));
614      }      }
# Line 554  namespace LinuxSampler { namespace gig { Line 634  namespace LinuxSampler { namespace gig {
634          midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[key];          midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[key];
635    
636          pKey->KeyPressed = true; // the MIDI key was now pressed down          pKey->KeyPressed = true; // the MIDI key was now pressed down
637            pKey->Velocity   = itNoteOnEvent->Param.Note.Velocity;
638            pKey->NoteOnTime = FrameTime + itNoteOnEvent->FragmentPos(); // will be used to calculate note length
639    
640          // cancel release process of voices on this key if needed          // cancel release process of voices on this key if needed
641          if (pKey->Active && !pEngineChannel->SustainPedal) {          if (pKey->Active && !pEngineChannel->SustainPedal) {
# Line 568  namespace LinuxSampler { namespace gig { Line 650  namespace LinuxSampler { namespace gig {
650          // move note on event to the key's own event list          // move note on event to the key's own event list
651          RTList<Event>::Iterator itNoteOnEventOnKeyList = itNoteOnEvent.moveToEndOf(pKey->pEvents);          RTList<Event>::Iterator itNoteOnEventOnKeyList = itNoteOnEvent.moveToEndOf(pKey->pEvents);
652    
653          // allocate and trigger a new voice for the key          // allocate and trigger new voice(s) for the key
654          LaunchVoice(pEngineChannel, itNoteOnEventOnKeyList, 0, false, true);          {
655                // first, get total amount of required voices (dependant on amount of layers)
656                ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOnEventOnKeyList->Param.Note.Key);
657                if (pRegion) {
658                    int voicesRequired = pRegion->Layers;
659                    // now launch the required amount of voices
660                    for (int i = 0; i < voicesRequired; i++)
661                        LaunchVoice(pEngineChannel, itNoteOnEventOnKeyList, i, false, true, true);
662                }
663            }
664    
665            // if neither a voice was spawned or postponed then remove note on event from key again
666            if (!pKey->Active && !pKey->VoiceTheftsQueued)
667                pKey->pEvents->free(itNoteOnEventOnKeyList);
668    
669          pKey->RoundRobinIndex++;          pKey->RoundRobinIndex++;
670      }      }
# Line 591  namespace LinuxSampler { namespace gig { Line 686  namespace LinuxSampler { namespace gig {
686          // release voices on this key if needed          // release voices on this key if needed
687          if (pKey->Active && !pEngineChannel->SustainPedal) {          if (pKey->Active && !pEngineChannel->SustainPedal) {
688              itNoteOffEvent->Type = Event::type_release; // transform event type              itNoteOffEvent->Type = Event::type_release; // transform event type
         }  
689    
690          // move event to the key's own event list              // move event to the key's own event list
691          RTList<Event>::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents);              RTList<Event>::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents);
692    
693          // spawn release triggered voice(s) if needed              // spawn release triggered voice(s) if needed
694          if (pKey->ReleaseTrigger) {              if (pKey->ReleaseTrigger) {
695              LaunchVoice(pEngineChannel, itNoteOffEventOnKeyList, 0, true, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples                  // first, get total amount of required voices (dependant on amount of layers)
696              pKey->ReleaseTrigger = false;                  ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOffEventOnKeyList->Param.Note.Key);
697                    if (pRegion) {
698                        int voicesRequired = pRegion->Layers;
699    
700                        // MIDI note-on velocity is used instead of note-off velocity
701                        itNoteOffEventOnKeyList->Param.Note.Velocity = pKey->Velocity;
702    
703                        // now launch the required amount of voices
704                        for (int i = 0; i < voicesRequired; i++)
705                            LaunchVoice(pEngineChannel, itNoteOffEventOnKeyList, i, true, false, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples
706                    }
707                    pKey->ReleaseTrigger = false;
708                }
709    
710                // if neither a voice was spawned or postponed then remove note off event from key again
711                if (!pKey->Active && !pKey->VoiceTheftsQueued)
712                    pKey->pEvents->free(itNoteOffEventOnKeyList);
713          }          }
714      }      }
715    
# Line 612  namespace LinuxSampler { namespace gig { Line 722  namespace LinuxSampler { namespace gig {
722       */       */
723      void Engine::ProcessPitchbend(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itPitchbendEvent) {      void Engine::ProcessPitchbend(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itPitchbendEvent) {
724          pEngineChannel->Pitch = itPitchbendEvent->Param.Pitch.Pitch; // store current pitch value          pEngineChannel->Pitch = itPitchbendEvent->Param.Pitch.Pitch; // store current pitch value
725          itPitchbendEvent.moveToEndOf(pSynthesisEvents[Event::destination_vco]);          itPitchbendEvent.moveToEndOf(pEngineChannel->pSynthesisEvents[Event::destination_vco]);
726      }      }
727    
728      /**      /**
# Line 629  namespace LinuxSampler { namespace gig { Line 739  namespace LinuxSampler { namespace gig {
739       *  @param VoiceStealing       - if voice stealing should be performed       *  @param VoiceStealing       - if voice stealing should be performed
740       *                               when there is no free voice       *                               when there is no free voice
741       *                               (optional, default = true)       *                               (optional, default = true)
742         *  @param HandleKeyGroupConflicts - if voices should be killed due to a
743         *                                   key group conflict
744       *  @returns pointer to new voice or NULL if there was no free voice or       *  @returns pointer to new voice or NULL if there was no free voice or
745       *           if the voice wasn't triggered (for example when no region is       *           if the voice wasn't triggered (for example when no region is
746       *           defined for the given key).       *           defined for the given key).
747       */       */
748      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) {
749          midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];          int MIDIKey            = itNoteOnEvent->Param.Note.Key;
750            midi_key_info_t* pKey  = &pEngineChannel->pMIDIKeyInfo[MIDIKey];
751            ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(MIDIKey);
752    
753            // if nothing defined for this key
754            if (!pRegion) return Pool<Voice>::Iterator(); // nothing to do
755    
756            // only mark the first voice of a layered voice (group) to be in a
757            // key group, so the layered voices won't kill each other
758            int iKeyGroup = (iLayer == 0 && !ReleaseTriggerVoice) ? pRegion->KeyGroup : 0;
759    
760            // handle key group (a.k.a. exclusive group) conflicts
761            if (HandleKeyGroupConflicts) {
762                if (iKeyGroup) { // if this voice / key belongs to a key group
763                    uint** ppKeyGroup = &pEngineChannel->ActiveKeyGroups[iKeyGroup];
764                    if (*ppKeyGroup) { // if there's already an active key in that key group
765                        midi_key_info_t* pOtherKey = &pEngineChannel->pMIDIKeyInfo[**ppKeyGroup];
766                        // kill all voices on the (other) key
767                        RTList<Voice>::Iterator itVoiceToBeKilled = pOtherKey->pActiveVoices->first();
768                        RTList<Voice>::Iterator end               = pOtherKey->pActiveVoices->end();
769                        for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) {
770                            if (itVoiceToBeKilled->Type != Voice::type_release_trigger) {
771                                itVoiceToBeKilled->Kill(itNoteOnEvent);
772                                --VoiceSpawnsLeft; //FIXME: just a hack, we should better check in StealVoice() if the voice was killed due to key conflict
773                            }
774                        }
775                    }
776                }
777            }
778    
779            Voice::type_t VoiceType = Voice::type_normal;
780    
781            // get current dimension values to select the right dimension region
782            //TODO: for stolen voices this dimension region selection block is processed twice, this should be changed
783            //FIXME: controller values for selecting the dimension region here are currently not sample accurate
784            uint DimValues[8] = { 0 };
785            for (int i = pRegion->Dimensions - 1; i >= 0; i--) {
786                switch (pRegion->pDimensionDefinitions[i].dimension) {
787                    case ::gig::dimension_samplechannel:
788                        DimValues[i] = 0; //TODO: we currently ignore this dimension
789                        break;
790                    case ::gig::dimension_layer:
791                        DimValues[i] = iLayer;
792                        break;
793                    case ::gig::dimension_velocity:
794                        DimValues[i] = itNoteOnEvent->Param.Note.Velocity;
795                        break;
796                    case ::gig::dimension_channelaftertouch:
797                        DimValues[i] = 0; //TODO: we currently ignore this dimension
798                        break;
799                    case ::gig::dimension_releasetrigger:
800                        VoiceType = (ReleaseTriggerVoice) ? Voice::type_release_trigger : (!iLayer) ? Voice::type_release_trigger_required : Voice::type_normal;
801                        DimValues[i] = (uint) ReleaseTriggerVoice;
802                        break;
803                    case ::gig::dimension_keyboard:
804                        DimValues[i] = (uint) pEngineChannel->CurrentKeyDimension;
805                        break;
806                    case ::gig::dimension_roundrobin:
807                        DimValues[i] = (uint) pEngineChannel->pMIDIKeyInfo[MIDIKey].RoundRobinIndex; // incremented for each note on
808                        break;
809                    case ::gig::dimension_random:
810                        RandomSeed   = RandomSeed * 1103515245 + 12345; // classic pseudo random number generator
811                        DimValues[i] = (uint) RandomSeed >> (32 - pRegion->pDimensionDefinitions[i].bits); // highest bits are most random
812                        break;
813                    case ::gig::dimension_modwheel:
814                        DimValues[i] = pEngineChannel->ControllerTable[1];
815                        break;
816                    case ::gig::dimension_breath:
817                        DimValues[i] = pEngineChannel->ControllerTable[2];
818                        break;
819                    case ::gig::dimension_foot:
820                        DimValues[i] = pEngineChannel->ControllerTable[4];
821                        break;
822                    case ::gig::dimension_portamentotime:
823                        DimValues[i] = pEngineChannel->ControllerTable[5];
824                        break;
825                    case ::gig::dimension_effect1:
826                        DimValues[i] = pEngineChannel->ControllerTable[12];
827                        break;
828                    case ::gig::dimension_effect2:
829                        DimValues[i] = pEngineChannel->ControllerTable[13];
830                        break;
831                    case ::gig::dimension_genpurpose1:
832                        DimValues[i] = pEngineChannel->ControllerTable[16];
833                        break;
834                    case ::gig::dimension_genpurpose2:
835                        DimValues[i] = pEngineChannel->ControllerTable[17];
836                        break;
837                    case ::gig::dimension_genpurpose3:
838                        DimValues[i] = pEngineChannel->ControllerTable[18];
839                        break;
840                    case ::gig::dimension_genpurpose4:
841                        DimValues[i] = pEngineChannel->ControllerTable[19];
842                        break;
843                    case ::gig::dimension_sustainpedal:
844                        DimValues[i] = pEngineChannel->ControllerTable[64];
845                        break;
846                    case ::gig::dimension_portamento:
847                        DimValues[i] = pEngineChannel->ControllerTable[65];
848                        break;
849                    case ::gig::dimension_sostenutopedal:
850                        DimValues[i] = pEngineChannel->ControllerTable[66];
851                        break;
852                    case ::gig::dimension_softpedal:
853                        DimValues[i] = pEngineChannel->ControllerTable[67];
854                        break;
855                    case ::gig::dimension_genpurpose5:
856                        DimValues[i] = pEngineChannel->ControllerTable[80];
857                        break;
858                    case ::gig::dimension_genpurpose6:
859                        DimValues[i] = pEngineChannel->ControllerTable[81];
860                        break;
861                    case ::gig::dimension_genpurpose7:
862                        DimValues[i] = pEngineChannel->ControllerTable[82];
863                        break;
864                    case ::gig::dimension_genpurpose8:
865                        DimValues[i] = pEngineChannel->ControllerTable[83];
866                        break;
867                    case ::gig::dimension_effect1depth:
868                        DimValues[i] = pEngineChannel->ControllerTable[91];
869                        break;
870                    case ::gig::dimension_effect2depth:
871                        DimValues[i] = pEngineChannel->ControllerTable[92];
872                        break;
873                    case ::gig::dimension_effect3depth:
874                        DimValues[i] = pEngineChannel->ControllerTable[93];
875                        break;
876                    case ::gig::dimension_effect4depth:
877                        DimValues[i] = pEngineChannel->ControllerTable[94];
878                        break;
879                    case ::gig::dimension_effect5depth:
880                        DimValues[i] = pEngineChannel->ControllerTable[95];
881                        break;
882                    case ::gig::dimension_none:
883                        std::cerr << "gig::Engine::LaunchVoice() Error: dimension=none\n" << std::flush;
884                        break;
885                    default:
886                        std::cerr << "gig::Engine::LaunchVoice() Error: Unknown dimension\n" << std::flush;
887                }
888            }
889            ::gig::DimensionRegion* pDimRgn = pRegion->GetDimensionRegionByValue(DimValues);
890    
891            // no need to continue if sample is silent
892            if (!pDimRgn->pSample || !pDimRgn->pSample->SamplesTotal) return Pool<Voice>::Iterator();
893    
894          // allocate a new voice for the key          // allocate a new voice for the key
895          Pool<Voice>::Iterator itNewVoice = pKey->pActiveVoices->allocAppend();          Pool<Voice>::Iterator itNewVoice = pKey->pActiveVoices->allocAppend();
896          if (itNewVoice) {          if (itNewVoice) {
897              // launch the new voice              // launch the new voice
898              if (itNewVoice->Trigger(pEngineChannel, itNoteOnEvent, pEngineChannel->Pitch, pEngineChannel->pInstrument, iLayer, ReleaseTriggerVoice, VoiceStealing) < 0) {              if (itNewVoice->Trigger(pEngineChannel, itNoteOnEvent, pEngineChannel->Pitch, pDimRgn, VoiceType, iKeyGroup) < 0) {
899                  dmsg(4,("Voice not triggered\n"));                  dmsg(4,("Voice not triggered\n"));
900                  pKey->pActiveVoices->free(itNewVoice);                  pKey->pActiveVoices->free(itNewVoice);
901              }              }
902              else { // on success              else { // on success
903                  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);  
                         }  
                     }  
                 }  
904                  if (!pKey->Active) { // mark as active key                  if (!pKey->Active) { // mark as active key
905                      pKey->Active = true;                      pKey->Active = true;
906                      pKey->itSelf = pEngineChannel->pActiveKeys->allocAppend();                      pKey->itSelf = pEngineChannel->pActiveKeys->allocAppend();
907                      *pKey->itSelf = itNoteOnEvent->Param.Note.Key;                      *pKey->itSelf = itNoteOnEvent->Param.Note.Key;
908                  }                  }
909                  if (itNewVoice->KeyGroup) {                  if (itNewVoice->KeyGroup) {
910                        uint** ppKeyGroup = &pEngineChannel->ActiveKeyGroups[itNewVoice->KeyGroup];
911                      *ppKeyGroup = &*pKey->itSelf; // put key as the (new) active key to its key group                      *ppKeyGroup = &*pKey->itSelf; // put key as the (new) active key to its key group
912                  }                  }
913                  if (itNewVoice->Type == Voice::type_release_trigger_required) pKey->ReleaseTrigger = true; // mark key for the need of release triggered voice(s)                  if (itNewVoice->Type == Voice::type_release_trigger_required) pKey->ReleaseTrigger = true; // mark key for the need of release triggered voice(s)
# Line 671  namespace LinuxSampler { namespace gig { Line 915  namespace LinuxSampler { namespace gig {
915              }              }
916          }          }
917          else if (VoiceStealing) {          else if (VoiceStealing) {
918              // first, get total amount of required voices (dependant on amount of layers)              // try to steal one voice
919              ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOnEvent->Param.Note.Key);              int result = StealVoice(pEngineChannel, itNoteOnEvent);
920              if (!pRegion) return Pool<Voice>::Iterator(); // nothing defined for this MIDI key, so no voice needed              if (!result) { // voice stolen successfully
921              int voicesRequired = pRegion->Layers;                  // put note-on event into voice-stealing queue, so it will be reprocessed after killed voice died
922                    RTList<Event>::Iterator itStealEvent = pVoiceStealingQueue->allocAppend();
923              // now steal the (remaining) amount of voices                  if (itStealEvent) {
924              for (int i = iLayer; i < voicesRequired; i++)                      *itStealEvent = *itNoteOnEvent; // copy event
925                  StealVoice(pEngineChannel, itNoteOnEvent);                      itStealEvent->Param.Note.Layer = iLayer;
926                        itStealEvent->Param.Note.ReleaseTrigger = ReleaseTriggerVoice;
927              // put note-on event into voice-stealing queue, so it will be reprocessed after killed voice died                      pKey->VoiceTheftsQueued++;
928              RTList<Event>::Iterator itStealEvent = pVoiceStealingQueue->allocAppend();                  }
929              if (itStealEvent) {                  else dmsg(1,("Voice stealing queue full!\n"));
                 *itStealEvent = *itNoteOnEvent; // copy event  
                 itStealEvent->Param.Note.Layer = iLayer;  
                 itStealEvent->Param.Note.ReleaseTrigger = ReleaseTriggerVoice;  
930              }              }
             else dmsg(1,("Voice stealing queue full!\n"));  
931          }          }
932    
933          return Pool<Voice>::Iterator(); // no free voice or error          return Pool<Voice>::Iterator(); // no free voice or error
# Line 701  namespace LinuxSampler { namespace gig { Line 941  namespace LinuxSampler { namespace gig {
941       *       *
942       *  @param pEngineChannel - engine channel on which this event occured on       *  @param pEngineChannel - engine channel on which this event occured on
943       *  @param itNoteOnEvent - key, velocity and time stamp of the event       *  @param itNoteOnEvent - key, velocity and time stamp of the event
944         *  @returns 0 on success, a value < 0 if no active voice could be picked for voice stealing
945       */       */
946      void Engine::StealVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {      int Engine::StealVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {
947            if (VoiceSpawnsLeft <= 0) {
948                dmsg(1,("Max. voice thefts per audio fragment reached (you may raise CONFIG_MAX_VOICES).\n"));
949                return -1;
950            }
951          if (!pEventPool->poolIsEmpty()) {          if (!pEventPool->poolIsEmpty()) {
952    
953              RTList<uint>::Iterator  iuiOldestKey;              RTList<Voice>::Iterator itSelectedVoice;
             RTList<Voice>::Iterator itOldestVoice;  
954    
955              // Select one voice for voice stealing              // Select one voice for voice stealing
956              switch (VOICE_STEAL_ALGORITHM) {              switch (CONFIG_VOICE_STEAL_ALGO) {
957    
958                  // try to pick the oldest voice on the key where the new                  // try to pick the oldest voice on the key where the new
959                  // voice should be spawned, if there is no voice on that                  // voice should be spawned, if there is no voice on that
960                  // key, or no voice left to kill there, then procceed with                  // key, or no voice left to kill, then procceed with
961                  // 'oldestkey' algorithm                  // 'oldestkey' algorithm
962                  case voice_steal_algo_keymask: {                  case voice_steal_algo_oldestvoiceonkey: {
963                      midi_key_info_t* pOldestKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];                      midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];
964                      if (pEngineChannel->itLastStolenVoice) {                      itSelectedVoice = pSelectedKey->pActiveVoices->first();
965                          itOldestVoice = pEngineChannel->itLastStolenVoice;                      // proceed iterating if voice was created in this fragment cycle
966                          ++itOldestVoice;                      while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice;
967                      }                      // if we haven't found a voice then proceed with algorithm 'oldestkey'
968                      else { // no voice stolen in this audio fragment cycle yet                      if (itSelectedVoice && itSelectedVoice->IsStealable()) break;
                         itOldestVoice = pOldestKey->pActiveVoices->first();  
                     }  
                     if (itOldestVoice) {  
                         iuiOldestKey = pOldestKey->itSelf;  
                         break; // selection succeeded  
                     }  
969                  } // no break - intentional !                  } // no break - intentional !
970    
971                  // try to pick the oldest voice on the oldest active key                  // try to pick the oldest voice on the oldest active key
972                  // (caution: must stay after 'keymask' algorithm !)                  // from the same engine channel
973                    // (caution: must stay after 'oldestvoiceonkey' algorithm !)
974                  case voice_steal_algo_oldestkey: {                  case voice_steal_algo_oldestkey: {
975                      if (pEngineChannel->itLastStolenVoice) {                      // if we already stole in this fragment, try to proceed on same key
976                          midi_key_info_t* pOldestKey = &pEngineChannel->pMIDIKeyInfo[*pEngineChannel->iuiLastStolenKey];                      if (this->itLastStolenVoice) {
977                          itOldestVoice = pEngineChannel->itLastStolenVoice;                          itSelectedVoice = this->itLastStolenVoice;
978                          ++itOldestVoice;                          do {
979                          if (!itOldestVoice) {                              ++itSelectedVoice;
980                              iuiOldestKey = pEngineChannel->iuiLastStolenKey;                          } while (itSelectedVoice && !itSelectedVoice->IsStealable()); // proceed iterating if voice was created in this fragment cycle
981                              ++iuiOldestKey;                          // found a "stealable" voice ?
982                              if (iuiOldestKey) {                          if (itSelectedVoice && itSelectedVoice->IsStealable()) {
983                                  midi_key_info_t* pOldestKey = &pEngineChannel->pMIDIKeyInfo[*iuiOldestKey];                              // remember which voice we stole, so we can simply proceed on next voice stealing
984                                  itOldestVoice = pOldestKey->pActiveVoices->first();                              this->itLastStolenVoice = itSelectedVoice;
985                              }                              break; // selection succeeded
                             else {  
                                 dmsg(1,("gig::Engine: Warning, too less voices, even for voice stealing! - Better recompile with higher MAX_AUDIO_VOICES.\n"));  
                                 return;  
                             }  
986                          }                          }
                         else iuiOldestKey = pEngineChannel->iuiLastStolenKey;  
987                      }                      }
988                      else { // no voice stolen in this audio fragment cycle yet                      // get (next) oldest key
989                          iuiOldestKey = pEngineChannel->pActiveKeys->first();                      RTList<uint>::Iterator iuiSelectedKey = (this->iuiLastStolenKey) ? ++this->iuiLastStolenKey : pEngineChannel->pActiveKeys->first();
990                          midi_key_info_t* pOldestKey = &pEngineChannel->pMIDIKeyInfo[*iuiOldestKey];                      while (iuiSelectedKey) {
991                          itOldestVoice = pOldestKey->pActiveVoices->first();                          midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];
992                            itSelectedVoice = pSelectedKey->pActiveVoices->first();
993                            // proceed iterating if voice was created in this fragment cycle
994                            while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice;
995                            // found a "stealable" voice ?
996                            if (itSelectedVoice && itSelectedVoice->IsStealable()) {
997                                // remember which voice on which key we stole, so we can simply proceed on next voice stealing
998                                this->iuiLastStolenKey  = iuiSelectedKey;
999                                this->itLastStolenVoice = itSelectedVoice;
1000                                break; // selection succeeded
1001                            }
1002                            ++iuiSelectedKey; // get next oldest key
1003                      }                      }
1004                      break;                      break;
1005                  }                  }
# Line 763  namespace LinuxSampler { namespace gig { Line 1008  namespace LinuxSampler { namespace gig {
1008                  case voice_steal_algo_none:                  case voice_steal_algo_none:
1009                  default: {                  default: {
1010                      dmsg(1,("No free voice (voice stealing disabled)!\n"));                      dmsg(1,("No free voice (voice stealing disabled)!\n"));
1011                      return;                      return -1;
1012                    }
1013                }
1014    
1015                // if we couldn't steal a voice from the same engine channel then
1016                // steal oldest voice on the oldest key from any other engine channel
1017                // (the smaller engine channel number, the higher priority)
1018                if (!itSelectedVoice || !itSelectedVoice->IsStealable()) {
1019                    EngineChannel* pSelectedChannel;
1020                    int            iChannelIndex;
1021                    // select engine channel
1022                    if (pLastStolenChannel) {
1023                        pSelectedChannel = pLastStolenChannel;
1024                        iChannelIndex    = pSelectedChannel->iEngineIndexSelf;
1025                    } else { // pick the engine channel followed by this engine channel
1026                        iChannelIndex    = (pEngineChannel->iEngineIndexSelf + 1) % engineChannels.size();
1027                        pSelectedChannel = engineChannels[iChannelIndex];
1028                    }
1029    
1030                    // if we already stole in this fragment, try to proceed on same key
1031                    if (this->itLastStolenVoiceGlobally) {
1032                        itSelectedVoice = this->itLastStolenVoiceGlobally;
1033                        do {
1034                            ++itSelectedVoice;
1035                        } while (itSelectedVoice && !itSelectedVoice->IsStealable()); // proceed iterating if voice was created in this fragment cycle
1036                    }
1037    
1038                    #if CONFIG_DEVMODE
1039                    EngineChannel* pBegin = pSelectedChannel; // to detect endless loop
1040                    #endif // CONFIG_DEVMODE
1041    
1042                    // did we find a 'stealable' voice?
1043                    if (itSelectedVoice && itSelectedVoice->IsStealable()) {
1044                        // remember which voice we stole, so we can simply proceed on next voice stealing
1045                        this->itLastStolenVoiceGlobally = itSelectedVoice;
1046                    } else while (true) { // iterate through engine channels
1047                        // get (next) oldest key
1048                        RTList<uint>::Iterator iuiSelectedKey = (this->iuiLastStolenKeyGlobally) ? ++this->iuiLastStolenKeyGlobally : pSelectedChannel->pActiveKeys->first();
1049                        this->iuiLastStolenKeyGlobally = RTList<uint>::Iterator(); // to prevent endless loop (see line above)
1050                        while (iuiSelectedKey) {
1051                            midi_key_info_t* pSelectedKey = &pSelectedChannel->pMIDIKeyInfo[*iuiSelectedKey];
1052                            itSelectedVoice = pSelectedKey->pActiveVoices->first();
1053                            // proceed iterating if voice was created in this fragment cycle
1054                            while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice;
1055                            // found a "stealable" voice ?
1056                            if (itSelectedVoice && itSelectedVoice->IsStealable()) {
1057                                // remember which voice on which key on which engine channel we stole, so we can simply proceed on next voice stealing
1058                                this->iuiLastStolenKeyGlobally  = iuiSelectedKey;
1059                                this->itLastStolenVoiceGlobally = itSelectedVoice;
1060                                this->pLastStolenChannel        = pSelectedChannel;
1061                                goto stealable_voice_found; // selection succeeded
1062                            }
1063                            ++iuiSelectedKey; // get next key on current engine channel
1064                        }
1065                        // get next engine channel
1066                        iChannelIndex    = (iChannelIndex + 1) % engineChannels.size();
1067                        pSelectedChannel = engineChannels[iChannelIndex];
1068    
1069                        #if CONFIG_DEVMODE
1070                        if (pSelectedChannel == pBegin) {
1071                            dmsg(1,("FATAL ERROR: voice stealing endless loop!\n"));
1072                            dmsg(1,("VoiceSpawnsLeft=%d.\n", VoiceSpawnsLeft));
1073                            dmsg(1,("Exiting.\n"));
1074                            exit(-1);
1075                        }
1076                        #endif // CONFIG_DEVMODE
1077                  }                  }
1078              }              }
1079    
1080              //FIXME: can be removed, just a sanity check for debugging              // jump point if a 'stealable' voice was found
1081              if (!itOldestVoice->IsActive()) dmsg(1,("gig::Engine: ERROR, tried to steal a voice which was not active !!!\n"));              stealable_voice_found:
1082    
1083                #if CONFIG_DEVMODE
1084                if (!itSelectedVoice->IsActive()) {
1085                    dmsg(1,("gig::Engine: ERROR, tried to steal a voice which was not active !!!\n"));
1086                    return -1;
1087                }
1088                #endif // CONFIG_DEVMODE
1089    
1090              // now kill the selected voice              // now kill the selected voice
1091              itOldestVoice->Kill(itNoteOnEvent);              itSelectedVoice->Kill(itNoteOnEvent);
1092              // remember which voice on which key we stole, so we can simply proceed for the next voice stealing  
1093              pEngineChannel->itLastStolenVoice = itOldestVoice;              --VoiceSpawnsLeft;
1094              pEngineChannel->iuiLastStolenKey = iuiOldestKey;  
1095                return 0; // success
1096            }
1097            else {
1098                dmsg(1,("Event pool emtpy!\n"));
1099                return -1;
1100          }          }
         else dmsg(1,("Event pool emtpy!\n"));  
1101      }      }
1102    
1103      /**      /**
# Line 835  namespace LinuxSampler { namespace gig { Line 1156  namespace LinuxSampler { namespace gig {
1156      void Engine::ProcessControlChange(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itControlChangeEvent) {      void Engine::ProcessControlChange(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itControlChangeEvent) {
1157          dmsg(4,("Engine::ContinuousController cc=%d v=%d\n", itControlChangeEvent->Param.CC.Controller, itControlChangeEvent->Param.CC.Value));          dmsg(4,("Engine::ContinuousController cc=%d v=%d\n", itControlChangeEvent->Param.CC.Controller, itControlChangeEvent->Param.CC.Value));
1158    
1159          switch (itControlChangeEvent->Param.CC.Controller) {          // update controller value in the engine channel's controller table
1160            pEngineChannel->ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value;
1161    
1162            // move event from the unsorted event list to the control change event list
1163            Pool<Event>::Iterator itControlChangeEventOnCCList = itControlChangeEvent.moveToEndOf(pEngineChannel->pCCEvents);
1164    
1165            switch (itControlChangeEventOnCCList->Param.CC.Controller) {
1166              case 7: { // volume              case 7: { // volume
1167                  //TODO: not sample accurate yet                  //TODO: not sample accurate yet
1168                  pEngineChannel->GlobalVolume = (float) itControlChangeEvent->Param.CC.Value / 127.0f;                  pEngineChannel->GlobalVolume = (float) itControlChangeEventOnCCList->Param.CC.Value / 127.0f;
1169                    pEngineChannel->bStatusChanged = true; // engine channel status has changed, so set notify flag
1170                  break;                  break;
1171              }              }
1172              case 10: { // panpot              case 10: { // panpot
1173                  //TODO: not sample accurate yet                  //TODO: not sample accurate yet
1174                  const int pan = (int) itControlChangeEvent->Param.CC.Value - 64;                  const int pan = (int) itControlChangeEventOnCCList->Param.CC.Value - 64;
1175                  pEngineChannel->GlobalPanLeft  = 1.0f - float(RTMath::Max(pan, 0)) /  63.0f;                  pEngineChannel->GlobalPanLeft  = 1.0f - float(RTMath::Max(pan, 0)) /  63.0f;
1176                  pEngineChannel->GlobalPanRight = 1.0f - float(RTMath::Min(pan, 0)) / -64.0f;                  pEngineChannel->GlobalPanRight = 1.0f - float(RTMath::Min(pan, 0)) / -64.0f;
1177                  break;                  break;
1178              }              }
1179              case 64: { // sustain              case 64: { // sustain
1180                  if (itControlChangeEvent->Param.CC.Value >= 64 && !pEngineChannel->SustainPedal) {                  if (itControlChangeEventOnCCList->Param.CC.Value >= 64 && !pEngineChannel->SustainPedal) {
1181                      dmsg(4,("PEDAL DOWN\n"));                      dmsg(4,("PEDAL DOWN\n"));
1182                      pEngineChannel->SustainPedal = true;                      pEngineChannel->SustainPedal = true;
1183    
1184                      // cancel release process of voices if necessary                      // cancel release process of voices if necessary
1185                      RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();                      RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
1186                      if (iuiKey) {                      for (; iuiKey; ++iuiKey) {
1187                          itControlChangeEvent->Type = Event::type_cancel_release; // transform event type                          midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
1188                          while (iuiKey) {                          if (!pKey->KeyPressed) {
1189                              midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];                              RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
1190                              ++iuiKey;                              if (itNewEvent) {
1191                              if (!pKey->KeyPressed) {                                  *itNewEvent = *itControlChangeEventOnCCList; // copy event to the key's own event list
1192                                  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"));  
1193                              }                              }
1194                                else dmsg(1,("Event pool emtpy!\n"));
1195                          }                          }
1196                      }                      }
1197                  }                  }
1198                  if (itControlChangeEvent->Param.CC.Value < 64 && pEngineChannel->SustainPedal) {                  if (itControlChangeEventOnCCList->Param.CC.Value < 64 && pEngineChannel->SustainPedal) {
1199                      dmsg(4,("PEDAL UP\n"));                      dmsg(4,("PEDAL UP\n"));
1200                      pEngineChannel->SustainPedal = false;                      pEngineChannel->SustainPedal = false;
1201    
1202                      // release voices if their respective key is not pressed                      // release voices if their respective key is not pressed
1203                      RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();                      RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
1204                      if (iuiKey) {                      for (; iuiKey; ++iuiKey) {
1205                          itControlChangeEvent->Type = Event::type_release; // transform event type                          midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
1206                          while (iuiKey) {                          if (!pKey->KeyPressed) {
1207                              midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];                              RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
1208                              ++iuiKey;                              if (itNewEvent) {
1209                              if (!pKey->KeyPressed) {                                  *itNewEvent = *itControlChangeEventOnCCList; // copy event to the key's own event list
1210                                  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"));  
1211                              }                              }
1212                                else dmsg(1,("Event pool emtpy!\n"));
1213                          }                          }
1214                      }                      }
1215                  }                  }
1216                  break;                  break;
1217              }              }
         }  
1218    
         // update controller value in the engine's controller table  
         pEngineChannel->ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value;  
1219    
1220          // move event from the unsorted event list to the control change event list              // Channel Mode Messages
1221          itControlChangeEvent.moveToEndOf(pCCEvents);  
1222                case 120: { // all sound off
1223                    KillAllVoices(pEngineChannel, itControlChangeEventOnCCList);
1224                    break;
1225                }
1226                case 121: { // reset all controllers
1227                    pEngineChannel->ResetControllers();
1228                    break;
1229                }
1230                case 123: { // all notes off
1231                    ReleaseAllVoices(pEngineChannel, itControlChangeEventOnCCList);
1232                    break;
1233                }
1234            }
1235      }      }
1236    
1237      /**      /**
# Line 913  namespace LinuxSampler { namespace gig { Line 1249  namespace LinuxSampler { namespace gig {
1249    
1250          switch (id) {          switch (id) {
1251              case 0x41: { // Roland              case 0x41: { // Roland
1252                    dmsg(3,("Roland Sysex\n"));
1253                  uint8_t device_id, model_id, cmd_id;                  uint8_t device_id, model_id, cmd_id;
1254                  if (!reader.pop(&device_id)) goto free_sysex_data;                  if (!reader.pop(&device_id)) goto free_sysex_data;
1255                  if (!reader.pop(&model_id))  goto free_sysex_data;                  if (!reader.pop(&model_id))  goto free_sysex_data;
# Line 925  namespace LinuxSampler { namespace gig { Line 1262  namespace LinuxSampler { namespace gig {
1262                  const RingBuffer<uint8_t>::NonVolatileReader checksum_reader = reader; // so we can calculate the check sum later                  const RingBuffer<uint8_t>::NonVolatileReader checksum_reader = reader; // so we can calculate the check sum later
1263                  if (reader.read(&addr[0], 3) != 3) goto free_sysex_data;                  if (reader.read(&addr[0], 3) != 3) goto free_sysex_data;
1264                  if (addr[0] == 0x40 && addr[1] == 0x00) { // System Parameters                  if (addr[0] == 0x40 && addr[1] == 0x00) { // System Parameters
1265                        dmsg(3,("\tSystem Parameter\n"));
1266                  }                  }
1267                  else if (addr[0] == 0x40 && addr[1] == 0x01) { // Common Parameters                  else if (addr[0] == 0x40 && addr[1] == 0x01) { // Common Parameters
1268                        dmsg(3,("\tCommon Parameter\n"));
1269                  }                  }
1270                  else if (addr[0] == 0x40 && (addr[1] & 0xf0) == 0x10) { // Part Parameters (1)                  else if (addr[0] == 0x40 && (addr[1] & 0xf0) == 0x10) { // Part Parameters (1)
1271                      switch (addr[3]) {                      dmsg(3,("\tPart Parameter\n"));
1272                        switch (addr[2]) {
1273                          case 0x40: { // scale tuning                          case 0x40: { // scale tuning
1274                                dmsg(3,("\t\tScale Tuning\n"));
1275                              uint8_t scale_tunes[12]; // detuning of all 12 semitones of an octave                              uint8_t scale_tunes[12]; // detuning of all 12 semitones of an octave
1276                              if (reader.read(&scale_tunes[0], 12) != 12) goto free_sysex_data;                              if (reader.read(&scale_tunes[0], 12) != 12) goto free_sysex_data;
1277                              uint8_t checksum;                              uint8_t checksum;
1278                              if (!reader.pop(&checksum))                      goto free_sysex_data;                              if (!reader.pop(&checksum)) goto free_sysex_data;
1279                              if (GSCheckSum(checksum_reader, 12) != checksum) goto free_sysex_data;                              #if CONFIG_ASSERT_GS_SYSEX_CHECKSUM
1280                                if (GSCheckSum(checksum_reader, 12)) goto free_sysex_data;
1281                                #endif // CONFIG_ASSERT_GS_SYSEX_CHECKSUM
1282                              for (int i = 0; i < 12; i++) scale_tunes[i] -= 64;                              for (int i = 0; i < 12; i++) scale_tunes[i] -= 64;
1283                              AdjustScale((int8_t*) scale_tunes);                              AdjustScale((int8_t*) scale_tunes);
1284                                dmsg(3,("\t\t\tNew scale applied.\n"));
1285                              break;                              break;
1286                          }                          }
1287                      }                      }
# Line 982  namespace LinuxSampler { namespace gig { Line 1326  namespace LinuxSampler { namespace gig {
1326      }      }
1327    
1328      /**      /**
1329         * Releases all voices on an engine channel. All voices will go into
1330         * the release stage and thus it might take some time (e.g. dependant to
1331         * their envelope release time) until they actually die.
1332         *
1333         * @param pEngineChannel - engine channel on which all voices should be released
1334         * @param itReleaseEvent - event which caused this releasing of all voices
1335         */
1336        void Engine::ReleaseAllVoices(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itReleaseEvent) {
1337            RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
1338            while (iuiKey) {
1339                midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
1340                ++iuiKey;
1341                // append a 'release' event to the key's own event list
1342                RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
1343                if (itNewEvent) {
1344                    *itNewEvent = *itReleaseEvent; // copy original event (to the key's event list)
1345                    itNewEvent->Type = Event::type_release; // transform event type
1346                }
1347                else dmsg(1,("Event pool emtpy!\n"));
1348            }
1349        }
1350    
1351        /**
1352         * Kills all voices on an engine channel as soon as possible. Voices
1353         * won't get into release state, their volume level will be ramped down
1354         * as fast as possible.
1355         *
1356         * @param pEngineChannel - engine channel on which all voices should be killed
1357         * @param itKillEvent    - event which caused this killing of all voices
1358         */
1359        void Engine::KillAllVoices(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itKillEvent) {
1360            RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
1361            RTList<uint>::Iterator end    = pEngineChannel->pActiveKeys->end();
1362            while (iuiKey != end) { // iterate through all active keys
1363                midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
1364                ++iuiKey;
1365                RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
1366                RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
1367                for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
1368                    itVoice->Kill(itKillEvent);
1369                    --VoiceSpawnsLeft; //FIXME: just a temporary workaround, we should check the cause in StealVoice() instead
1370                }
1371            }
1372        }
1373    
1374        /**
1375       * Initialize the parameter sequence for the modulation destination given by       * Initialize the parameter sequence for the modulation destination given by
1376       * by 'dst' with the constant value given by val.       * by 'dst' with the constant value given by val.
1377       */       */
# Line 1025  namespace LinuxSampler { namespace gig { Line 1415  namespace LinuxSampler { namespace gig {
1415      }      }
1416    
1417      String Engine::EngineName() {      String Engine::EngineName() {
1418          return "GigEngine";          return LS_GIG_ENGINE_NAME;
1419      }      }
1420    
1421      String Engine::Description() {      String Engine::Description() {
# Line 1033  namespace LinuxSampler { namespace gig { Line 1423  namespace LinuxSampler { namespace gig {
1423      }      }
1424    
1425      String Engine::Version() {      String Engine::Version() {
1426          String s = "$Revision: 1.30 $";          String s = "$Revision: 1.49 $";
1427          return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword          return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword
1428      }      }
1429    
Legend:
Removed from v.438  
changed lines
  Added in v.690
  ViewVC Help
Powered by ViewVC