/[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 293 by schoenebeck, Mon Oct 25 15:14:27 2004 UTC revision 705 by schoenebeck, Wed Jul 20 21:43:23 2005 UTC
# Line 3  Line 3 
3   *   LinuxSampler - modular, streaming capable sampler                     *   *   LinuxSampler - modular, streaming capable sampler                     *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
6     *   Copyright (C) 2005 Christian Schoenebeck                              *
7   *                                                                         *   *                                                                         *
8   *   This program is free software; you can redistribute it and/or modify  *   *   This program is free software; you can redistribute it and/or modify  *
9   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 24  Line 25 
25  #include "DiskThread.h"  #include "DiskThread.h"
26  #include "Voice.h"  #include "Voice.h"
27  #include "EGADSR.h"  #include "EGADSR.h"
28    #include "../EngineFactory.h"
29    
30  #include "Engine.h"  #include "Engine.h"
31    
32    #if defined(__APPLE__)
33    # include <stdlib.h>
34    #else
35    # include <malloc.h>
36    #endif
37    
38  namespace LinuxSampler { namespace gig {  namespace LinuxSampler { namespace gig {
39    
40      InstrumentResourceManager Engine::Instruments;      InstrumentResourceManager Engine::instruments;
41    
42        std::map<AudioOutputDevice*,Engine*> Engine::engines;
43    
44        /**
45         * Get a gig::Engine object for the given gig::EngineChannel and the
46         * given AudioOutputDevice. All engine channels which are connected to
47         * the same audio output device will use the same engine instance. This
48         * method will be called by a gig::EngineChannel whenever it's
49         * connecting to a audio output device.
50         *
51         * @param pChannel - engine channel which acquires an engine object
52         * @param pDevice  - the audio output device \a pChannel is connected to
53         */
54        Engine* Engine::AcquireEngine(LinuxSampler::gig::EngineChannel* pChannel, AudioOutputDevice* pDevice) {
55            Engine* pEngine = NULL;
56            // check if there's already an engine for the given audio output device
57            if (engines.count(pDevice)) {
58                dmsg(4,("Using existing gig::Engine.\n"));
59                pEngine = engines[pDevice];
60            } else { // create a new engine (and disk thread) instance for the given audio output device
61                dmsg(4,("Creating new gig::Engine.\n"));
62                pEngine = (Engine*) EngineFactory::Create("gig");
63                pEngine->Connect(pDevice);
64                engines[pDevice] = pEngine;
65            }
66            // register engine channel to the engine instance
67            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()));
71            return pEngine;
72        }
73    
74        /**
75         * Once an engine channel is disconnected from an audio output device,
76         * it wil immediately call this method to unregister itself from the
77         * engine instance and if that engine instance is not used by any other
78         * engine channel anymore, then that engine instance will be destroyed.
79         *
80         * @param pChannel - engine channel which wants to disconnect from it's
81         *                   engine instance
82         * @param pDevice  - audio output device \a pChannel was connected to
83         */
84        void Engine::FreeEngine(LinuxSampler::gig::EngineChannel* pChannel, AudioOutputDevice* pDevice) {
85            dmsg(4,("Disconnecting EngineChannel from gig::Engine.\n"));
86            Engine* pEngine = engines[pDevice];
87            // unregister EngineChannel from the Engine instance
88            pEngine->engineChannels.remove(pChannel);
89            // if the used Engine instance is not used anymore, then destroy it
90            if (pEngine->engineChannels.empty()) {
91                pDevice->Disconnect(pEngine);
92                engines.erase(pDevice);
93                delete pEngine;
94                dmsg(4,("Destroying gig::Engine.\n"));
95            }
96            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() {
         pRIFF              = NULL;  
         pGig               = NULL;  
         pInstrument        = NULL;  
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);
         pActiveKeys        = new Pool<uint>(128);  
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);  
         }  
         for (uint i = 0; i < 128; i++) {  
             pMIDIKeyInfo[i].pActiveVoices  = new RTList<Voice>(pVoicePool);  
             pMIDIKeyInfo[i].KeyPressed     = false;  
             pMIDIKeyInfo[i].Active         = false;  
             pMIDIKeyInfo[i].ReleaseTrigger = false;  
             pMIDIKeyInfo[i].pEvents        = 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 65  namespace LinuxSampler { namespace gig { Line 118  namespace LinuxSampler { namespace gig {
118          pBasicFilterParameters  = NULL;          pBasicFilterParameters  = NULL;
119          pMainFilterParameters   = NULL;          pMainFilterParameters   = NULL;
120    
         InstrumentIdx = -1;  
         InstrumentStat = -1;  
   
         AudioDeviceChannelLeft  = -1;  
         AudioDeviceChannelRight = -1;  
   
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..."));
131              pDiskThread->StopThread();              pDiskThread->StopThread();
132              delete pDiskThread;              delete pDiskThread;
133                dmsg(1,("OK\n"));
134          }          }
         if (pGig)  delete pGig;  
         if (pRIFF) delete pRIFF;  
         for (uint i = 0; i < 128; i++) {  
             if (pMIDIKeyInfo[i].pActiveVoices) delete pMIDIKeyInfo[i].pActiveVoices;  
             if (pMIDIKeyInfo[i].pEvents)       delete pMIDIKeyInfo[i].pEvents;  
         }  
         for (uint i = 0; i < Event::destination_count; i++) {  
             if (pSynthesisEvents[i]) delete pSynthesisEvents[i];  
         }  
         delete[] pSynthesisEvents;  
         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)  delete pVoicePool;          if (pVoicePool) {
138          if (pActiveKeys) delete pActiveKeys;              pVoicePool->clear();
139          if (pSysexBuffer) delete pSysexBuffer;              delete pVoicePool;
140            }
141          if (pEventGenerator) delete pEventGenerator;          if (pEventGenerator) delete pEventGenerator;
142          if (pMainFilterParameters) delete[] pMainFilterParameters;          if (pMainFilterParameters) delete[] pMainFilterParameters;
143          if (pBasicFilterParameters) delete[] pBasicFilterParameters;          if (pBasicFilterParameters) delete[] pBasicFilterParameters;
144          if (pSynthesisParameters[0]) delete[] pSynthesisParameters[0];          if (pSynthesisParameters[0]) free(pSynthesisParameters[0]);
145          if (pVoiceStealingQueue) delete pVoiceStealingQueue;          if (pVoiceStealingQueue) delete pVoiceStealingQueue;
146            if (pSysexBuffer) delete pSysexBuffer;
147            EngineFactory::Destroy(this);
148      }      }
149    
150      void Engine::Enable() {      void Engine::Enable() {
# Line 127  namespace LinuxSampler { namespace gig { Line 171  namespace LinuxSampler { namespace gig {
171       */       */
172      void Engine::Reset() {      void Engine::Reset() {
173          DisableAndLock();          DisableAndLock();
   
         //if (pAudioOutputDevice->IsPlaying()) { // if already running  
             /*  
             // signal audio thread not to enter render part anymore  
             SuspensionRequested = true;  
             // sleep until wakened by audio thread  
             pthread_mutex_lock(&__render_state_mutex);  
             pthread_cond_wait(&__render_exit_condition, &__render_state_mutex);  
             pthread_mutex_unlock(&__render_state_mutex);  
             */  
         //}  
   
         //if (wasplaying) pAudioOutputDevice->Stop();  
   
174          ResetInternal();          ResetInternal();
175            ResetScaleTuning();
         // signal audio thread to continue with rendering  
         //SuspensionRequested = false;  
176          Enable();          Enable();
177      }      }
178    
# Line 153  namespace LinuxSampler { namespace gig { Line 181  namespace LinuxSampler { namespace gig {
181       *  control and status variables. This method is not thread safe!       *  control and status variables. This method is not thread safe!
182       */       */
183      void Engine::ResetInternal() {      void Engine::ResetInternal() {
         Pitch               = 0;  
         SustainPedal        = false;  
184          ActiveVoiceCount    = 0;          ActiveVoiceCount    = 0;
185          ActiveVoiceCountMax = 0;          ActiveVoiceCountMax = 0;
         GlobalVolume        = 1.0;  
186    
187          // reset voice stealing parameters          // reset voice stealing parameters
         itLastStolenVoice = RTList<Voice>::Iterator();  
         iuiLastStolenKey  = RTList<uint>::Iterator();  
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          // set all MIDI controller values to zero          pLastStolenChannel         = NULL;
         memset(ControllerTable, 0x00, 128);  
   
         // reset key info  
         for (uint i = 0; i < 128; i++) {  
             pMIDIKeyInfo[i].pActiveVoices->clear();  
             pMIDIKeyInfo[i].pEvents->clear();  
             pMIDIKeyInfo[i].KeyPressed     = false;  
             pMIDIKeyInfo[i].Active         = false;  
             pMIDIKeyInfo[i].ReleaseTrigger = false;  
             pMIDIKeyInfo[i].itSelf         = Pool<uint>::Iterator();  
         }  
   
         // reset all key groups  
         map<uint,uint*>::iterator iter = ActiveKeyGroups.begin();  
         for (; iter != ActiveKeyGroups.end(); iter++) iter->second = 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 190  namespace LinuxSampler { namespace gig { Line 198  namespace LinuxSampler { namespace gig {
198          }          }
199          pVoicePool->clear();          pVoicePool->clear();
200    
         // free all active keys  
         pActiveKeys->clear();  
   
201          // reset disk thread          // reset disk thread
202          if (pDiskThread) pDiskThread->Reset();          if (pDiskThread) pDiskThread->Reset();
203    
# Line 201  namespace LinuxSampler { namespace gig { Line 206  namespace LinuxSampler { namespace gig {
206      }      }
207    
208      /**      /**
209       *  Load an instrument from a .gig file.       * Reset to normal, chromatic scale (means equal tempered).
      *  
      *  @param FileName   - file name of the Gigasampler instrument file  
      *  @param Instrument - index of the instrument in the .gig file  
      *  @throws LinuxSamplerException  on error  
      *  @returns          detailed description of the method call result  
210       */       */
211      void Engine::LoadInstrument(const char* FileName, uint Instrument) {      void Engine::ResetScaleTuning() {
212            memset(&ScaleTuning[0], 0x00, 12);
         DisableAndLock();  
   
         ResetInternal(); // reset engine  
   
         // free old instrument  
         if (pInstrument) {  
             // give old instrument back to instrument manager  
             Instruments.HandBack(pInstrument, this);  
         }  
   
         InstrumentFile = FileName;  
         InstrumentIdx = Instrument;  
         InstrumentStat = 0;  
   
         // delete all key groups  
         ActiveKeyGroups.clear();  
   
         // request gig instrument from instrument manager  
         try {  
             instrument_id_t instrid;  
             instrid.FileName    = FileName;  
             instrid.iInstrument = Instrument;  
             pInstrument = Instruments.Borrow(instrid, this);  
             if (!pInstrument) {  
                 InstrumentStat = -1;  
                 dmsg(1,("no instrument loaded!!!\n"));  
                 exit(EXIT_FAILURE);  
             }  
         }  
         catch (RIFF::Exception e) {  
             InstrumentStat = -2;  
             String msg = "gig::Engine error: Failed to load instrument, cause: " + e.Message;  
             throw LinuxSamplerException(msg);  
         }  
         catch (InstrumentResourceManagerException e) {  
             InstrumentStat = -3;  
             String msg = "gig::Engine error: Failed to load instrument, cause: " + e.Message();  
             throw LinuxSamplerException(msg);  
         }  
         catch (...) {  
             InstrumentStat = -4;  
             throw LinuxSamplerException("gig::Engine error: Failed to load instrument, cause: Unknown exception while trying to parse gig file.");  
         }  
   
         // rebuild ActiveKeyGroups map with key groups of current instrument  
         for (::gig::Region* pRegion = pInstrument->GetFirstRegion(); pRegion; pRegion = pInstrument->GetNextRegion())  
             if (pRegion->KeyGroup) ActiveKeyGroups[pRegion->KeyGroup] = NULL;  
   
         InstrumentStat = 100;  
   
         // inform audio driver for the need of two channels  
         try {  
             if (pAudioOutputDevice) pAudioOutputDevice->AcquireChannels(2); // gig Engine only stereo  
         }  
         catch (AudioOutputException e) {  
             String msg = "Audio output device unable to provide 2 audio channels, cause: " + e.Message();  
             throw LinuxSamplerException(msg);  
         }  
   
         Enable();  
     }  
   
     /**  
      * Will be called by the InstrumentResourceManager when the instrument  
      * we are currently using in this engine is going to be updated, so we  
      * can stop playback before that happens.  
      */  
     void Engine::ResourceToBeUpdated(::gig::Instrument* pResource, void*& pUpdateArg) {  
         dmsg(3,("gig::Engine: Received instrument update message.\n"));  
         DisableAndLock();  
         ResetInternal();  
         this->pInstrument = NULL;  
213      }      }
214    
215      /**      /**
216       * Will be called by the InstrumentResourceManager when the instrument       * Connect this engine instance with the given audio output device.
217       * update process was completed, so we can continue with playback.       * 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       */       */
     void Engine::ResourceUpdated(::gig::Instrument* pOldResource, ::gig::Instrument* pNewResource, void* pUpdateArg) {  
         this->pInstrument = pNewResource; //TODO: there are couple of engine parameters we should update here as well if the instrument was updated (see LoadInstrument())  
         Enable();  
     }  
   
224      void Engine::Connect(AudioOutputDevice* pAudioOut) {      void Engine::Connect(AudioOutputDevice* pAudioOut) {
225          pAudioOutputDevice = pAudioOut;          pAudioOutputDevice = pAudioOut;
226    
# Line 307  namespace LinuxSampler { namespace gig { Line 235  namespace LinuxSampler { namespace gig {
235              throw LinuxSamplerException(msg);              throw LinuxSamplerException(msg);
236          }          }
237    
238          this->AudioDeviceChannelLeft  = 0;          this->MaxSamplesPerCycle = pAudioOutputDevice->MaxSamplesPerCycle();
239          this->AudioDeviceChannelRight = 1;          this->SampleRate         = pAudioOutputDevice->SampleRate();
         this->pOutputLeft             = pAudioOutputDevice->Channel(0)->Buffer();  
         this->pOutputRight            = pAudioOutputDevice->Channel(1)->Buffer();  
         this->MaxSamplesPerCycle      = pAudioOutputDevice->MaxSamplesPerCycle();  
         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 to 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) {
259                dmsg(1,("Stopping disk thread..."));
260              this->pDiskThread->StopThread();              this->pDiskThread->StopThread();
261              delete this->pDiskThread;              delete this->pDiskThread;
262                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 341  namespace LinuxSampler { namespace gig { Line 278  namespace LinuxSampler { namespace gig {
278          pEventGenerator = new EventGenerator(pAudioOut->SampleRate());          pEventGenerator = new EventGenerator(pAudioOut->SampleRate());
279    
280          // (re)allocate synthesis parameter matrix          // (re)allocate synthesis parameter matrix
281          if (pSynthesisParameters[0]) delete[] pSynthesisParameters[0];          if (pSynthesisParameters[0]) free(pSynthesisParameters[0]);
282          pSynthesisParameters[0] = new float[Event::destination_count * pAudioOut->MaxSamplesPerCycle()];  
283            #if defined(__APPLE__)
284            pSynthesisParameters[0] = (float *) malloc(Event::destination_count * sizeof(float) * pAudioOut->MaxSamplesPerCycle());
285            #else
286            pSynthesisParameters[0] = (float *) memalign(16,(Event::destination_count * sizeof(float) * pAudioOut->MaxSamplesPerCycle()));
287            #endif
288          for (int dst = 1; dst < Event::destination_count; dst++)          for (int dst = 1; dst < Event::destination_count; dst++)
289              pSynthesisParameters[dst] = pSynthesisParameters[dst - 1] + pAudioOut->MaxSamplesPerCycle();              pSynthesisParameters[dst] = pSynthesisParameters[dst - 1] + pAudioOut->MaxSamplesPerCycle();
290    
# Line 364  namespace LinuxSampler { namespace gig { Line 306  namespace LinuxSampler { namespace gig {
306          }          }
307      }      }
308    
309      void Engine::DisconnectAudioOutputDevice() {      /**
310          if (pAudioOutputDevice) { // if clause to prevent disconnect loops       * Clear all engine global event lists.
311              AudioOutputDevice* olddevice = pAudioOutputDevice;       */
312              pAudioOutputDevice = NULL;      void Engine::ClearEventLists() {
313              olddevice->Disconnect(this);          pGlobalEvents->clear();
314              AudioDeviceChannelLeft  = -1;      }
315              AudioDeviceChannelRight = -1;  
316        /**
317         * Copy all events from the engine's global input queue buffer to the
318         * engine's internal event list. This will be done at the beginning of
319         * each audio cycle (that is each RenderAudio() call) to distinguish
320         * all global events which have to be processed in the current audio
321         * cycle. These events are usually just SysEx messages. Every
322         * EngineChannel has it's own input event queue buffer and event list
323         * to handle common events like NoteOn, NoteOff and ControlChange
324         * events.
325         *
326         * @param Samples - number of sample points to be processed in the
327         *                  current audio cycle
328         */
329        void Engine::ImportEvents(uint Samples) {
330            RingBuffer<Event>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();
331            Event* pEvent;
332            while (true) {
333                // get next event from input event queue
334                if (!(pEvent = eventQueueReader.pop())) break;
335                // if younger event reached, ignore that and all subsequent ones for now
336                if (pEvent->FragmentPos() >= Samples) {
337                    eventQueueReader--;
338                    dmsg(2,("Younger Event, pos=%d ,Samples=%d!\n",pEvent->FragmentPos(),Samples));
339                    pEvent->ResetFragmentPos();
340                    break;
341                }
342                // copy event to internal event list
343                if (pGlobalEvents->poolIsEmpty()) {
344                    dmsg(1,("Event pool emtpy!\n"));
345                    break;
346                }
347                *pGlobalEvents->allocAppend() = *pEvent;
348          }          }
349            eventQueueReader.free(); // free all copied events from input queue
350      }      }
351    
352      /**      /**
# Line 387  namespace LinuxSampler { namespace gig { Line 362  namespace LinuxSampler { namespace gig {
362      int Engine::RenderAudio(uint Samples) {      int Engine::RenderAudio(uint Samples) {
363          dmsg(5,("RenderAudio(Samples=%d)\n", Samples));          dmsg(5,("RenderAudio(Samples=%d)\n", Samples));
364    
365          // return if no instrument loaded or engine disabled          // return if engine disabled
366          if (EngineDisabled.Pop()) {          if (EngineDisabled.Pop()) {
367              dmsg(5,("gig::Engine: engine disabled (val=%d)\n",EngineDisabled.GetUnsafe()));              dmsg(5,("gig::Engine: engine disabled (val=%d)\n",EngineDisabled.GetUnsafe()));
368              return 0;              return 0;
369          }          }
         if (!pInstrument) {  
             dmsg(5,("gig::Engine: no instrument loaded\n"));  
             return 0;  
         }  
   
370    
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            // We only allow a maximum of CONFIG_MAX_VOICES voices to be spawned
375            // 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
380            // (these are usually just SysEx messages)
381            ImportEvents(Samples);
382    
383          // empty the event lists for the new fragment          // process engine global events (these are currently only MIDI System Exclusive messages)
         pEvents->clear();  
         pCCEvents->clear();  
         for (uint i = 0; i < Event::destination_count; i++) {  
             pSynthesisEvents[i]->clear();  
         }  
384          {          {
385              RTList<uint>::Iterator iuiKey = pActiveKeys->first();              RTList<Event>::Iterator itEvent = pGlobalEvents->first();
386              RTList<uint>::Iterator end    = pActiveKeys->end();              RTList<Event>::Iterator end     = pGlobalEvents->end();
387              for(; iuiKey != end; ++iuiKey) {              for (; itEvent != end; ++itEvent) {
388                  pMIDIKeyInfo[*iuiKey].pEvents->clear(); // free all events on the key                  switch (itEvent->Type) {
389                        case Event::type_sysex:
390                            dmsg(5,("Engine: Sysex received\n"));
391                            ProcessSysex(itEvent);
392                            break;
393                    }
394              }              }
395          }          }
396    
397            // reset internal voice counter (just for statistic of active voices)
398            ActiveVoiceCountTemp = 0;
399    
400          // get all events from the input event queue which belong to the current fragment          // handle events on all engine channels
401          {          for (int i = 0; i < engineChannels.size(); i++) {
402              RingBuffer<Event>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();              if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded
403              Event* pEvent;              ProcessEvents(engineChannels[i], Samples);
404              while (true) {          }
405                  // get next event from input event queue  
406                  if (!(pEvent = eventQueueReader.pop())) break;          // render all 'normal', active voices on all engine channels
407                  // if younger event reached, ignore that and all subsequent ones for now          for (int i = 0; i < engineChannels.size(); i++) {
408                  if (pEvent->FragmentPos() >= Samples) {              if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded
409                      eventQueueReader--;              RenderActiveVoices(engineChannels[i], Samples);
410                      dmsg(2,("Younger Event, pos=%d ,Samples=%d!\n",pEvent->FragmentPos(),Samples));          }
411                      pEvent->ResetFragmentPos();  
412                      break;          // now that all ordinary voices on ALL engine channels are rendered, render new stolen voices
413                  }          RenderStolenVoices(Samples);
414                  // copy event to internal event list  
415                  if (pEvents->poolIsEmpty()) {          // handle cleanup on all engine channels for the next audio fragment
416                      dmsg(1,("Event pool emtpy!\n"));          for (int i = 0; i < engineChannels.size(); i++) {
417                      break;              if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded
418                  }              PostProcess(engineChannels[i]);
                 *pEvents->allocAppend() = *pEvent;  
             }  
             eventQueueReader.free(); // free all copied events from input queue  
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
429            ActiveVoiceCount = ActiveVoiceCountTemp;
430            if (ActiveVoiceCount > ActiveVoiceCountMax) ActiveVoiceCountMax = ActiveVoiceCount;
431    
432            FrameTime += Samples;
433    
434            return 0;
435        }
436    
437        /**
438         * Dispatch and handle all events in this audio fragment for the given
439         * engine channel.
440         *
441         * @param pEngineChannel - engine channel on which events should be
442         *                         processed
443         * @param Samples        - amount of sample points to be processed in
444         *                         this audio fragment cycle
445         */
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
448            // (these are the common events like NoteOn, NoteOff, ControlChange, etc.)
449            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:
458                          dmsg(5,("Engine: Note on received\n"));                          dmsg(5,("Engine: Note on received\n"));
459                          ProcessNoteOn(itEvent);                          ProcessNoteOn((EngineChannel*)itEvent->pEngineChannel, itEvent);
460                          break;                          break;
461                      case Event::type_note_off:                      case Event::type_note_off:
462                          dmsg(5,("Engine: Note off received\n"));                          dmsg(5,("Engine: Note off received\n"));
463                          ProcessNoteOff(itEvent);                          ProcessNoteOff((EngineChannel*)itEvent->pEngineChannel, itEvent);
464                          break;                          break;
465                      case Event::type_control_change:                      case Event::type_control_change:
466                          dmsg(5,("Engine: MIDI CC received\n"));                          dmsg(5,("Engine: MIDI CC received\n"));
467                          ProcessControlChange(itEvent);                          ProcessControlChange((EngineChannel*)itEvent->pEngineChannel, itEvent);
468                          break;                          break;
469                      case Event::type_pitchbend:                      case Event::type_pitchbend:
470                          dmsg(5,("Engine: Pitchbend received\n"));                          dmsg(5,("Engine: Pitchbend received\n"));
471                          ProcessPitchbend(itEvent);                          ProcessPitchbend((EngineChannel*)itEvent->pEngineChannel, itEvent);
                         break;  
                     case Event::type_sysex:  
                         dmsg(5,("Engine: Sysex received\n"));  
                         ProcessSysex(itEvent);  
472                          break;                          break;
473                  }                  }
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          int active_voices = 0;      /**
486         * Render all 'normal' voices (that is voices which were not stolen in
487          // render audio from all active voices       * this fragment) on the given engine channel.
488          {       *
489              RTList<uint>::Iterator iuiKey = pActiveKeys->first();       * @param pEngineChannel - engine channel on which audio should be
490              RTList<uint>::Iterator end    = pActiveKeys->end();       *                         rendered
491              while (iuiKey != end) { // iterate through all active keys       * @param Samples        - amount of sample points to be rendered in
492                  midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey];       *                         this audio fragment cycle
493                  ++iuiKey;       */
494        void Engine::RenderActiveVoices(EngineChannel* pEngineChannel, uint Samples) {
495                  RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();          if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted
496                  RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();  
497                  for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key          RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
498                      // now render current voice          RTList<uint>::Iterator end    = pEngineChannel->pActiveKeys->end();
499                      itVoice->Render(Samples);          while (iuiKey != end) { // iterate through all active keys
500                      if (itVoice->IsActive()) active_voices++; // still active              midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
501                      else { // voice reached end, is now inactive              ++iuiKey;
502                          FreeVoice(itVoice); // remove voice from the list of active voices  
503                      }              RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
504                RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
505                for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
506                    // now render current voice
507                    itVoice->Render(Samples);
508                    if (itVoice->IsActive()) ActiveVoiceCountTemp++; // still active
509                    else { // voice reached end, is now inactive
510                        FreeVoice(pEngineChannel, itVoice); // remove voice from the list of active voices
511                  }                  }
512              }              }
513          }          }
514        }
515    
516        /**
517          // now render all postponed voices from voice stealing       * Render all stolen voices (only voices which were stolen in this
518          {       * fragment) on the given engine channel. Stolen voices are rendered
519              RTList<Event>::Iterator itVoiceStealEvent = pVoiceStealingQueue->first();       * after all normal voices have been rendered; this is needed to render
520              RTList<Event>::Iterator end               = pVoiceStealingQueue->end();       * audio of those voices which were selected for voice stealing until
521              for (; itVoiceStealEvent != end; ++itVoiceStealEvent) {       * the point were the stealing (that is the take over of the voice)
522                  Pool<Voice>::Iterator itNewVoice = LaunchVoice(itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false);       * actually happened.
523                  if (itNewVoice) {       *
524                      for (; itNewVoice; itNewVoice = itNewVoice->itChildVoice) {       * @param pEngineChannel - engine channel on which audio should be
525                          itNewVoice->Render(Samples);       *                         rendered
526                          if (itNewVoice->IsActive()) active_voices++; // still active       * @param Samples        - amount of sample points to be rendered in
527                          else { // voice reached end, is now inactive       *                         this audio fragment cycle
528                              FreeVoice(itNewVoice); // remove voice from the list of active voices       */
529                          }      void Engine::RenderStolenVoices(uint Samples) {
530                      }          RTList<Event>::Iterator itVoiceStealEvent = pVoiceStealingQueue->first();
531            RTList<Event>::Iterator end               = pVoiceStealingQueue->end();
532            for (; itVoiceStealEvent != end; ++itVoiceStealEvent) {
533                EngineChannel* pEngineChannel = (EngineChannel*) itVoiceStealEvent->pEngineChannel;
534                Pool<Voice>::Iterator itNewVoice =
535                    LaunchVoice(pEngineChannel, itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false, false);
536                if (itNewVoice) {
537                    itNewVoice->Render(Samples);
538                    if (itNewVoice->IsActive()) ActiveVoiceCountTemp++; // still active
539                    else { // voice reached end, is now inactive
540                        FreeVoice(pEngineChannel, itNewVoice); // remove voice from the list of active voices
541                  }                  }
                 else dmsg(1,("gig::Engine: ERROR, voice stealing didn't work out!\n"));  
542              }              }
543          }              else dmsg(1,("gig::Engine: ERROR, voice stealing didn't work out!\n"));
         // reset voice stealing for the new fragment  
         pVoiceStealingQueue->clear();  
         itLastStolenVoice = RTList<Voice>::Iterator();  
         iuiLastStolenKey  = RTList<uint>::Iterator();  
544    
545                // we need to clear the key's event list explicitly here in case key was never active
546                midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itVoiceStealEvent->Param.Note.Key];
547                pKey->VoiceTheftsQueued--;
548                if (!pKey->Active && !pKey->VoiceTheftsQueued) pKey->pEvents->clear();
549            }
550        }
551    
552        /**
553         * Free all keys which have turned inactive in this audio fragment, from
554         * the list of active keys and clear all event lists on that engine
555         * channel.
556         *
557         * @param pEngineChannel - engine channel to cleanup
558         */
559        void Engine::PostProcess(EngineChannel* pEngineChannel) {
560          // free all keys which have no active voices left          // free all keys which have no active voices left
561          {          {
562              RTList<uint>::Iterator iuiKey = pActiveKeys->first();              RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
563              RTList<uint>::Iterator end    = pActiveKeys->end();              RTList<uint>::Iterator end    = pEngineChannel->pActiveKeys->end();
564              while (iuiKey != end) { // iterate through all active keys              while (iuiKey != end) { // iterate through all active keys
565                  midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey];                  midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
566                  ++iuiKey;                  ++iuiKey;
567                  if (pKey->pActiveVoices->isEmpty()) FreeKey(pKey);                  if (pKey->pActiveVoices->isEmpty()) FreeKey(pEngineChannel, pKey);
568                  #if DEVMODE                  #if CONFIG_DEVMODE
569                  else { // FIXME: should be removed before the final release (purpose: just a sanity check for debugging)                  else { // just a sanity check for debugging
570                      RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();                      RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
571                      RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();                      RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
572                      for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key                      for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
# Line 539  namespace LinuxSampler { namespace gig { Line 575  namespace LinuxSampler { namespace gig {
575                          }                          }
576                      }                      }
577                  }                  }
578                  #endif // DEVMODE                  #endif // CONFIG_DEVMODE
579              }              }
580          }          }
581    
582            // empty the engine channel's own event lists
583          // write that to the disk thread class so that it can print it          pEngineChannel->ClearEventLists();
         // on the console for debugging purposes  
         ActiveVoiceCount = active_voices;  
         if (ActiveVoiceCount > ActiveVoiceCountMax) ActiveVoiceCountMax = ActiveVoiceCount;  
   
   
         return 0;  
     }  
   
     /**  
      *  Will be called by the MIDIIn Thread to let the audio thread trigger a new  
      *  voice for the given key.  
      *  
      *  @param Key      - MIDI key number of the triggered key  
      *  @param Velocity - MIDI velocity value of the triggered key  
      */  
     void Engine::SendNoteOn(uint8_t Key, uint8_t Velocity) {  
         Event event               = pEventGenerator->CreateEvent();  
         event.Type                = Event::type_note_on;  
         event.Param.Note.Key      = Key;  
         event.Param.Note.Velocity = Velocity;  
         if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);  
         else dmsg(1,("Engine: Input event queue full!"));  
     }  
   
     /**  
      *  Will be called by the MIDIIn Thread to signal the audio thread to release  
      *  voice(s) on the given key.  
      *  
      *  @param Key      - MIDI key number of the released key  
      *  @param Velocity - MIDI release velocity value of the released key  
      */  
     void Engine::SendNoteOff(uint8_t Key, uint8_t Velocity) {  
         Event event               = pEventGenerator->CreateEvent();  
         event.Type                = Event::type_note_off;  
         event.Param.Note.Key      = Key;  
         event.Param.Note.Velocity = Velocity;  
         if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);  
         else dmsg(1,("Engine: Input event queue full!"));  
     }  
   
     /**  
      *  Will be called by the MIDIIn Thread to signal the audio thread to change  
      *  the pitch value for all voices.  
      *  
      *  @param Pitch - MIDI pitch value (-8192 ... +8191)  
      */  
     void Engine::SendPitchbend(int Pitch) {  
         Event event             = pEventGenerator->CreateEvent();  
         event.Type              = Event::type_pitchbend;  
         event.Param.Pitch.Pitch = Pitch;  
         if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);  
         else dmsg(1,("Engine: Input event queue full!"));  
     }  
   
     /**  
      *  Will be called by the MIDIIn Thread to signal the audio thread that a  
      *  continuous controller value has changed.  
      *  
      *  @param Controller - MIDI controller number of the occured control change  
      *  @param Value      - value of the control change  
      */  
     void Engine::SendControlChange(uint8_t Controller, uint8_t Value) {  
         Event event               = pEventGenerator->CreateEvent();  
         event.Type                = Event::type_control_change;  
         event.Param.CC.Controller = Controller;  
         event.Param.CC.Value      = Value;  
         if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);  
         else dmsg(1,("Engine: Input event queue full!"));  
584      }      }
585    
586      /**      /**
# Line 626  namespace LinuxSampler { namespace gig { Line 594  namespace LinuxSampler { namespace gig {
594          Event event             = pEventGenerator->CreateEvent();          Event event             = pEventGenerator->CreateEvent();
595          event.Type              = Event::type_sysex;          event.Type              = Event::type_sysex;
596          event.Param.Sysex.Size  = Size;          event.Param.Sysex.Size  = Size;
597            event.pEngineChannel    = NULL; // as Engine global event
598          if (pEventQueue->write_space() > 0) {          if (pEventQueue->write_space() > 0) {
599              if (pSysexBuffer->write_space() >= Size) {              if (pSysexBuffer->write_space() >= Size) {
600                  // copy sysex data to input buffer                  // copy sysex data to input buffer
# Line 641  namespace LinuxSampler { namespace gig { Line 610  namespace LinuxSampler { namespace gig {
610                  // finally place sysex event into input event queue                  // finally place sysex event into input event queue
611                  pEventQueue->push(&event);                  pEventQueue->push(&event);
612              }              }
613              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));
614          }          }
615          else dmsg(1,("Engine: Input event queue full!"));          else dmsg(1,("Engine: Input event queue full!"));
616      }      }
# Line 649  namespace LinuxSampler { namespace gig { Line 618  namespace LinuxSampler { namespace gig {
618      /**      /**
619       *  Assigns and triggers a new voice for the respective MIDI key.       *  Assigns and triggers a new voice for the respective MIDI key.
620       *       *
621         *  @param pEngineChannel - engine channel on which this event occured on
622       *  @param itNoteOnEvent - key, velocity and time stamp of the event       *  @param itNoteOnEvent - key, velocity and time stamp of the event
623       */       */
624      void Engine::ProcessNoteOn(Pool<Event>::Iterator& itNoteOnEvent) {      void Engine::ProcessNoteOn(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {
625          midi_key_info_t* pKey = &pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];         if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted
626    
627            const int key = itNoteOnEvent->Param.Note.Key;
628    
629            // Change key dimension value if key is in keyswitching area
630            {
631                const ::gig::Instrument* pInstrument = pEngineChannel->pInstrument;
632                if (key >= pInstrument->DimensionKeyRange.low && key <= pInstrument->DimensionKeyRange.high)
633                    pEngineChannel->CurrentKeyDimension = ((key - pInstrument->DimensionKeyRange.low) * 128) /
634                        (pInstrument->DimensionKeyRange.high - pInstrument->DimensionKeyRange.low + 1);
635            }
636    
637            midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[key];
638    
639          pKey->KeyPressed = true; // the MIDI key was now pressed down          pKey->KeyPressed = true; // the MIDI key was now pressed down
640            pKey->Velocity   = itNoteOnEvent->Param.Note.Velocity;
641            pKey->NoteOnTime = FrameTime + itNoteOnEvent->FragmentPos(); // will be used to calculate note length
642    
643          // cancel release process of voices on this key if needed          // cancel release process of voices on this key if needed
644          if (pKey->Active && !SustainPedal) {          if (pKey->Active && !pEngineChannel->SustainPedal) {
645              RTList<Event>::Iterator itCancelReleaseEvent = pKey->pEvents->allocAppend();              RTList<Event>::Iterator itCancelReleaseEvent = pKey->pEvents->allocAppend();
646              if (itCancelReleaseEvent) {              if (itCancelReleaseEvent) {
647                  *itCancelReleaseEvent = *itNoteOnEvent;                  // copy event                  *itCancelReleaseEvent = *itNoteOnEvent;                  // copy event
# Line 669  namespace LinuxSampler { namespace gig { Line 653  namespace LinuxSampler { namespace gig {
653          // move note on event to the key's own event list          // move note on event to the key's own event list
654          RTList<Event>::Iterator itNoteOnEventOnKeyList = itNoteOnEvent.moveToEndOf(pKey->pEvents);          RTList<Event>::Iterator itNoteOnEventOnKeyList = itNoteOnEvent.moveToEndOf(pKey->pEvents);
655    
656          // allocate and trigger a new voice for the key          // allocate and trigger new voice(s) for the key
657          LaunchVoice(itNoteOnEventOnKeyList, 0, false, true);          {
658                // first, get total amount of required voices (dependant on amount of layers)
659                ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOnEventOnKeyList->Param.Note.Key);
660                if (pRegion) {
661                    int voicesRequired = pRegion->Layers;
662                    // now launch the required amount of voices
663                    for (int i = 0; i < voicesRequired; i++)
664                        LaunchVoice(pEngineChannel, itNoteOnEventOnKeyList, i, false, true, true);
665                }
666            }
667    
668            // if neither a voice was spawned or postponed then remove note on event from key again
669            if (!pKey->Active && !pKey->VoiceTheftsQueued)
670                pKey->pEvents->free(itNoteOnEventOnKeyList);
671    
672            pKey->RoundRobinIndex++;
673      }      }
674    
675      /**      /**
# Line 679  namespace LinuxSampler { namespace gig { Line 678  namespace LinuxSampler { namespace gig {
678       *  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.
679       *  due to completion of sample playback).       *  due to completion of sample playback).
680       *       *
681         *  @param pEngineChannel - engine channel on which this event occured on
682       *  @param itNoteOffEvent - key, velocity and time stamp of the event       *  @param itNoteOffEvent - key, velocity and time stamp of the event
683       */       */
684      void Engine::ProcessNoteOff(Pool<Event>::Iterator& itNoteOffEvent) {      void Engine::ProcessNoteOff(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOffEvent) {
685          midi_key_info_t* pKey = &pMIDIKeyInfo[itNoteOffEvent->Param.Note.Key];          if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted
686    
687            midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itNoteOffEvent->Param.Note.Key];
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 && !pEngineChannel->SustainPedal) {
692              itNoteOffEvent->Type = Event::type_release; // transform event type              itNoteOffEvent->Type = Event::type_release; // transform event type
         }  
693    
694          // move event to the key's own event list              // move event to the key's own event list
695          RTList<Event>::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents);              RTList<Event>::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents);
696    
697          // spawn release triggered voice(s) if needed              // spawn release triggered voice(s) if needed
698          if (pKey->ReleaseTrigger) {              if (pKey->ReleaseTrigger) {
699              LaunchVoice(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)
700              pKey->ReleaseTrigger = false;                  ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOffEventOnKeyList->Param.Note.Key);
701                    if (pRegion) {
702                        int voicesRequired = pRegion->Layers;
703    
704                        // MIDI note-on velocity is used instead of note-off velocity
705                        itNoteOffEventOnKeyList->Param.Note.Velocity = pKey->Velocity;
706    
707                        // now launch the required amount of voices
708                        for (int i = 0; i < voicesRequired; i++)
709                            LaunchVoice(pEngineChannel, itNoteOffEventOnKeyList, i, true, false, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples
710                    }
711                    pKey->ReleaseTrigger = false;
712                }
713    
714                // if neither a voice was spawned or postponed then remove note off event from key again
715                if (!pKey->Active && !pKey->VoiceTheftsQueued)
716                    pKey->pEvents->free(itNoteOffEventOnKeyList);
717          }          }
718      }      }
719    
# Line 705  namespace LinuxSampler { namespace gig { Line 721  namespace LinuxSampler { namespace gig {
721       *  Moves pitchbend event from the general (input) event list to the pitch       *  Moves pitchbend event from the general (input) event list to the pitch
722       *  event list.       *  event list.
723       *       *
724         *  @param pEngineChannel - engine channel on which this event occured on
725       *  @param itPitchbendEvent - absolute pitch value and time stamp of the event       *  @param itPitchbendEvent - absolute pitch value and time stamp of the event
726       */       */
727      void Engine::ProcessPitchbend(Pool<Event>::Iterator& itPitchbendEvent) {      void Engine::ProcessPitchbend(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itPitchbendEvent) {
728          this->Pitch = itPitchbendEvent->Param.Pitch.Pitch; // store current pitch value          pEngineChannel->Pitch = itPitchbendEvent->Param.Pitch.Pitch; // store current pitch value
729          itPitchbendEvent.moveToEndOf(pSynthesisEvents[Event::destination_vco]);          itPitchbendEvent.moveToEndOf(pEngineChannel->pSynthesisEvents[Event::destination_vco]);
730      }      }
731    
732      /**      /**
# Line 717  namespace LinuxSampler { namespace gig { Line 734  namespace LinuxSampler { namespace gig {
734       *  called by the ProcessNoteOn() method and by the voices itself       *  called by the ProcessNoteOn() method and by the voices itself
735       *  (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).
736       *       *
737         *  @param pEngineChannel      - engine channel on which this event occured on
738       *  @param itNoteOnEvent       - key, velocity and time stamp of the event       *  @param itNoteOnEvent       - key, velocity and time stamp of the event
739       *  @param iLayer              - layer index for the new voice (optional - only       *  @param iLayer              - layer index for the new voice (optional - only
740       *                               in case of layered sounds of course)       *                               in case of layered sounds of course)
# Line 725  namespace LinuxSampler { namespace gig { Line 743  namespace LinuxSampler { namespace gig {
743       *  @param VoiceStealing       - if voice stealing should be performed       *  @param VoiceStealing       - if voice stealing should be performed
744       *                               when there is no free voice       *                               when there is no free voice
745       *                               (optional, default = true)       *                               (optional, default = true)
746         *  @param HandleKeyGroupConflicts - if voices should be killed due to a
747         *                                   key group conflict
748       *  @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
749       *           if an error occured while trying to trigger the new voice       *           if the voice wasn't triggered (for example when no region is
750         *           defined for the given key).
751       */       */
752      Pool<Voice>::Iterator Engine::LaunchVoice(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) {
753          midi_key_info_t* pKey = &pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];          int MIDIKey            = itNoteOnEvent->Param.Note.Key;
754            midi_key_info_t* pKey  = &pEngineChannel->pMIDIKeyInfo[MIDIKey];
755            ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(MIDIKey);
756    
757            // if nothing defined for this key
758            if (!pRegion) return Pool<Voice>::Iterator(); // nothing to do
759    
760            // only mark the first voice of a layered voice (group) to be in a
761            // key group, so the layered voices won't kill each other
762            int iKeyGroup = (iLayer == 0 && !ReleaseTriggerVoice) ? pRegion->KeyGroup : 0;
763    
764            // handle key group (a.k.a. exclusive group) conflicts
765            if (HandleKeyGroupConflicts) {
766                if (iKeyGroup) { // if this voice / key belongs to a key group
767                    uint** ppKeyGroup = &pEngineChannel->ActiveKeyGroups[iKeyGroup];
768                    if (*ppKeyGroup) { // if there's already an active key in that key group
769                        midi_key_info_t* pOtherKey = &pEngineChannel->pMIDIKeyInfo[**ppKeyGroup];
770                        // kill all voices on the (other) key
771                        RTList<Voice>::Iterator itVoiceToBeKilled = pOtherKey->pActiveVoices->first();
772                        RTList<Voice>::Iterator end               = pOtherKey->pActiveVoices->end();
773                        for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) {
774                            if (itVoiceToBeKilled->Type != Voice::type_release_trigger) {
775                                itVoiceToBeKilled->Kill(itNoteOnEvent);
776                                --VoiceSpawnsLeft; //FIXME: just a hack, we should better check in StealVoice() if the voice was killed due to key conflict
777                            }
778                        }
779                    }
780                }
781            }
782    
783            Voice::type_t VoiceType = Voice::type_normal;
784    
785            // get current dimension values to select the right dimension region
786            //TODO: for stolen voices this dimension region selection block is processed twice, this should be changed
787            //FIXME: controller values for selecting the dimension region here are currently not sample accurate
788            uint DimValues[8] = { 0 };
789            for (int i = pRegion->Dimensions - 1; i >= 0; i--) {
790                switch (pRegion->pDimensionDefinitions[i].dimension) {
791                    case ::gig::dimension_samplechannel:
792                        DimValues[i] = 0; //TODO: we currently ignore this dimension
793                        break;
794                    case ::gig::dimension_layer:
795                        DimValues[i] = iLayer;
796                        break;
797                    case ::gig::dimension_velocity:
798                        DimValues[i] = itNoteOnEvent->Param.Note.Velocity;
799                        break;
800                    case ::gig::dimension_channelaftertouch:
801                        DimValues[i] = 0; //TODO: we currently ignore this dimension
802                        break;
803                    case ::gig::dimension_releasetrigger:
804                        VoiceType = (ReleaseTriggerVoice) ? Voice::type_release_trigger : (!iLayer) ? Voice::type_release_trigger_required : Voice::type_normal;
805                        DimValues[i] = (uint) ReleaseTriggerVoice;
806                        break;
807                    case ::gig::dimension_keyboard:
808                        DimValues[i] = (uint) pEngineChannel->CurrentKeyDimension;
809                        break;
810                    case ::gig::dimension_roundrobin:
811                        DimValues[i] = (uint) pEngineChannel->pMIDIKeyInfo[MIDIKey].RoundRobinIndex; // incremented for each note on
812                        break;
813                    case ::gig::dimension_random:
814                        RandomSeed   = RandomSeed * 1103515245 + 12345; // classic pseudo random number generator
815                        DimValues[i] = (uint) RandomSeed >> (32 - pRegion->pDimensionDefinitions[i].bits); // highest bits are most random
816                        break;
817                    case ::gig::dimension_modwheel:
818                        DimValues[i] = pEngineChannel->ControllerTable[1];
819                        break;
820                    case ::gig::dimension_breath:
821                        DimValues[i] = pEngineChannel->ControllerTable[2];
822                        break;
823                    case ::gig::dimension_foot:
824                        DimValues[i] = pEngineChannel->ControllerTable[4];
825                        break;
826                    case ::gig::dimension_portamentotime:
827                        DimValues[i] = pEngineChannel->ControllerTable[5];
828                        break;
829                    case ::gig::dimension_effect1:
830                        DimValues[i] = pEngineChannel->ControllerTable[12];
831                        break;
832                    case ::gig::dimension_effect2:
833                        DimValues[i] = pEngineChannel->ControllerTable[13];
834                        break;
835                    case ::gig::dimension_genpurpose1:
836                        DimValues[i] = pEngineChannel->ControllerTable[16];
837                        break;
838                    case ::gig::dimension_genpurpose2:
839                        DimValues[i] = pEngineChannel->ControllerTable[17];
840                        break;
841                    case ::gig::dimension_genpurpose3:
842                        DimValues[i] = pEngineChannel->ControllerTable[18];
843                        break;
844                    case ::gig::dimension_genpurpose4:
845                        DimValues[i] = pEngineChannel->ControllerTable[19];
846                        break;
847                    case ::gig::dimension_sustainpedal:
848                        DimValues[i] = pEngineChannel->ControllerTable[64];
849                        break;
850                    case ::gig::dimension_portamento:
851                        DimValues[i] = pEngineChannel->ControllerTable[65];
852                        break;
853                    case ::gig::dimension_sostenutopedal:
854                        DimValues[i] = pEngineChannel->ControllerTable[66];
855                        break;
856                    case ::gig::dimension_softpedal:
857                        DimValues[i] = pEngineChannel->ControllerTable[67];
858                        break;
859                    case ::gig::dimension_genpurpose5:
860                        DimValues[i] = pEngineChannel->ControllerTable[80];
861                        break;
862                    case ::gig::dimension_genpurpose6:
863                        DimValues[i] = pEngineChannel->ControllerTable[81];
864                        break;
865                    case ::gig::dimension_genpurpose7:
866                        DimValues[i] = pEngineChannel->ControllerTable[82];
867                        break;
868                    case ::gig::dimension_genpurpose8:
869                        DimValues[i] = pEngineChannel->ControllerTable[83];
870                        break;
871                    case ::gig::dimension_effect1depth:
872                        DimValues[i] = pEngineChannel->ControllerTable[91];
873                        break;
874                    case ::gig::dimension_effect2depth:
875                        DimValues[i] = pEngineChannel->ControllerTable[92];
876                        break;
877                    case ::gig::dimension_effect3depth:
878                        DimValues[i] = pEngineChannel->ControllerTable[93];
879                        break;
880                    case ::gig::dimension_effect4depth:
881                        DimValues[i] = pEngineChannel->ControllerTable[94];
882                        break;
883                    case ::gig::dimension_effect5depth:
884                        DimValues[i] = pEngineChannel->ControllerTable[95];
885                        break;
886                    case ::gig::dimension_none:
887                        std::cerr << "gig::Engine::LaunchVoice() Error: dimension=none\n" << std::flush;
888                        break;
889                    default:
890                        std::cerr << "gig::Engine::LaunchVoice() Error: Unknown dimension\n" << std::flush;
891                }
892            }
893            ::gig::DimensionRegion* pDimRgn = pRegion->GetDimensionRegionByValue(DimValues);
894    
895            // no need to continue if sample is silent
896            if (!pDimRgn->pSample || !pDimRgn->pSample->SamplesTotal) return Pool<Voice>::Iterator();
897    
898          // allocate a new voice for the key          // allocate a new voice for the key
899          Pool<Voice>::Iterator itNewVoice = pKey->pActiveVoices->allocAppend();          Pool<Voice>::Iterator itNewVoice = pKey->pActiveVoices->allocAppend();
900          if (itNewVoice) {          if (itNewVoice) {
901              // launch the new voice              // launch the new voice
902              if (itNewVoice->Trigger(itNoteOnEvent, this->Pitch, this->pInstrument, iLayer, ReleaseTriggerVoice, VoiceStealing) < 0) {              if (itNewVoice->Trigger(pEngineChannel, itNoteOnEvent, pEngineChannel->Pitch, pDimRgn, VoiceType, iKeyGroup) < 0) {
903                  dmsg(1,("Triggering new voice failed!\n"));                  dmsg(4,("Voice not triggered\n"));
904                  pKey->pActiveVoices->free(itNewVoice);                  pKey->pActiveVoices->free(itNewVoice);
905              }              }
906              else { // on success              else { // on success
907                  uint** ppKeyGroup = NULL;                  --VoiceSpawnsLeft;
                 if (itNewVoice->KeyGroup) { // if this voice / key belongs to a key group  
                     ppKeyGroup = &ActiveKeyGroups[itNewVoice->KeyGroup];  
                     if (*ppKeyGroup) { // if there's already an active key in that key group  
                         midi_key_info_t* pOtherKey = &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);  
                         }  
                     }  
                 }  
908                  if (!pKey->Active) { // mark as active key                  if (!pKey->Active) { // mark as active key
909                      pKey->Active = true;                      pKey->Active = true;
910                      pKey->itSelf = pActiveKeys->allocAppend();                      pKey->itSelf = pEngineChannel->pActiveKeys->allocAppend();
911                      *pKey->itSelf = itNoteOnEvent->Param.Note.Key;                      *pKey->itSelf = itNoteOnEvent->Param.Note.Key;
912                  }                  }
913                  if (itNewVoice->KeyGroup) {                  if (itNewVoice->KeyGroup) {
914                        uint** ppKeyGroup = &pEngineChannel->ActiveKeyGroups[itNewVoice->KeyGroup];
915                      *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
916                  }                  }
917                  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 766  namespace LinuxSampler { namespace gig { Line 919  namespace LinuxSampler { namespace gig {
919              }              }
920          }          }
921          else if (VoiceStealing) {          else if (VoiceStealing) {
922              // first, get total amount of required voices (dependant on amount of layers)              // try to steal one voice
923              ::gig::Region* pRegion = pInstrument->GetRegion(itNoteOnEvent->Param.Note.Key);              int result = StealVoice(pEngineChannel, itNoteOnEvent);
924              if (!pRegion) return Pool<Voice>::Iterator(); // nothing defined for this MIDI key, so no voice needed              if (!result) { // voice stolen successfully
925              int voicesRequired = pRegion->Layers;                  // put note-on event into voice-stealing queue, so it will be reprocessed after killed voice died
926                    RTList<Event>::Iterator itStealEvent = pVoiceStealingQueue->allocAppend();
927              // now steal the (remaining) amount of voices                  if (itStealEvent) {
928              for (int i = iLayer; i < voicesRequired; i++)                      *itStealEvent = *itNoteOnEvent; // copy event
929                  StealVoice(itNoteOnEvent);                      itStealEvent->Param.Note.Layer = iLayer;
930                        itStealEvent->Param.Note.ReleaseTrigger = ReleaseTriggerVoice;
931              // put note-on event into voice-stealing queue, so it will be reprocessed after killed voice died                      pKey->VoiceTheftsQueued++;
932              RTList<Event>::Iterator itStealEvent = pVoiceStealingQueue->allocAppend();                  }
933              if (itStealEvent) {                  else dmsg(1,("Voice stealing queue full!\n"));
                 *itStealEvent = *itNoteOnEvent; // copy event  
                 itStealEvent->Param.Note.Layer = iLayer;  
                 itStealEvent->Param.Note.ReleaseTrigger = ReleaseTriggerVoice;  
934              }              }
             else dmsg(1,("Voice stealing queue full!\n"));  
935          }          }
936    
937          return Pool<Voice>::Iterator(); // no free voice or error          return Pool<Voice>::Iterator(); // no free voice or error
# Line 794  namespace LinuxSampler { namespace gig { Line 943  namespace LinuxSampler { namespace gig {
943       *  voice stealing and postpone the note-on event until the selected       *  voice stealing and postpone the note-on event until the selected
944       *  voice actually died.       *  voice actually died.
945       *       *
946         *  @param pEngineChannel - engine channel on which this event occured on
947       *  @param itNoteOnEvent - key, velocity and time stamp of the event       *  @param itNoteOnEvent - key, velocity and time stamp of the event
948         *  @returns 0 on success, a value < 0 if no active voice could be picked for voice stealing
949       */       */
950      void Engine::StealVoice(Pool<Event>::Iterator& itNoteOnEvent) {      int Engine::StealVoice(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itNoteOnEvent) {
951            if (VoiceSpawnsLeft <= 0) {
952                dmsg(1,("Max. voice thefts per audio fragment reached (you may raise CONFIG_MAX_VOICES).\n"));
953                return -1;
954            }
955          if (!pEventPool->poolIsEmpty()) {          if (!pEventPool->poolIsEmpty()) {
956    
957              RTList<uint>::Iterator  iuiOldestKey;              RTList<Voice>::Iterator itSelectedVoice;
             RTList<Voice>::Iterator itOldestVoice;  
958    
959              // Select one voice for voice stealing              // Select one voice for voice stealing
960              switch (VOICE_STEAL_ALGORITHM) {              switch (CONFIG_VOICE_STEAL_ALGO) {
961    
962                  // try to pick the oldest voice on the key where the new                  // try to pick the oldest voice on the key where the new
963                  // voice should be spawned, if there is no voice on that                  // voice should be spawned, if there is no voice on that
964                  // key, or no voice left to kill there, then procceed with                  // key, or no voice left to kill, then procceed with
965                  // 'oldestkey' algorithm                  // 'oldestkey' algorithm
966                  case voice_steal_algo_keymask: {                  case voice_steal_algo_oldestvoiceonkey: {
967                      midi_key_info_t* pOldestKey = &pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];                      midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key];
968                      if (itLastStolenVoice) {                      itSelectedVoice = pSelectedKey->pActiveVoices->first();
969                          itOldestVoice = itLastStolenVoice;                      // proceed iterating if voice was created in this fragment cycle
970                          ++itOldestVoice;                      while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice;
971                      }                      // if we haven't found a voice then proceed with algorithm 'oldestkey'
972                      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  
                     }  
973                  } // no break - intentional !                  } // no break - intentional !
974    
975                  // try to pick the oldest voice on the oldest active key                  // try to pick the oldest voice on the oldest active key
976                  // (caution: must stay after 'keymask' algorithm !)                  // from the same engine channel
977                    // (caution: must stay after 'oldestvoiceonkey' algorithm !)
978                  case voice_steal_algo_oldestkey: {                  case voice_steal_algo_oldestkey: {
979                      if (itLastStolenVoice) {                      // if we already stole in this fragment, try to proceed on same key
980                          midi_key_info_t* pOldestKey = &pMIDIKeyInfo[*iuiLastStolenKey];                      if (this->itLastStolenVoice) {
981                          itOldestVoice = itLastStolenVoice;                          itSelectedVoice = this->itLastStolenVoice;
982                          ++itOldestVoice;                          do {
983                          if (!itOldestVoice) {                              ++itSelectedVoice;
984                              iuiOldestKey = iuiLastStolenKey;                          } while (itSelectedVoice && !itSelectedVoice->IsStealable()); // proceed iterating if voice was created in this fragment cycle
985                              ++iuiOldestKey;                          // found a "stealable" voice ?
986                              if (iuiOldestKey) {                          if (itSelectedVoice && itSelectedVoice->IsStealable()) {
987                                  midi_key_info_t* pOldestKey = &pMIDIKeyInfo[*iuiOldestKey];                              // remember which voice we stole, so we can simply proceed on next voice stealing
988                                  itOldestVoice = pOldestKey->pActiveVoices->first();                              this->itLastStolenVoice = itSelectedVoice;
989                              }                              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;  
                             }  
990                          }                          }
                         else iuiOldestKey = iuiLastStolenKey;  
991                      }                      }
992                      else { // no voice stolen in this audio fragment cycle yet                      // get (next) oldest key
993                          iuiOldestKey = pActiveKeys->first();                      RTList<uint>::Iterator iuiSelectedKey = (this->iuiLastStolenKey) ? ++this->iuiLastStolenKey : pEngineChannel->pActiveKeys->first();
994                          midi_key_info_t* pOldestKey = &pMIDIKeyInfo[*iuiOldestKey];                      while (iuiSelectedKey) {
995                          itOldestVoice = pOldestKey->pActiveVoices->first();                          midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey];
996                            itSelectedVoice = pSelectedKey->pActiveVoices->first();
997                            // proceed iterating if voice was created in this fragment cycle
998                            while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice;
999                            // found a "stealable" voice ?
1000                            if (itSelectedVoice && itSelectedVoice->IsStealable()) {
1001                                // remember which voice on which key we stole, so we can simply proceed on next voice stealing
1002                                this->iuiLastStolenKey  = iuiSelectedKey;
1003                                this->itLastStolenVoice = itSelectedVoice;
1004                                break; // selection succeeded
1005                            }
1006                            ++iuiSelectedKey; // get next oldest key
1007                      }                      }
1008                      break;                      break;
1009                  }                  }
# Line 857  namespace LinuxSampler { namespace gig { Line 1012  namespace LinuxSampler { namespace gig {
1012                  case voice_steal_algo_none:                  case voice_steal_algo_none:
1013                  default: {                  default: {
1014                      dmsg(1,("No free voice (voice stealing disabled)!\n"));                      dmsg(1,("No free voice (voice stealing disabled)!\n"));
1015                      return;                      return -1;
1016                    }
1017                }
1018    
1019                // if we couldn't steal a voice from the same engine channel then
1020                // steal oldest voice on the oldest key from any other engine channel
1021                // (the smaller engine channel number, the higher priority)
1022                if (!itSelectedVoice || !itSelectedVoice->IsStealable()) {
1023                    EngineChannel* pSelectedChannel;
1024                    int            iChannelIndex;
1025                    // select engine channel
1026                    if (pLastStolenChannel) {
1027                        pSelectedChannel = pLastStolenChannel;
1028                        iChannelIndex    = pSelectedChannel->iEngineIndexSelf;
1029                    } else { // pick the engine channel followed by this engine channel
1030                        iChannelIndex    = (pEngineChannel->iEngineIndexSelf + 1) % engineChannels.size();
1031                        pSelectedChannel = engineChannels[iChannelIndex];
1032                    }
1033    
1034                    // if we already stole in this fragment, try to proceed on same key
1035                    if (this->itLastStolenVoiceGlobally) {
1036                        itSelectedVoice = this->itLastStolenVoiceGlobally;
1037                        do {
1038                            ++itSelectedVoice;
1039                        } while (itSelectedVoice && !itSelectedVoice->IsStealable()); // proceed iterating if voice was created in this fragment cycle
1040                    }
1041    
1042                    #if CONFIG_DEVMODE
1043                    EngineChannel* pBegin = pSelectedChannel; // to detect endless loop
1044                    #endif // CONFIG_DEVMODE
1045    
1046                    // did we find a 'stealable' voice?
1047                    if (itSelectedVoice && itSelectedVoice->IsStealable()) {
1048                        // remember which voice we stole, so we can simply proceed on next voice stealing
1049                        this->itLastStolenVoiceGlobally = itSelectedVoice;
1050                    } else while (true) { // iterate through engine channels
1051                        // get (next) oldest key
1052                        RTList<uint>::Iterator iuiSelectedKey = (this->iuiLastStolenKeyGlobally) ? ++this->iuiLastStolenKeyGlobally : pSelectedChannel->pActiveKeys->first();
1053                        this->iuiLastStolenKeyGlobally = RTList<uint>::Iterator(); // to prevent endless loop (see line above)
1054                        while (iuiSelectedKey) {
1055                            midi_key_info_t* pSelectedKey = &pSelectedChannel->pMIDIKeyInfo[*iuiSelectedKey];
1056                            itSelectedVoice = pSelectedKey->pActiveVoices->first();
1057                            // proceed iterating if voice was created in this fragment cycle
1058                            while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice;
1059                            // found a "stealable" voice ?
1060                            if (itSelectedVoice && itSelectedVoice->IsStealable()) {
1061                                // remember which voice on which key on which engine channel we stole, so we can simply proceed on next voice stealing
1062                                this->iuiLastStolenKeyGlobally  = iuiSelectedKey;
1063                                this->itLastStolenVoiceGlobally = itSelectedVoice;
1064                                this->pLastStolenChannel        = pSelectedChannel;
1065                                goto stealable_voice_found; // selection succeeded
1066                            }
1067                            ++iuiSelectedKey; // get next key on current engine channel
1068                        }
1069                        // get next engine channel
1070                        iChannelIndex    = (iChannelIndex + 1) % engineChannels.size();
1071                        pSelectedChannel = engineChannels[iChannelIndex];
1072    
1073                        #if CONFIG_DEVMODE
1074                        if (pSelectedChannel == pBegin) {
1075                            dmsg(1,("FATAL ERROR: voice stealing endless loop!\n"));
1076                            dmsg(1,("VoiceSpawnsLeft=%d.\n", VoiceSpawnsLeft));
1077                            dmsg(1,("Exiting.\n"));
1078                            exit(-1);
1079                        }
1080                        #endif // CONFIG_DEVMODE
1081                  }                  }
1082              }              }
1083    
1084              //FIXME: can be removed, just a sanity check for debugging              // jump point if a 'stealable' voice was found
1085              if (!itOldestVoice->IsActive()) dmsg(1,("gig::Engine: ERROR, tried to steal a voice which was not active !!!\n"));              stealable_voice_found:
1086    
1087                #if CONFIG_DEVMODE
1088                if (!itSelectedVoice->IsActive()) {
1089                    dmsg(1,("gig::Engine: ERROR, tried to steal a voice which was not active !!!\n"));
1090                    return -1;
1091                }
1092                #endif // CONFIG_DEVMODE
1093    
1094              // now kill the selected voice              // now kill the selected voice
1095              itOldestVoice->Kill(itNoteOnEvent);              itSelectedVoice->Kill(itNoteOnEvent);
1096              // remember which voice on which key we stole, so we can simply proceed for the next voice stealing  
1097              this->itLastStolenVoice = itOldestVoice;              --VoiceSpawnsLeft;
1098              this->iuiLastStolenKey = iuiOldestKey;  
1099                return 0; // success
1100            }
1101            else {
1102                dmsg(1,("Event pool emtpy!\n"));
1103                return -1;
1104          }          }
         else dmsg(1,("Event pool emtpy!\n"));  
1105      }      }
1106    
1107      /**      /**
# Line 879  namespace LinuxSampler { namespace gig { Line 1110  namespace LinuxSampler { namespace gig {
1110       *  it finished to playback its sample, finished its release stage or       *  it finished to playback its sample, finished its release stage or
1111       *  just was killed.       *  just was killed.
1112       *       *
1113         *  @param pEngineChannel - engine channel on which this event occured on
1114       *  @param itVoice - points to the voice to be freed       *  @param itVoice - points to the voice to be freed
1115       */       */
1116      void Engine::FreeVoice(Pool<Voice>::Iterator& itVoice) {      void Engine::FreeVoice(EngineChannel* pEngineChannel, Pool<Voice>::Iterator& itVoice) {
1117          if (itVoice) {          if (itVoice) {
1118              midi_key_info_t* pKey = &pMIDIKeyInfo[itVoice->MIDIKey];              midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itVoice->MIDIKey];
1119    
1120              uint keygroup = itVoice->KeyGroup;              uint keygroup = itVoice->KeyGroup;
1121    
# Line 892  namespace LinuxSampler { namespace gig { Line 1124  namespace LinuxSampler { namespace gig {
1124    
1125              // if no other voices left and member of a key group, remove from key group              // if no other voices left and member of a key group, remove from key group
1126              if (pKey->pActiveVoices->isEmpty() && keygroup) {              if (pKey->pActiveVoices->isEmpty() && keygroup) {
1127                  uint** ppKeyGroup = &ActiveKeyGroups[keygroup];                  uint** ppKeyGroup = &pEngineChannel->ActiveKeyGroups[keygroup];
1128                  if (*ppKeyGroup == &*pKey->itSelf) *ppKeyGroup = NULL; // remove key from key group                  if (*ppKeyGroup == &*pKey->itSelf) *ppKeyGroup = NULL; // remove key from key group
1129              }              }
1130          }          }
# Line 903  namespace LinuxSampler { namespace gig { Line 1135  namespace LinuxSampler { namespace gig {
1135       *  Called when there's no more voice left on a key, this call will       *  Called when there's no more voice left on a key, this call will
1136       *  update the key info respectively.       *  update the key info respectively.
1137       *       *
1138         *  @param pEngineChannel - engine channel on which this event occured on
1139       *  @param pKey - key which is now inactive       *  @param pKey - key which is now inactive
1140       */       */
1141      void Engine::FreeKey(midi_key_info_t* pKey) {      void Engine::FreeKey(EngineChannel* pEngineChannel, midi_key_info_t* pKey) {
1142          if (pKey->pActiveVoices->isEmpty()) {          if (pKey->pActiveVoices->isEmpty()) {
1143              pKey->Active = false;              pKey->Active = false;
1144              pActiveKeys->free(pKey->itSelf); // remove key from list of active keys              pEngineChannel->pActiveKeys->free(pKey->itSelf); // remove key from list of active keys
1145              pKey->itSelf = RTList<uint>::Iterator();              pKey->itSelf = RTList<uint>::Iterator();
1146              pKey->ReleaseTrigger = false;              pKey->ReleaseTrigger = false;
1147              pKey->pEvents->clear();              pKey->pEvents->clear();
# Line 921  namespace LinuxSampler { namespace gig { Line 1154  namespace LinuxSampler { namespace gig {
1154       *  Reacts on supported control change commands (e.g. pitch bend wheel,       *  Reacts on supported control change commands (e.g. pitch bend wheel,
1155       *  modulation wheel, aftertouch).       *  modulation wheel, aftertouch).
1156       *       *
1157         *  @param pEngineChannel - engine channel on which this event occured on
1158       *  @param itControlChangeEvent - controller, value and time stamp of the event       *  @param itControlChangeEvent - controller, value and time stamp of the event
1159       */       */
1160      void Engine::ProcessControlChange(Pool<Event>::Iterator& itControlChangeEvent) {      void Engine::ProcessControlChange(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itControlChangeEvent) {
1161          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));
1162    
1163          switch (itControlChangeEvent->Param.CC.Controller) {          // update controller value in the engine channel's controller table
1164              case 64: {          pEngineChannel->ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value;
1165                  if (itControlChangeEvent->Param.CC.Value >= 64 && !SustainPedal) {  
1166            // move event from the unsorted event list to the control change event list
1167            Pool<Event>::Iterator itControlChangeEventOnCCList = itControlChangeEvent.moveToEndOf(pEngineChannel->pCCEvents);
1168    
1169            switch (itControlChangeEventOnCCList->Param.CC.Controller) {
1170                case 7: { // volume
1171                    //TODO: not sample accurate yet
1172                    pEngineChannel->GlobalVolume = (float) itControlChangeEventOnCCList->Param.CC.Value / 127.0f;
1173                    pEngineChannel->bStatusChanged = true; // engine channel status has changed, so set notify flag
1174                    break;
1175                }
1176                case 10: { // panpot
1177                    //TODO: not sample accurate yet
1178                    const int pan = (int) itControlChangeEventOnCCList->Param.CC.Value - 64;
1179                    pEngineChannel->GlobalPanLeft  = 1.0f - float(RTMath::Max(pan, 0)) /  63.0f;
1180                    pEngineChannel->GlobalPanRight = 1.0f - float(RTMath::Min(pan, 0)) / -64.0f;
1181                    break;
1182                }
1183                case 64: { // sustain
1184                    if (itControlChangeEventOnCCList->Param.CC.Value >= 64 && !pEngineChannel->SustainPedal) {
1185                      dmsg(4,("PEDAL DOWN\n"));                      dmsg(4,("PEDAL DOWN\n"));
1186                      SustainPedal = true;                      pEngineChannel->SustainPedal = true;
1187    
1188                        if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted
1189    
1190                      // cancel release process of voices if necessary                      // cancel release process of voices if necessary
1191                      RTList<uint>::Iterator iuiKey = pActiveKeys->first();                      RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
1192                      if (iuiKey) {                      for (; iuiKey; ++iuiKey) {
1193                          itControlChangeEvent->Type = Event::type_cancel_release; // transform event type                          midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
1194                          while (iuiKey) {                          if (!pKey->KeyPressed) {
1195                              midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey];                              RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
1196                              ++iuiKey;                              if (itNewEvent) {
1197                              if (!pKey->KeyPressed) {                                  *itNewEvent = *itControlChangeEventOnCCList; // copy event to the key's own event list
1198                                  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"));  
1199                              }                              }
1200                                else dmsg(1,("Event pool emtpy!\n"));
1201                          }                          }
1202                      }                      }
1203                  }                  }
1204                  if (itControlChangeEvent->Param.CC.Value < 64 && SustainPedal) {                  if (itControlChangeEventOnCCList->Param.CC.Value < 64 && pEngineChannel->SustainPedal) {
1205                      dmsg(4,("PEDAL UP\n"));                      dmsg(4,("PEDAL UP\n"));
1206                      SustainPedal = false;                      pEngineChannel->SustainPedal = false;
1207    
1208                        if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted
1209    
1210                      // release voices if their respective key is not pressed                      // release voices if their respective key is not pressed
1211                      RTList<uint>::Iterator iuiKey = pActiveKeys->first();                      RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
1212                      if (iuiKey) {                      for (; iuiKey; ++iuiKey) {
1213                          itControlChangeEvent->Type = Event::type_release; // transform event type                          midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
1214                          while (iuiKey) {                          if (!pKey->KeyPressed) {
1215                              midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey];                              RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
1216                              ++iuiKey;                              if (itNewEvent) {
1217                              if (!pKey->KeyPressed) {                                  *itNewEvent = *itControlChangeEventOnCCList; // copy event to the key's own event list
1218                                  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"));  
1219                              }                              }
1220                                else dmsg(1,("Event pool emtpy!\n"));
1221                          }                          }
1222                      }                      }
1223                  }                  }
1224                  break;                  break;
1225              }              }
         }  
1226    
         // update controller value in the engine's controller table  
         ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value;  
1227    
1228          // move event from the unsorted event list to the control change event list              // Channel Mode Messages
1229          itControlChangeEvent.moveToEndOf(pCCEvents);  
1230                case 120: { // all sound off
1231                    KillAllVoices(pEngineChannel, itControlChangeEventOnCCList);
1232                    break;
1233                }
1234                case 121: { // reset all controllers
1235                    pEngineChannel->ResetControllers();
1236                    break;
1237                }
1238                case 123: { // all notes off
1239                    ReleaseAllVoices(pEngineChannel, itControlChangeEventOnCCList);
1240                    break;
1241                }
1242            }
1243      }      }
1244    
1245      /**      /**
# Line 992  namespace LinuxSampler { namespace gig { Line 1257  namespace LinuxSampler { namespace gig {
1257    
1258          switch (id) {          switch (id) {
1259              case 0x41: { // Roland              case 0x41: { // Roland
1260                    dmsg(3,("Roland Sysex\n"));
1261                  uint8_t device_id, model_id, cmd_id;                  uint8_t device_id, model_id, cmd_id;
1262                  if (!reader.pop(&device_id)) goto free_sysex_data;                  if (!reader.pop(&device_id)) goto free_sysex_data;
1263                  if (!reader.pop(&model_id))  goto free_sysex_data;                  if (!reader.pop(&model_id))  goto free_sysex_data;
# Line 1004  namespace LinuxSampler { namespace gig { Line 1270  namespace LinuxSampler { namespace gig {
1270                  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
1271                  if (reader.read(&addr[0], 3) != 3) goto free_sysex_data;                  if (reader.read(&addr[0], 3) != 3) goto free_sysex_data;
1272                  if (addr[0] == 0x40 && addr[1] == 0x00) { // System Parameters                  if (addr[0] == 0x40 && addr[1] == 0x00) { // System Parameters
1273                        dmsg(3,("\tSystem Parameter\n"));
1274                  }                  }
1275                  else if (addr[0] == 0x40 && addr[1] == 0x01) { // Common Parameters                  else if (addr[0] == 0x40 && addr[1] == 0x01) { // Common Parameters
1276                        dmsg(3,("\tCommon Parameter\n"));
1277                  }                  }
1278                  else if (addr[0] == 0x40 && (addr[1] & 0xf0) == 0x10) { // Part Parameters (1)                  else if (addr[0] == 0x40 && (addr[1] & 0xf0) == 0x10) { // Part Parameters (1)
1279                      switch (addr[3]) {                      dmsg(3,("\tPart Parameter\n"));
1280                        switch (addr[2]) {
1281                          case 0x40: { // scale tuning                          case 0x40: { // scale tuning
1282                                dmsg(3,("\t\tScale Tuning\n"));
1283                              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
1284                              if (reader.read(&scale_tunes[0], 12) != 12) goto free_sysex_data;                              if (reader.read(&scale_tunes[0], 12) != 12) goto free_sysex_data;
1285                              uint8_t checksum;                              uint8_t checksum;
1286                              if (!reader.pop(&checksum))                      goto free_sysex_data;                              if (!reader.pop(&checksum)) goto free_sysex_data;
1287                              if (GSCheckSum(checksum_reader, 12) != checksum) goto free_sysex_data;                              #if CONFIG_ASSERT_GS_SYSEX_CHECKSUM
1288                                if (GSCheckSum(checksum_reader, 12)) goto free_sysex_data;
1289                                #endif // CONFIG_ASSERT_GS_SYSEX_CHECKSUM
1290                              for (int i = 0; i < 12; i++) scale_tunes[i] -= 64;                              for (int i = 0; i < 12; i++) scale_tunes[i] -= 64;
1291                              AdjustScale((int8_t*) scale_tunes);                              AdjustScale((int8_t*) scale_tunes);
1292                                dmsg(3,("\t\t\tNew scale applied.\n"));
1293                              break;                              break;
1294                          }                          }
1295                      }                      }
# Line 1061  namespace LinuxSampler { namespace gig { Line 1334  namespace LinuxSampler { namespace gig {
1334      }      }
1335    
1336      /**      /**
1337         * Releases all voices on an engine channel. All voices will go into
1338         * the release stage and thus it might take some time (e.g. dependant to
1339         * their envelope release time) until they actually die.
1340         *
1341         * @param pEngineChannel - engine channel on which all voices should be released
1342         * @param itReleaseEvent - event which caused this releasing of all voices
1343         */
1344        void Engine::ReleaseAllVoices(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itReleaseEvent) {
1345            RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
1346            while (iuiKey) {
1347                midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
1348                ++iuiKey;
1349                // append a 'release' event to the key's own event list
1350                RTList<Event>::Iterator itNewEvent = pKey->pEvents->allocAppend();
1351                if (itNewEvent) {
1352                    *itNewEvent = *itReleaseEvent; // copy original event (to the key's event list)
1353                    itNewEvent->Type = Event::type_release; // transform event type
1354                }
1355                else dmsg(1,("Event pool emtpy!\n"));
1356            }
1357        }
1358    
1359        /**
1360         * Kills all voices on an engine channel as soon as possible. Voices
1361         * won't get into release state, their volume level will be ramped down
1362         * as fast as possible.
1363         *
1364         * @param pEngineChannel - engine channel on which all voices should be killed
1365         * @param itKillEvent    - event which caused this killing of all voices
1366         */
1367        void Engine::KillAllVoices(EngineChannel* pEngineChannel, Pool<Event>::Iterator& itKillEvent) {
1368            RTList<uint>::Iterator iuiKey = pEngineChannel->pActiveKeys->first();
1369            RTList<uint>::Iterator end    = pEngineChannel->pActiveKeys->end();
1370            while (iuiKey != end) { // iterate through all active keys
1371                midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey];
1372                ++iuiKey;
1373                RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
1374                RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
1375                for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
1376                    itVoice->Kill(itKillEvent);
1377                    --VoiceSpawnsLeft; //FIXME: just a temporary workaround, we should check the cause in StealVoice() instead
1378                }
1379            }
1380        }
1381    
1382        /**
1383       * Initialize the parameter sequence for the modulation destination given by       * Initialize the parameter sequence for the modulation destination given by
1384       * by 'dst' with the constant value given by val.       * by 'dst' with the constant value given by val.
1385       */       */
# Line 1075  namespace LinuxSampler { namespace gig { Line 1394  namespace LinuxSampler { namespace gig {
1394          }          }
1395      }      }
1396    
     float Engine::Volume() {  
         return GlobalVolume;  
     }  
   
     void Engine::Volume(float f) {  
         GlobalVolume = f;  
     }  
   
     uint Engine::Channels() {  
         return 2;  
     }  
   
     void Engine::SetOutputChannel(uint EngineAudioChannel, uint AudioDeviceChannel) {  
         AudioChannel* pChannel = pAudioOutputDevice->Channel(AudioDeviceChannel);  
         if (!pChannel) throw AudioOutputException("Invalid audio output device channel " + ToString(AudioDeviceChannel));  
         switch (EngineAudioChannel) {  
             case 0: // left output channel  
                 pOutputLeft = pChannel->Buffer();  
                 AudioDeviceChannelLeft = AudioDeviceChannel;  
                 break;  
             case 1: // right output channel  
                 pOutputRight = pChannel->Buffer();  
                 AudioDeviceChannelRight = AudioDeviceChannel;  
                 break;  
             default:  
                 throw AudioOutputException("Invalid engine audio channel " + ToString(EngineAudioChannel));  
         }  
     }  
   
     int Engine::OutputChannel(uint EngineAudioChannel) {  
         switch (EngineAudioChannel) {  
             case 0: // left channel  
                 return AudioDeviceChannelLeft;  
             case 1: // right channel  
                 return AudioDeviceChannelRight;  
             default:  
                 throw AudioOutputException("Invalid engine audio channel " + ToString(EngineAudioChannel));  
         }  
     }  
   
1397      uint Engine::VoiceCount() {      uint Engine::VoiceCount() {
1398          return ActiveVoiceCount;          return ActiveVoiceCount;
1399      }      }
# Line 1144  namespace LinuxSampler { namespace gig { Line 1423  namespace LinuxSampler { namespace gig {
1423      }      }
1424    
1425      String Engine::EngineName() {      String Engine::EngineName() {
1426          return "GigEngine";          return LS_GIG_ENGINE_NAME;
     }  
   
     String Engine::InstrumentFileName() {  
         return InstrumentFile;  
     }  
   
     int Engine::InstrumentIndex() {  
         return InstrumentIdx;  
     }  
   
     int Engine::InstrumentStatus() {  
         return InstrumentStat;  
1427      }      }
1428    
1429      String Engine::Description() {      String Engine::Description() {
# Line 1164  namespace LinuxSampler { namespace gig { Line 1431  namespace LinuxSampler { namespace gig {
1431      }      }
1432    
1433      String Engine::Version() {      String Engine::Version() {
1434          String s = "$Revision: 1.18 $";          String s = "$Revision: 1.50 $";
1435          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
1436      }      }
1437    
Legend:
Removed from v.293  
changed lines
  Added in v.705
  ViewVC Help
Powered by ViewVC