/[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 250 by schoenebeck, Mon Sep 20 00:31:13 2004 UTC revision 319 by schoenebeck, Mon Dec 13 00:46:42 2004 UTC
# Line 23  Line 23 
23  #include <sstream>  #include <sstream>
24  #include "DiskThread.h"  #include "DiskThread.h"
25  #include "Voice.h"  #include "Voice.h"
26    #include "EGADSR.h"
27    
28  #include "Engine.h"  #include "Engine.h"
29    #include <malloc.h>
30    
31  namespace LinuxSampler { namespace gig {  namespace LinuxSampler { namespace gig {
32    
# Line 39  namespace LinuxSampler { namespace gig { Line 41  namespace LinuxSampler { namespace gig {
41          pEventGenerator    = NULL;          pEventGenerator    = NULL;
42          pSysexBuffer       = new RingBuffer<uint8_t>(SYSEX_BUFFER_SIZE, 0);          pSysexBuffer       = new RingBuffer<uint8_t>(SYSEX_BUFFER_SIZE, 0);
43          pEventQueue        = new RingBuffer<Event>(MAX_EVENTS_PER_FRAGMENT, 0);          pEventQueue        = new RingBuffer<Event>(MAX_EVENTS_PER_FRAGMENT, 0);
44          pEventPool         = new RTELMemoryPool<Event>(MAX_EVENTS_PER_FRAGMENT);          pEventPool         = new Pool<Event>(MAX_EVENTS_PER_FRAGMENT);
45          pVoicePool         = new RTELMemoryPool<Voice>(MAX_AUDIO_VOICES);          pVoicePool         = new Pool<Voice>(MAX_AUDIO_VOICES);
46          pActiveKeys        = new RTELMemoryPool<uint>(128);          pActiveKeys        = new Pool<uint>(128);
47          pVoiceStealingQueue = new RTEList<Event>(pEventPool);          pVoiceStealingQueue = new RTList<Event>(pEventPool);
48          pEvents            = new RTEList<Event>(pEventPool);          pEvents            = new RTList<Event>(pEventPool);
49          pCCEvents          = new RTEList<Event>(pEventPool);          pCCEvents          = new RTList<Event>(pEventPool);
50          for (uint i = 0; i < Event::destination_count; i++) {          for (uint i = 0; i < Event::destination_count; i++) {
51              pSynthesisEvents[i] = new RTEList<Event>(pEventPool);              pSynthesisEvents[i] = new RTList<Event>(pEventPool);
52          }          }
53          for (uint i = 0; i < 128; i++) {          for (uint i = 0; i < 128; i++) {
54              pMIDIKeyInfo[i].pActiveVoices  = new RTEList<Voice>(pVoicePool);              pMIDIKeyInfo[i].pActiveVoices  = new RTList<Voice>(pVoicePool);
55              pMIDIKeyInfo[i].KeyPressed     = false;              pMIDIKeyInfo[i].KeyPressed     = false;
56              pMIDIKeyInfo[i].Active         = false;              pMIDIKeyInfo[i].Active         = false;
57              pMIDIKeyInfo[i].ReleaseTrigger = false;              pMIDIKeyInfo[i].ReleaseTrigger = false;
58              pMIDIKeyInfo[i].pSelf          = NULL;              pMIDIKeyInfo[i].pEvents        = new RTList<Event>(pEventPool);
             pMIDIKeyInfo[i].pEvents        = new RTEList<Event>(pEventPool);  
59          }          }
60          for (Voice* pVoice = pVoicePool->alloc(); pVoice; pVoice = pVoicePool->alloc()) {          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
61              pVoice->SetEngine(this);              iterVoice->SetEngine(this);
62          }          }
63          pVoicePool->clear();          pVoicePool->clear();
64    
# Line 99  namespace LinuxSampler { namespace gig { Line 100  namespace LinuxSampler { namespace gig {
100          if (pEventGenerator) delete pEventGenerator;          if (pEventGenerator) delete pEventGenerator;
101          if (pMainFilterParameters) delete[] pMainFilterParameters;          if (pMainFilterParameters) delete[] pMainFilterParameters;
102          if (pBasicFilterParameters) delete[] pBasicFilterParameters;          if (pBasicFilterParameters) delete[] pBasicFilterParameters;
103          if (pSynthesisParameters[0]) delete[] pSynthesisParameters[0];          if (pSynthesisParameters[0]) free(pSynthesisParameters[0]);
104          if (pVoiceStealingQueue) delete pVoiceStealingQueue;          if (pVoiceStealingQueue) delete pVoiceStealingQueue;
105      }      }
106    
# Line 160  namespace LinuxSampler { namespace gig { Line 161  namespace LinuxSampler { namespace gig {
161          GlobalVolume        = 1.0;          GlobalVolume        = 1.0;
162    
163          // reset voice stealing parameters          // reset voice stealing parameters
164          pLastStolenVoice = NULL;          itLastStolenVoice = RTList<Voice>::Iterator();
165          puiLastStolenKey = NULL;          iuiLastStolenKey  = RTList<uint>::Iterator();
166          pVoiceStealingQueue->clear();          pVoiceStealingQueue->clear();
167    
168          // reset to normal chromatic scale (means equal temper)          // reset to normal chromatic scale (means equal temper)
# Line 177  namespace LinuxSampler { namespace gig { Line 178  namespace LinuxSampler { namespace gig {
178              pMIDIKeyInfo[i].KeyPressed     = false;              pMIDIKeyInfo[i].KeyPressed     = false;
179              pMIDIKeyInfo[i].Active         = false;              pMIDIKeyInfo[i].Active         = false;
180              pMIDIKeyInfo[i].ReleaseTrigger = false;              pMIDIKeyInfo[i].ReleaseTrigger = false;
181              pMIDIKeyInfo[i].pSelf          = NULL;              pMIDIKeyInfo[i].itSelf         = Pool<uint>::Iterator();
182          }          }
183    
184          // reset all key groups          // reset all key groups
# Line 185  namespace LinuxSampler { namespace gig { Line 186  namespace LinuxSampler { namespace gig {
186          for (; iter != ActiveKeyGroups.end(); iter++) iter->second = NULL;          for (; iter != ActiveKeyGroups.end(); iter++) iter->second = NULL;
187    
188          // reset all voices          // reset all voices
189          for (Voice* pVoice = pVoicePool->alloc(); pVoice; pVoice = pVoicePool->alloc()) {          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
190              pVoice->Reset();              iterVoice->Reset();
191          }          }
192          pVoicePool->clear();          pVoicePool->clear();
193    
# Line 314  namespace LinuxSampler { namespace gig { Line 315  namespace LinuxSampler { namespace gig {
315          this->MaxSamplesPerCycle      = pAudioOutputDevice->MaxSamplesPerCycle();          this->MaxSamplesPerCycle      = pAudioOutputDevice->MaxSamplesPerCycle();
316          this->SampleRate              = pAudioOutputDevice->SampleRate();          this->SampleRate              = pAudioOutputDevice->SampleRate();
317    
318            // FIXME: audio drivers with varying fragment sizes might be a problem here
319            MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * EG_MIN_RELEASE_TIME) - 1;
320            if (MaxFadeOutPos < 0)
321                throw LinuxSamplerException("EG_MIN_RELEASE_TIME in EGADSR.h to big for current audio fragment size / sampling rate!");
322    
323          // (re)create disk thread          // (re)create disk thread
324          if (this->pDiskThread) {          if (this->pDiskThread) {
325              this->pDiskThread->StopThread();              this->pDiskThread->StopThread();
# Line 325  namespace LinuxSampler { namespace gig { Line 331  namespace LinuxSampler { namespace gig {
331              exit(EXIT_FAILURE);              exit(EXIT_FAILURE);
332          }          }
333    
334          for (Voice* pVoice = pVoicePool->alloc(); pVoice; pVoice = pVoicePool->alloc()) {          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
335              pVoice->pDiskThread = this->pDiskThread;              iterVoice->pDiskThread = this->pDiskThread;
336              dmsg(3,("d"));              dmsg(3,("d"));
337          }          }
338          pVoicePool->clear();          pVoicePool->clear();
# Line 336  namespace LinuxSampler { namespace gig { Line 342  namespace LinuxSampler { namespace gig {
342          pEventGenerator = new EventGenerator(pAudioOut->SampleRate());          pEventGenerator = new EventGenerator(pAudioOut->SampleRate());
343    
344          // (re)allocate synthesis parameter matrix          // (re)allocate synthesis parameter matrix
345          if (pSynthesisParameters[0]) delete[] pSynthesisParameters[0];          if (pSynthesisParameters[0]) free(pSynthesisParameters[0]);
346          pSynthesisParameters[0] = new float[Event::destination_count * pAudioOut->MaxSamplesPerCycle()];          pSynthesisParameters[0] = (float *) memalign(16,(Event::destination_count * sizeof(float) * pAudioOut->MaxSamplesPerCycle()));
347          for (int dst = 1; dst < Event::destination_count; dst++)          for (int dst = 1; dst < Event::destination_count; dst++)
348              pSynthesisParameters[dst] = pSynthesisParameters[dst - 1] + pAudioOut->MaxSamplesPerCycle();              pSynthesisParameters[dst] = pSynthesisParameters[dst - 1] + pAudioOut->MaxSamplesPerCycle();
349    
# Line 351  namespace LinuxSampler { namespace gig { Line 357  namespace LinuxSampler { namespace gig {
357          pDiskThread->StartThread();          pDiskThread->StartThread();
358          dmsg(1,("OK\n"));          dmsg(1,("OK\n"));
359    
360          for (Voice* pVoice = pVoicePool->first(); pVoice; pVoice = pVoicePool->next()) {          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
361              if (!pVoice->pDiskThread) {              if (!iterVoice->pDiskThread) {
362                  dmsg(0,("Engine -> voice::trigger: !pDiskThread\n"));                  dmsg(0,("Engine -> voice::trigger: !pDiskThread\n"));
363                  exit(EXIT_FAILURE);                  exit(EXIT_FAILURE);
364              }              }
# Line 393  namespace LinuxSampler { namespace gig { Line 399  namespace LinuxSampler { namespace gig {
399          }          }
400    
401    
402            // update time of start and end of this audio fragment (as events' time stamps relate to this)
403            pEventGenerator->UpdateFragmentTime(Samples);
404    
405    
406          // empty the event lists for the new fragment          // empty the event lists for the new fragment
407          pEvents->clear();          pEvents->clear();
408          pCCEvents->clear();          pCCEvents->clear();
409          for (uint i = 0; i < Event::destination_count; i++) {          for (uint i = 0; i < Event::destination_count; i++) {
410              pSynthesisEvents[i]->clear();              pSynthesisEvents[i]->clear();
411          }          }
412          for (uint* puiKey = pActiveKeys->first(); puiKey; puiKey = pActiveKeys->next()) {          {
413              midi_key_info_t* pKey = &pMIDIKeyInfo[*puiKey];              RTList<uint>::Iterator iuiKey = pActiveKeys->first();
414              pKey->pEvents->clear(); // free all events on the key              RTList<uint>::Iterator end    = pActiveKeys->end();
415          }              for(; iuiKey != end; ++iuiKey) {
416                    pMIDIKeyInfo[*iuiKey].pEvents->clear(); // free all events on the key
417          // read and copy events from input queue              }
         Event event = pEventGenerator->CreateEvent();  
         while (true) {  
             if (!pEventQueue->pop(&event)) break;  
             pEvents->alloc_assign(event);  
418          }          }
419    
420    
421          // update time of start and end of this audio fragment (as events' time stamps relate to this)          // get all events from the input event queue which belong to the current fragment
422          pEventGenerator->UpdateFragmentTime(Samples);          {
423                RingBuffer<Event>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();
424                Event* pEvent;
425                while (true) {
426                    // get next event from input event queue
427                    if (!(pEvent = eventQueueReader.pop())) break;
428                    // if younger event reached, ignore that and all subsequent ones for now
429                    if (pEvent->FragmentPos() >= Samples) {
430                        eventQueueReader--;
431                        dmsg(2,("Younger Event, pos=%d ,Samples=%d!\n",pEvent->FragmentPos(),Samples));
432                        pEvent->ResetFragmentPos();
433                        break;
434                    }
435                    // copy event to internal event list
436                    if (pEvents->poolIsEmpty()) {
437                        dmsg(1,("Event pool emtpy!\n"));
438                        break;
439                    }
440                    *pEvents->allocAppend() = *pEvent;
441                }
442                eventQueueReader.free(); // free all copied events from input queue
443            }
444    
445    
446          // process events          // process events
447          Event* pNextEvent = pEvents->first();          {
448          while (pNextEvent) {              RTList<Event>::Iterator itEvent = pEvents->first();
449              Event* pEvent = pNextEvent;              RTList<Event>::Iterator end     = pEvents->end();
450              pEvents->set_current(pEvent);              for (; itEvent != end; ++itEvent) {
451              pNextEvent = pEvents->next();                  switch (itEvent->Type) {
452              switch (pEvent->Type) {                      case Event::type_note_on:
453                  case Event::type_note_on:                          dmsg(5,("Engine: Note on received\n"));
454                      dmsg(5,("Engine: Note on received\n"));                          ProcessNoteOn(itEvent);
455                      ProcessNoteOn(pEvent);                          break;
456                      break;                      case Event::type_note_off:
457                  case Event::type_note_off:                          dmsg(5,("Engine: Note off received\n"));
458                      dmsg(5,("Engine: Note off received\n"));                          ProcessNoteOff(itEvent);
459                      ProcessNoteOff(pEvent);                          break;
460                      break;                      case Event::type_control_change:
461                  case Event::type_control_change:                          dmsg(5,("Engine: MIDI CC received\n"));
462                      dmsg(5,("Engine: MIDI CC received\n"));                          ProcessControlChange(itEvent);
463                      ProcessControlChange(pEvent);                          break;
464                      break;                      case Event::type_pitchbend:
465                  case Event::type_pitchbend:                          dmsg(5,("Engine: Pitchbend received\n"));
466                      dmsg(5,("Engine: Pitchbend received\n"));                          ProcessPitchbend(itEvent);
467                      ProcessPitchbend(pEvent);                          break;
468                      break;                      case Event::type_sysex:
469                  case Event::type_sysex:                          dmsg(5,("Engine: Sysex received\n"));
470                      dmsg(5,("Engine: Sysex received\n"));                          ProcessSysex(itEvent);
471                      ProcessSysex(pEvent);                          break;
472                      break;                  }
473              }              }
474          }          }
475    
476    
         // render audio from all active voices  
477          int active_voices = 0;          int active_voices = 0;
478          uint* piKey = pActiveKeys->first();  
479          while (piKey) { // iterate through all active keys          // render audio from all active voices
480              midi_key_info_t* pKey = &pMIDIKeyInfo[*piKey];          {
481              pActiveKeys->set_current(piKey);              RTList<uint>::Iterator iuiKey = pActiveKeys->first();
482              piKey = pActiveKeys->next();              RTList<uint>::Iterator end    = pActiveKeys->end();
483                while (iuiKey != end) { // iterate through all active keys
484              Voice* pVoiceNext = pKey->pActiveVoices->first();                  midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey];
485              while (pVoiceNext) { // iterate through all voices on this key                  ++iuiKey;
486                  // already get next voice on key  
487                  Voice* pVoice = pVoiceNext;                  RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
488                  pKey->pActiveVoices->set_current(pVoice);                  RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
489                  pVoiceNext = pKey->pActiveVoices->next();                  for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
490                        // now render current voice
491                  // now render current voice                      itVoice->Render(Samples);
492                  pVoice->Render(Samples);                      if (itVoice->IsActive()) active_voices++; // still active
493                  if (pVoice->IsActive()) active_voices++; // still active                      else { // voice reached end, is now inactive
494                  else { // voice reached end, is now inactive                          FreeVoice(itVoice); // remove voice from the list of active voices
495                      KillVoiceImmediately(pVoice); // remove voice from the list of active voices                      }
496                  }                  }
497              }              }
498          }          }
499    
500    
501          // now render all postponed voices from voice stealing          // now render all postponed voices from voice stealing
502          Event* pVoiceStealEvent = pVoiceStealingQueue->first();          {
503          while (pVoiceStealEvent) {              RTList<Event>::Iterator itVoiceStealEvent = pVoiceStealingQueue->first();
504              Voice* pNewVoice = LaunchVoice(pVoiceStealEvent, pVoiceStealEvent->Param.Note.Layer, pVoiceStealEvent->Param.Note.ReleaseTrigger, false);              RTList<Event>::Iterator end               = pVoiceStealingQueue->end();
505              if (pNewVoice) {              for (; itVoiceStealEvent != end; ++itVoiceStealEvent) {
506                  pNewVoice->Render(Samples);                  Pool<Voice>::Iterator itNewVoice = LaunchVoice(itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false);
507                  if (pNewVoice->IsActive()) active_voices++; // still active                  if (itNewVoice) {
508                  else { // voice reached end, is now inactive                      for (; itNewVoice; itNewVoice = itNewVoice->itChildVoice) {
509                      KillVoiceImmediately(pNewVoice); // remove voice from the list of active voices                          itNewVoice->Render(Samples);
510                            if (itNewVoice->IsActive()) active_voices++; // still active
511                            else { // voice reached end, is now inactive
512                                FreeVoice(itNewVoice); // remove voice from the list of active voices
513                            }
514                        }
515                  }                  }
516                    else dmsg(1,("gig::Engine: ERROR, voice stealing didn't work out!\n"));
517              }              }
             else dmsg(1,("Ouch, voice stealing didn't work out!\n"));  
             pVoiceStealEvent = pVoiceStealingQueue->next();  
518          }          }
519          // reset voice stealing for the new fragment          // reset voice stealing for the new fragment
520          pVoiceStealingQueue->clear();          pVoiceStealingQueue->clear();
521          pLastStolenVoice = NULL;          itLastStolenVoice = RTList<Voice>::Iterator();
522          puiLastStolenKey = NULL;          iuiLastStolenKey  = RTList<uint>::Iterator();
523    
524    
525            // free all keys which have no active voices left
526            {
527                RTList<uint>::Iterator iuiKey = pActiveKeys->first();
528                RTList<uint>::Iterator end    = pActiveKeys->end();
529                while (iuiKey != end) { // iterate through all active keys
530                    midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey];
531                    ++iuiKey;
532                    if (pKey->pActiveVoices->isEmpty()) FreeKey(pKey);
533                    #if DEVMODE
534                    else { // FIXME: should be removed before the final release (purpose: just a sanity check for debugging)
535                        RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
536                        RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
537                        for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
538                            if (itVoice->itKillEvent) {
539                                dmsg(1,("gig::Engine: ERROR, killed voice survived !!!\n"));
540                            }
541                        }
542                    }
543                    #endif // DEVMODE
544                }
545            }
546    
547    
548          // write that to the disk thread class so that it can print it          // write that to the disk thread class so that it can print it
# Line 597  namespace LinuxSampler { namespace gig { Line 650  namespace LinuxSampler { namespace gig {
650      /**      /**
651       *  Assigns and triggers a new voice for the respective MIDI key.       *  Assigns and triggers a new voice for the respective MIDI key.
652       *       *
653       *  @param pNoteOnEvent - key, velocity and time stamp of the event       *  @param itNoteOnEvent - key, velocity and time stamp of the event
654       */       */
655      void Engine::ProcessNoteOn(Event* pNoteOnEvent) {      void Engine::ProcessNoteOn(Pool<Event>::Iterator& itNoteOnEvent) {
656          midi_key_info_t* pKey = &pMIDIKeyInfo[pNoteOnEvent->Param.Note.Key];          midi_key_info_t* pKey = &pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];
657    
658          pKey->KeyPressed = true; // the MIDI key was now pressed down          pKey->KeyPressed = true; // the MIDI key was now pressed down
659    
660          // cancel release process of voices on this key if needed          // cancel release process of voices on this key if needed
661          if (pKey->Active && !SustainPedal) {          if (pKey->Active && !SustainPedal) {
662              Event* pCancelReleaseEvent = pKey->pEvents->alloc();              RTList<Event>::Iterator itCancelReleaseEvent = pKey->pEvents->allocAppend();
663              if (pCancelReleaseEvent) {              if (itCancelReleaseEvent) {
664                  *pCancelReleaseEvent = *pNoteOnEvent;                  *itCancelReleaseEvent = *itNoteOnEvent;                  // copy event
665                  pCancelReleaseEvent->Type = Event::type_cancel_release; // transform event type                  itCancelReleaseEvent->Type = Event::type_cancel_release; // transform event type
666              }              }
667              else dmsg(1,("Event pool emtpy!\n"));              else dmsg(1,("Event pool emtpy!\n"));
668          }          }
669    
670          // allocate and trigger a new voice for the key          // move note on event to the key's own event list
671          LaunchVoice(pNoteOnEvent);          RTList<Event>::Iterator itNoteOnEventOnKeyList = itNoteOnEvent.moveToEndOf(pKey->pEvents);
672    
673          // finally move note on event to the key's own event list          // allocate and trigger a new voice for the key
674          pEvents->move(pNoteOnEvent, pKey->pEvents);          LaunchVoice(itNoteOnEventOnKeyList, 0, false, true);
675      }      }
676    
677      /**      /**
# Line 627  namespace LinuxSampler { namespace gig { Line 680  namespace LinuxSampler { namespace gig {
680       *  sustain pedal will be released or voice turned inactive by itself (e.g.       *  sustain pedal will be released or voice turned inactive by itself (e.g.
681       *  due to completion of sample playback).       *  due to completion of sample playback).
682       *       *
683       *  @param pNoteOffEvent - key, velocity and time stamp of the event       *  @param itNoteOffEvent - key, velocity and time stamp of the event
684       */       */
685      void Engine::ProcessNoteOff(Event* pNoteOffEvent) {      void Engine::ProcessNoteOff(Pool<Event>::Iterator& itNoteOffEvent) {
686          midi_key_info_t* pKey = &pMIDIKeyInfo[pNoteOffEvent->Param.Note.Key];          midi_key_info_t* pKey = &pMIDIKeyInfo[itNoteOffEvent->Param.Note.Key];
687    
688          pKey->KeyPressed = false; // the MIDI key was now released          pKey->KeyPressed = false; // the MIDI key was now released
689    
690          // release voices on this key if needed          // release voices on this key if needed
691          if (pKey->Active && !SustainPedal) {          if (pKey->Active && !SustainPedal) {
692              pNoteOffEvent->Type = Event::type_release; // transform event type              itNoteOffEvent->Type = Event::type_release; // transform event type
693          }          }
694    
695            // move event to the key's own event list
696            RTList<Event>::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents);
697    
698          // spawn release triggered voice(s) if needed          // spawn release triggered voice(s) if needed
699          if (pKey->ReleaseTrigger) {          if (pKey->ReleaseTrigger) {
700              LaunchVoice(pNoteOffEvent, 0, true);              LaunchVoice(itNoteOffEventOnKeyList, 0, true, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples
701              pKey->ReleaseTrigger = false;              pKey->ReleaseTrigger = false;
702          }          }
   
         // move event to the key's own event list  
         pEvents->move(pNoteOffEvent, pKey->pEvents);  
703      }      }
704    
705      /**      /**
706       *  Moves pitchbend event from the general (input) event list to the pitch       *  Moves pitchbend event from the general (input) event list to the pitch
707       *  event list.       *  event list.
708       *       *
709       *  @param pPitchbendEvent - absolute pitch value and time stamp of the event       *  @param itPitchbendEvent - absolute pitch value and time stamp of the event
710       */       */
711      void Engine::ProcessPitchbend(Event* pPitchbendEvent) {      void Engine::ProcessPitchbend(Pool<Event>::Iterator& itPitchbendEvent) {
712          this->Pitch = pPitchbendEvent->Param.Pitch.Pitch; // store current pitch value          this->Pitch = itPitchbendEvent->Param.Pitch.Pitch; // store current pitch value
713          pEvents->move(pPitchbendEvent, pSynthesisEvents[Event::destination_vco]);          itPitchbendEvent.moveToEndOf(pSynthesisEvents[Event::destination_vco]);
714      }      }
715    
716      /**      /**
# Line 665  namespace LinuxSampler { namespace gig { Line 718  namespace LinuxSampler { namespace gig {
718       *  called by the ProcessNoteOn() method and by the voices itself       *  called by the ProcessNoteOn() method and by the voices itself
719       *  (e.g. to spawn further voices on the same key for layered sounds).       *  (e.g. to spawn further voices on the same key for layered sounds).
720       *       *
721       *  @param pNoteOnEvent        - key, velocity and time stamp of the event       *  @param itNoteOnEvent       - key, velocity and time stamp of the event
722       *  @param iLayer              - layer index for the new voice (optional - only       *  @param iLayer              - layer index for the new voice (optional - only
723       *                               in case of layered sounds of course)       *                               in case of layered sounds of course)
724       *  @param ReleaseTriggerVoice - if new voice is a release triggered voice       *  @param ReleaseTriggerVoice - if new voice is a release triggered voice
# Line 676  namespace LinuxSampler { namespace gig { Line 729  namespace LinuxSampler { namespace gig {
729       *  @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
730       *           if an error occured while trying to trigger the new voice       *           if an error occured while trying to trigger the new voice
731       */       */
732      Voice* Engine::LaunchVoice(Event* pNoteOnEvent, int iLayer, bool ReleaseTriggerVoice, bool VoiceStealing) {      Pool<Voice>::Iterator Engine::LaunchVoice(Pool<Event>::Iterator& itNoteOnEvent, int iLayer, bool ReleaseTriggerVoice, bool VoiceStealing) {
733          midi_key_info_t* pKey = &pMIDIKeyInfo[pNoteOnEvent->Param.Note.Key];          midi_key_info_t* pKey = &pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];
734    
735          // allocate a new voice for the key          // allocate a new voice for the key
736          Voice* pNewVoice = pKey->pActiveVoices->alloc();          Pool<Voice>::Iterator itNewVoice = pKey->pActiveVoices->allocAppend();
737          if (pNewVoice) {          if (itNewVoice) {
738              // launch the new voice              // launch the new voice
739              if (pNewVoice->Trigger(pNoteOnEvent, this->Pitch, this->pInstrument, iLayer, ReleaseTriggerVoice) < 0) {              if (itNewVoice->Trigger(itNoteOnEvent, this->Pitch, this->pInstrument, iLayer, ReleaseTriggerVoice, VoiceStealing) < 0) {
740                  dmsg(1,("Triggering new voice failed!\n"));                  dmsg(1,("Triggering new voice failed!\n"));
741                  pKey->pActiveVoices->free(pNewVoice);                  pKey->pActiveVoices->free(itNewVoice);
742              }              }
743              else { // on success              else { // on success
744                  uint** ppKeyGroup = NULL;                  uint** ppKeyGroup = NULL;
745                  if (pNewVoice->KeyGroup) { // if this voice / key belongs to a key group                  if (itNewVoice->KeyGroup) { // if this voice / key belongs to a key group
746                      ppKeyGroup = &ActiveKeyGroups[pNewVoice->KeyGroup];                      ppKeyGroup = &ActiveKeyGroups[itNewVoice->KeyGroup];
747                      if (*ppKeyGroup) { // if there's already an active key in that key group                      if (*ppKeyGroup) { // if there's already an active key in that key group
748                          midi_key_info_t* pOtherKey = &pMIDIKeyInfo[**ppKeyGroup];                          midi_key_info_t* pOtherKey = &pMIDIKeyInfo[**ppKeyGroup];
749                          // kill all voices on the (other) key                          // kill all voices on the (other) key
750                          Voice* pVoiceToBeKilled = pOtherKey->pActiveVoices->first();                          RTList<Voice>::Iterator itVoiceToBeKilled = pOtherKey->pActiveVoices->first();
751                          while (pVoiceToBeKilled) {                          RTList<Voice>::Iterator end               = pOtherKey->pActiveVoices->end();
752                              Voice* pVoiceToBeKilledNext = pOtherKey->pActiveVoices->next();                          for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) {
753                              if (pVoiceToBeKilled->Type != Voice::type_release_trigger) pVoiceToBeKilled->Kill(pNoteOnEvent);                              if (itVoiceToBeKilled->Type != Voice::type_release_trigger) itVoiceToBeKilled->Kill(itNoteOnEvent);
                             pOtherKey->pActiveVoices->set_current(pVoiceToBeKilled);  
                             pVoiceToBeKilled = pVoiceToBeKilledNext;  
754                          }                          }
755                      }                      }
756                  }                  }
757                  if (!pKey->Active) { // mark as active key                  if (!pKey->Active) { // mark as active key
758                      pKey->Active = true;                      pKey->Active = true;
759                      pKey->pSelf  = pActiveKeys->alloc();                      pKey->itSelf = pActiveKeys->allocAppend();
760                      *pKey->pSelf = pNoteOnEvent->Param.Note.Key;                      *pKey->itSelf = itNoteOnEvent->Param.Note.Key;
761                  }                  }
762                  if (pNewVoice->KeyGroup) {                  if (itNewVoice->KeyGroup) {
763                      *ppKeyGroup = pKey->pSelf; // 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
764                  }                  }
765                  if (pNewVoice->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)
766                  return pNewVoice; // success                  return itNewVoice; // success
767                }
768            }
769            else if (VoiceStealing) {
770                // first, get total amount of required voices (dependant on amount of layers)
771                ::gig::Region* pRegion = pInstrument->GetRegion(itNoteOnEvent->Param.Note.Key);
772                if (!pRegion) return Pool<Voice>::Iterator(); // nothing defined for this MIDI key, so no voice needed
773                int voicesRequired = pRegion->Layers;
774    
775                // now steal the (remaining) amount of voices
776                for (int i = iLayer; i < voicesRequired; i++)
777                    StealVoice(itNoteOnEvent);
778    
779                // put note-on event into voice-stealing queue, so it will be reprocessed after killed voice died
780                RTList<Event>::Iterator itStealEvent = pVoiceStealingQueue->allocAppend();
781                if (itStealEvent) {
782                    *itStealEvent = *itNoteOnEvent; // copy event
783                    itStealEvent->Param.Note.Layer = iLayer;
784                    itStealEvent->Param.Note.ReleaseTrigger = ReleaseTriggerVoice;
785              }              }
786                else dmsg(1,("Voice stealing queue full!\n"));
787          }          }
         else if (VoiceStealing) StealVoice(pNoteOnEvent, iLayer, ReleaseTriggerVoice); // no free voice left, so steal one  
788    
789          return NULL; // no free voice or error          return Pool<Voice>::Iterator(); // no free voice or error
790      }      }
791    
792      /**      /**
# Line 726  namespace LinuxSampler { namespace gig { Line 795  namespace LinuxSampler { namespace gig {
795       *  voice stealing and postpone the note-on event until the selected       *  voice stealing and postpone the note-on event until the selected
796       *  voice actually died.       *  voice actually died.
797       *       *
798       *  @param pNoteOnEvent        - key, velocity and time stamp of the event       *  @param itNoteOnEvent - key, velocity and time stamp of the event
      *  @param iLayer              - layer index for the new voice  
      *  @param ReleaseTriggerVoice - if new voice is a release triggered voice  
799       */       */
800      void Engine::StealVoice(Event* pNoteOnEvent, int iLayer, bool ReleaseTriggerVoice) {      void Engine::StealVoice(Pool<Event>::Iterator& itNoteOnEvent) {
801          if (!pEventPool->pool_is_empty()) {          if (!pEventPool->poolIsEmpty()) {
802    
803              uint*  puiOldestKey;              RTList<uint>::Iterator  iuiOldestKey;
804              Voice* pOldestVoice;              RTList<Voice>::Iterator itOldestVoice;
805    
806              // Select one voice for voice stealing              // Select one voice for voice stealing
807              switch (VOICE_STEAL_ALGORITHM) {              switch (VOICE_STEAL_ALGORITHM) {
# Line 744  namespace LinuxSampler { namespace gig { Line 811  namespace LinuxSampler { namespace gig {
811                  // key, or no voice left to kill there, then procceed with                  // key, or no voice left to kill there, then procceed with
812                  // 'oldestkey' algorithm                  // 'oldestkey' algorithm
813                  case voice_steal_algo_keymask: {                  case voice_steal_algo_keymask: {
814                      midi_key_info_t* pOldestKey = &pMIDIKeyInfo[pNoteOnEvent->Param.Note.Key];                      midi_key_info_t* pOldestKey = &pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];
815                      if (pLastStolenVoice) {                      if (itLastStolenVoice) {
816                          pOldestKey->pActiveVoices->set_current(pLastStolenVoice);                          itOldestVoice = itLastStolenVoice;
817                          pOldestVoice = pOldestKey->pActiveVoices->next();                          ++itOldestVoice;
818                      }                      }
819                      else { // no voice stolen in this audio fragment cycle yet                      else { // no voice stolen in this audio fragment cycle yet
820                          pOldestVoice = pOldestKey->pActiveVoices->first();                          itOldestVoice = pOldestKey->pActiveVoices->first();
821                      }                      }
822                      if (pOldestVoice) {                      if (itOldestVoice) {
823                          puiOldestKey = pOldestKey->pSelf;                          iuiOldestKey = pOldestKey->itSelf;
824                          break; // selection succeeded                          break; // selection succeeded
825                      }                      }
826                  } // no break - intentional !                  } // no break - intentional !
# Line 761  namespace LinuxSampler { namespace gig { Line 828  namespace LinuxSampler { namespace gig {
828                  // try to pick the oldest voice on the oldest active key                  // try to pick the oldest voice on the oldest active key
829                  // (caution: must stay after 'keymask' algorithm !)                  // (caution: must stay after 'keymask' algorithm !)
830                  case voice_steal_algo_oldestkey: {                  case voice_steal_algo_oldestkey: {
831                      if (pLastStolenVoice) {                      if (itLastStolenVoice) {
832                          midi_key_info_t* pOldestKey = &pMIDIKeyInfo[*puiLastStolenKey];                          midi_key_info_t* pOldestKey = &pMIDIKeyInfo[*iuiLastStolenKey];
833                          pOldestKey->pActiveVoices->set_current(pLastStolenVoice);                          itOldestVoice = itLastStolenVoice;
834                          pOldestVoice = pOldestKey->pActiveVoices->next();                          ++itOldestVoice;
835                          if (!pOldestVoice) {                          if (!itOldestVoice) {
836                              pActiveKeys->set_current(puiLastStolenKey);                              iuiOldestKey = iuiLastStolenKey;
837                              puiOldestKey = pActiveKeys->next();                              ++iuiOldestKey;
838                              if (puiOldestKey) {                              if (iuiOldestKey) {
839                                  midi_key_info_t* pOldestKey = &pMIDIKeyInfo[*puiOldestKey];                                  midi_key_info_t* pOldestKey = &pMIDIKeyInfo[*iuiOldestKey];
840                                  pOldestVoice = pOldestKey->pActiveVoices->first();                                  itOldestVoice = pOldestKey->pActiveVoices->first();
841                              }                              }
842                              else { // too less voices, even for voice stealing                              else {
843                                  dmsg(1,("Voice overflow! - You might recompile with higher MAX_AUDIO_VOICES!\n"));                                  dmsg(1,("gig::Engine: Warning, too less voices, even for voice stealing! - Better recompile with higher MAX_AUDIO_VOICES.\n"));
844                                  return;                                  return;
845                              }                              }
846                          }                          }
847                          else puiOldestKey = puiLastStolenKey;                          else iuiOldestKey = iuiLastStolenKey;
848                      }                      }
849                      else { // no voice stolen in this audio fragment cycle yet                      else { // no voice stolen in this audio fragment cycle yet
850                          puiOldestKey = pActiveKeys->first();                          iuiOldestKey = pActiveKeys->first();
851                          midi_key_info_t* pOldestKey = &pMIDIKeyInfo[*puiOldestKey];                          midi_key_info_t* pOldestKey = &pMIDIKeyInfo[*iuiOldestKey];
852                          pOldestVoice = pOldestKey->pActiveVoices->first();                          itOldestVoice = pOldestKey->pActiveVoices->first();
853                      }                      }
854                      break;                      break;
855                  }                  }
# Line 795  namespace LinuxSampler { namespace gig { Line 862  namespace LinuxSampler { namespace gig {
862                  }                  }
863              }              }
864    
865                //FIXME: can be removed, just a sanity check for debugging
866                if (!itOldestVoice->IsActive()) dmsg(1,("gig::Engine: ERROR, tried to steal a voice which was not active !!!\n"));
867    
868              // now kill the selected voice              // now kill the selected voice
869              pOldestVoice->Kill(pNoteOnEvent);              itOldestVoice->Kill(itNoteOnEvent);
870              // remember which voice on which key we stole, so we can simply proceed for the next voice stealing              // remember which voice on which key we stole, so we can simply proceed for the next voice stealing
871              this->pLastStolenVoice = pOldestVoice;              this->itLastStolenVoice = itOldestVoice;
872              this->puiLastStolenKey = puiOldestKey;              this->iuiLastStolenKey = iuiOldestKey;
             // put note-on event into voice-stealing queue, so it will be reprocessed after killed voice died  
             Event* pStealEvent = pVoiceStealingQueue->alloc();  
             *pStealEvent = *pNoteOnEvent;  
             pStealEvent->Param.Note.Layer = iLayer;  
             pStealEvent->Param.Note.ReleaseTrigger = ReleaseTriggerVoice;  
873          }          }
874          else dmsg(1,("Event pool emtpy!\n"));          else dmsg(1,("Event pool emtpy!\n"));
875      }      }
876    
877      /**      /**
878       *  Immediately kills the voice given with pVoice (no matter if sustain is       *  Removes the given voice from the MIDI key's list of active voices.
879       *  pressed or not) and removes it from the MIDI key's list of active voice.       *  This method will be called when a voice went inactive, e.g. because
880       *  This method will e.g. be called if a voice went inactive by itself.       *  it finished to playback its sample, finished its release stage or
881         *  just was killed.
882       *       *
883       *  @param pVoice - points to the voice to be killed       *  @param itVoice - points to the voice to be freed
884       */       */
885      void Engine::KillVoiceImmediately(Voice* pVoice) {      void Engine::FreeVoice(Pool<Voice>::Iterator& itVoice) {
886          if (pVoice) {          if (itVoice) {
887              if (pVoice->IsActive()) pVoice->KillImmediately();              midi_key_info_t* pKey = &pMIDIKeyInfo[itVoice->MIDIKey];
888    
889              midi_key_info_t* pKey = &pMIDIKeyInfo[pVoice->MIDIKey];              uint keygroup = itVoice->KeyGroup;
890    
891              // free the voice object              // free the voice object
892              pVoicePool->free(pVoice);              pVoicePool->free(itVoice);
893    
894              // check if there are no voices left on the MIDI key and update the key info if so              // if no other voices left and member of a key group, remove from key group
895              if (pKey->pActiveVoices->is_empty()) {              if (pKey->pActiveVoices->isEmpty() && keygroup) {
896                  if (pVoice->KeyGroup) { // if voice / key belongs to a key group                  uint** ppKeyGroup = &ActiveKeyGroups[keygroup];
897                      uint** ppKeyGroup = &ActiveKeyGroups[pVoice->KeyGroup];                  if (*ppKeyGroup == &*pKey->itSelf) *ppKeyGroup = NULL; // remove key from key group
                     if (*ppKeyGroup == pKey->pSelf) *ppKeyGroup = NULL; // remove key from key group  
                 }  
                 pKey->Active = false;  
                 pActiveKeys->free(pKey->pSelf); // remove key from list of active keys  
                 pKey->pSelf = NULL;  
                 pKey->ReleaseTrigger = false;  
                 pKey->pEvents->clear();  
                 dmsg(3,("Key has no more voices now\n"));  
898              }              }
899          }          }
900          else std::cerr << "Couldn't release voice! (pVoice == NULL)\n" << std::flush;          else std::cerr << "Couldn't release voice! (!itVoice)\n" << std::flush;
901        }
902    
903        /**
904         *  Called when there's no more voice left on a key, this call will
905         *  update the key info respectively.
906         *
907         *  @param pKey - key which is now inactive
908         */
909        void Engine::FreeKey(midi_key_info_t* pKey) {
910            if (pKey->pActiveVoices->isEmpty()) {
911                pKey->Active = false;
912                pActiveKeys->free(pKey->itSelf); // remove key from list of active keys
913                pKey->itSelf = RTList<uint>::Iterator();
914                pKey->ReleaseTrigger = false;
915                pKey->pEvents->clear();
916                dmsg(3,("Key has no more voices now\n"));
917            }
918            else dmsg(1,("gig::Engine: Oops, tried to free a key which contains voices.\n"));
919      }      }
920    
921      /**      /**
922       *  Reacts on supported control change commands (e.g. pitch bend wheel,       *  Reacts on supported control change commands (e.g. pitch bend wheel,
923       *  modulation wheel, aftertouch).       *  modulation wheel, aftertouch).
924       *       *
925       *  @param pControlChangeEvent - controller, value and time stamp of the event       *  @param itControlChangeEvent - controller, value and time stamp of the event
926       */       */
927      void Engine::ProcessControlChange(Event* pControlChangeEvent) {      void Engine::ProcessControlChange(Pool<Event>::Iterator& itControlChangeEvent) {
928          dmsg(4,("Engine::ContinuousController cc=%d v=%d\n", pControlChangeEvent->Param.CC.Controller, pControlChangeEvent->Param.CC.Value));          dmsg(4,("Engine::ContinuousController cc=%d v=%d\n", itControlChangeEvent->Param.CC.Controller, itControlChangeEvent->Param.CC.Value));
929    
930          switch (pControlChangeEvent->Param.CC.Controller) {          switch (itControlChangeEvent->Param.CC.Controller) {
931              case 64: {              case 64: {
932                  if (pControlChangeEvent->Param.CC.Value >= 64 && !SustainPedal) {                  if (itControlChangeEvent->Param.CC.Value >= 64 && !SustainPedal) {
933                      dmsg(4,("PEDAL DOWN\n"));                      dmsg(4,("PEDAL DOWN\n"));
934                      SustainPedal = true;                      SustainPedal = true;
935    
936                      // cancel release process of voices if necessary                      // cancel release process of voices if necessary
937                      uint* piKey = pActiveKeys->first();                      RTList<uint>::Iterator iuiKey = pActiveKeys->first();
938                      if (piKey) {                      if (iuiKey) {
939                          pControlChangeEvent->Type = Event::type_cancel_release; // transform event type                          itControlChangeEvent->Type = Event::type_cancel_release; // transform event type
940                          while (piKey) {                          while (iuiKey) {
941                              midi_key_info_t* pKey = &pMIDIKeyInfo[*piKey];                              midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey];
942                              pActiveKeys->set_current(piKey);                              ++iuiKey;
                             piKey = pActiveKeys->next();  
943                              if (!pKey->KeyPressed) {                              if (!pKey->KeyPressed) {
944                                  Event* pNewEvent = pKey->pEvents->alloc();                                  RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
945                                  if (pNewEvent) *pNewEvent = *pControlChangeEvent; // copy event to the key's own event list                                  if (itNewEvent) *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list
946                                  else dmsg(1,("Event pool emtpy!\n"));                                  else dmsg(1,("Event pool emtpy!\n"));
947                              }                              }
948                          }                          }
949                      }                      }
950                  }                  }
951                  if (pControlChangeEvent->Param.CC.Value < 64 && SustainPedal) {                  if (itControlChangeEvent->Param.CC.Value < 64 && SustainPedal) {
952                      dmsg(4,("PEDAL UP\n"));                      dmsg(4,("PEDAL UP\n"));
953                      SustainPedal = false;                      SustainPedal = false;
954    
955                      // release voices if their respective key is not pressed                      // release voices if their respective key is not pressed
956                      uint* piKey = pActiveKeys->first();                      RTList<uint>::Iterator iuiKey = pActiveKeys->first();
957                      if (piKey) {                      if (iuiKey) {
958                          pControlChangeEvent->Type = Event::type_release; // transform event type                          itControlChangeEvent->Type = Event::type_release; // transform event type
959                          while (piKey) {                          while (iuiKey) {
960                              midi_key_info_t* pKey = &pMIDIKeyInfo[*piKey];                              midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey];
961                              pActiveKeys->set_current(piKey);                              ++iuiKey;
                             piKey = pActiveKeys->next();  
962                              if (!pKey->KeyPressed) {                              if (!pKey->KeyPressed) {
963                                  Event* pNewEvent = pKey->pEvents->alloc();                                  RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
964                                  if (pNewEvent) *pNewEvent = *pControlChangeEvent; // copy event to the key's own event list                                  if (itNewEvent) *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list
965                                  else dmsg(1,("Event pool emtpy!\n"));                                  else dmsg(1,("Event pool emtpy!\n"));
966                              }                              }
967                          }                          }
# Line 898  namespace LinuxSampler { namespace gig { Line 972  namespace LinuxSampler { namespace gig {
972          }          }
973    
974          // update controller value in the engine's controller table          // update controller value in the engine's controller table
975          ControllerTable[pControlChangeEvent->Param.CC.Controller] = pControlChangeEvent->Param.CC.Value;          ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value;
976    
977          // move event from the unsorted event list to the control change event list          // move event from the unsorted event list to the control change event list
978          pEvents->move(pControlChangeEvent, pCCEvents);          itControlChangeEvent.moveToEndOf(pCCEvents);
979      }      }
980    
981      /**      /**
982       *  Reacts on MIDI system exclusive messages.       *  Reacts on MIDI system exclusive messages.
983       *       *
984       *  @param pSysexEvent - sysex data size and time stamp of the sysex event       *  @param itSysexEvent - sysex data size and time stamp of the sysex event
985       */       */
986      void Engine::ProcessSysex(Event* pSysexEvent) {      void Engine::ProcessSysex(Pool<Event>::Iterator& itSysexEvent) {
987          RingBuffer<uint8_t>::NonVolatileReader reader = pSysexBuffer->get_non_volatile_reader();          RingBuffer<uint8_t>::NonVolatileReader reader = pSysexBuffer->get_non_volatile_reader();
988    
989          uint8_t exclusive_status, id;          uint8_t exclusive_status, id;
# Line 957  namespace LinuxSampler { namespace gig { Line 1031  namespace LinuxSampler { namespace gig {
1031          }          }
1032    
1033          free_sysex_data: // finally free sysex data          free_sysex_data: // finally free sysex data
1034          pSysexBuffer->increment_read_ptr(pSysexEvent->Param.Sysex.Size);          pSysexBuffer->increment_read_ptr(itSysexEvent->Param.Sysex.Size);
1035      }      }
1036    
1037      /**      /**
# Line 1091  namespace LinuxSampler { namespace gig { Line 1165  namespace LinuxSampler { namespace gig {
1165      }      }
1166    
1167      String Engine::Version() {      String Engine::Version() {
1168          String s = "$Revision: 1.14 $";          String s = "$Revision: 1.19 $";
1169          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
1170      }      }
1171    
Legend:
Removed from v.250  
changed lines
  Added in v.319
  ViewVC Help
Powered by ViewVC