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

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

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

revision 412 by schoenebeck, Sat Feb 26 22:44:51 2005 UTC revision 1843 by iliev, Sat Feb 21 17:08:18 2009 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                              *   *   Copyright (C) 2005 - 2008 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 23  Line 23 
23    
24  #include "EngineChannel.h"  #include "EngineChannel.h"
25    
26  namespace LinuxSampler { namespace gig {      #include "../../common/global_private.h"
27    #include "../../Sampler.h"
28    
29      EngineChannel::EngineChannel() {  namespace LinuxSampler { namespace gig {
30    
31        EngineChannel::EngineChannel() :
32            InstrumentChangeCommandReader(InstrumentChangeCommand),
33            virtualMidiDevicesReader_AudioThread(virtualMidiDevices),
34            virtualMidiDevicesReader_MidiThread(virtualMidiDevices)
35        {
36          pMIDIKeyInfo = new midi_key_info_t[128];          pMIDIKeyInfo = new midi_key_info_t[128];
37          pEngine      = NULL;          pEngine      = NULL;
38          pInstrument  = NULL;          pInstrument  = NULL;
39          pEventQueue  = new RingBuffer<Event>(MAX_EVENTS_PER_FRAGMENT, 0);                  pEvents      = NULL; // we allocate when we retrieve the right Engine object
40            pEventQueue  = new RingBuffer<Event,false>(CONFIG_MAX_EVENTS_PER_FRAGMENT, 0);
41          pActiveKeys  = new Pool<uint>(128);          pActiveKeys  = new Pool<uint>(128);
42          for (uint i = 0; i < 128; i++) {          for (uint i = 0; i < 128; i++) {
43              pMIDIKeyInfo[i].pActiveVoices  = NULL; // we allocate when we retrieve the right Engine object              pMIDIKeyInfo[i].pActiveVoices  = NULL; // we allocate when we retrieve the right Engine object
# Line 37  namespace LinuxSampler { namespace gig { Line 45  namespace LinuxSampler { namespace gig {
45              pMIDIKeyInfo[i].Active         = false;              pMIDIKeyInfo[i].Active         = false;
46              pMIDIKeyInfo[i].ReleaseTrigger = false;              pMIDIKeyInfo[i].ReleaseTrigger = false;
47              pMIDIKeyInfo[i].pEvents        = NULL; // we allocate when we retrieve the right Engine object              pMIDIKeyInfo[i].pEvents        = NULL; // we allocate when we retrieve the right Engine object
48                pMIDIKeyInfo[i].VoiceTheftsQueued = 0;
49                pMIDIKeyInfo[i].RoundRobinIndex = 0;
50          }          }
51          InstrumentIdx  = -1;          InstrumentIdx  = -1;
52          InstrumentStat = -1;          InstrumentStat = -1;
53            pChannelLeft  = NULL;
54            pChannelRight = NULL;
55          AudioDeviceChannelLeft  = -1;          AudioDeviceChannelLeft  = -1;
56          AudioDeviceChannelRight = -1;          AudioDeviceChannelRight = -1;
57            pMidiInputPort = NULL;
58            midiChannel = midi_chan_all;
59            ResetControllers();
60            SoloMode       = false;
61            PortamentoMode = false;
62            PortamentoTime = CONFIG_PORTAMENTO_TIME_DEFAULT;
63    
64            // reset the instrument change command struct (need to be done
65            // twice, as it is double buffered)
66            {
67                instrument_change_command_t& cmd = InstrumentChangeCommand.GetConfigForUpdate();
68                cmd.pDimRegionsInUse = NULL;
69                cmd.pInstrument = NULL;
70                cmd.bChangeInstrument = false;
71            }
72            {
73                instrument_change_command_t& cmd = InstrumentChangeCommand.SwitchConfig();
74                cmd.pDimRegionsInUse = NULL;
75                cmd.pInstrument = NULL;
76                cmd.bChangeInstrument = false;
77            }
78      }      }
79    
80      EngineChannel::~EngineChannel() {      EngineChannel::~EngineChannel() {
81          if (pInstrument) Engine::instruments.HandBack(pInstrument, this);          DisconnectAudioOutputDevice();
82          for (uint i = 0; i < 128; i++) {  
83              if (pMIDIKeyInfo[i].pActiveVoices) {          // In case the channel was removed before the instrument was
84                  pMIDIKeyInfo[i].pActiveVoices->clear();          // fully loaded, try to give back instrument again (see bug #113)
85                  delete pMIDIKeyInfo[i].pActiveVoices;          instrument_change_command_t& cmd = ChangeInstrument(NULL);
86              }          if (cmd.pInstrument) {
87              if (pMIDIKeyInfo[i].pEvents) {                  Engine::instruments.HandBack(cmd.pInstrument, this);
                 pMIDIKeyInfo[i].pEvents->clear();  
                 delete pMIDIKeyInfo[i].pEvents;  
             }  
88          }          }
89            ///////
90    
91          if (pEventQueue) delete pEventQueue;          if (pEventQueue) delete pEventQueue;
92          if (pActiveKeys) delete pActiveKeys;          if (pActiveKeys) delete pActiveKeys;
93          if (pMIDIKeyInfo) delete[] pMIDIKeyInfo;          if (pMIDIKeyInfo) delete[] pMIDIKeyInfo;
94            RemoveAllFxSends();
95        }
96    
97        /**
98         * Implementation of virtual method from abstract EngineChannel interface.
99         * This method will periodically be polled (e.g. by the LSCP server) to
100         * check if some engine channel parameter has changed since the last
101         * StatusChanged() call.
102         *
103         * This method can also be used to mark the engine channel as changed
104         * from outside, e.g. by a MIDI input device. The optional argument
105         * \a nNewStatus can be used for this.
106         *
107         * TODO: This "poll method" is just a lazy solution and might be
108         *       replaced in future.
109         * @param bNewStatus - (optional, default: false) sets the new status flag
110         * @returns true if engine channel status has changed since last
111         *          StatusChanged() call
112         */
113        bool EngineChannel::StatusChanged(bool bNewStatus) {
114            bool b = bStatusChanged;
115            bStatusChanged = bNewStatus;
116            return b;
117        }
118    
119        void EngineChannel::Reset() {
120            if (pEngine) pEngine->DisableAndLock();
121            ResetInternal();
122            ResetControllers();
123            if (pEngine) {
124                pEngine->Enable();
125                pEngine->Reset();
126            }
127      }      }
128    
129      /**      /**
130       * This method is not thread safe!       * This method is not thread safe!
131       */       */
132      void EngineChannel::ResetInternal() {      void EngineChannel::ResetInternal() {
         Pitch               = 0;  
         SustainPedal        = false;  
         GlobalVolume        = 1.0;  
133          CurrentKeyDimension = 0;          CurrentKeyDimension = 0;
134    
         // set all MIDI controller values to zero  
         memset(ControllerTable, 0x00, 128);  
   
         // reset voice stealing parameters  
         itLastStolenVoice = RTList<Voice>::Iterator();  
         iuiLastStolenKey  = RTList<uint>::Iterator();  
   
135          // reset key info          // reset key info
136          for (uint i = 0; i < 128; i++) {          for (uint i = 0; i < 128; i++) {
137              if (pMIDIKeyInfo[i].pActiveVoices)              if (pMIDIKeyInfo[i].pActiveVoices)
# Line 87  namespace LinuxSampler { namespace gig { Line 142  namespace LinuxSampler { namespace gig {
142              pMIDIKeyInfo[i].Active         = false;              pMIDIKeyInfo[i].Active         = false;
143              pMIDIKeyInfo[i].ReleaseTrigger = false;              pMIDIKeyInfo[i].ReleaseTrigger = false;
144              pMIDIKeyInfo[i].itSelf         = Pool<uint>::Iterator();              pMIDIKeyInfo[i].itSelf         = Pool<uint>::Iterator();
145                pMIDIKeyInfo[i].VoiceTheftsQueued = 0;
146          }          }
147            SoloKey       = -1;    // no solo key active yet
148            PortamentoPos = -1.0f; // no portamento active yet
149    
150          // reset all key groups          // reset all key groups
151          std::map<uint,uint*>::iterator iter = ActiveKeyGroups.begin();          std::map<uint,uint*>::iterator iter = ActiveKeyGroups.begin();
# Line 100  namespace LinuxSampler { namespace gig { Line 158  namespace LinuxSampler { namespace gig {
158          pEventQueue->init();          pEventQueue->init();
159    
160          if (pEngine) pEngine->ResetInternal();          if (pEngine) pEngine->ResetInternal();
161    
162            // status of engine channel has changed, so set notify flag
163            bStatusChanged = true;
164      }      }
165    
166      LinuxSampler::Engine* EngineChannel::GetEngine() {      LinuxSampler::Engine* EngineChannel::GetEngine() {
# Line 128  namespace LinuxSampler { namespace gig { Line 189  namespace LinuxSampler { namespace gig {
189       * This method will then actually start to load the instrument and block       * This method will then actually start to load the instrument and block
190       * the calling thread until loading was completed.       * the calling thread until loading was completed.
191       *       *
      * @returns detailed description of the method call result  
192       * @see PrepareLoadInstrument()       * @see PrepareLoadInstrument()
193       */       */
194      void EngineChannel::LoadInstrument() {      void EngineChannel::LoadInstrument() {
195            // make sure we don't trigger any new notes with an old
196          if (pEngine) pEngine->DisableAndLock();          // instrument
197                    instrument_change_command_t& cmd = ChangeInstrument(0);
198          ResetInternal();          if (cmd.pInstrument) {
199                        // give old instrument back to instrument manager, but
200          // free old instrument              // keep the dimension regions and samples that are in use
201          if (pInstrument) {              Engine::instruments.HandBackInstrument(cmd.pInstrument, this, cmd.pDimRegionsInUse);
             // give old instrument back to instrument manager  
             Engine::instruments.HandBack(pInstrument, this);  
202          }          }
203            cmd.pDimRegionsInUse->clear();
204    
205          // delete all key groups          // delete all key groups
206          ActiveKeyGroups.clear();          ActiveKeyGroups.clear();
207    
208          // request gig instrument from instrument manager          // request gig instrument from instrument manager
209            ::gig::Instrument* newInstrument;
210          try {          try {
211              instrument_id_t instrid;              InstrumentManager::instrument_id_t instrid;
212              instrid.FileName    = InstrumentFile;              instrid.FileName  = InstrumentFile;
213              instrid.iInstrument = InstrumentIdx;              instrid.Index     = InstrumentIdx;
214              pInstrument = Engine::instruments.Borrow(instrid, this);              newInstrument = Engine::instruments.Borrow(instrid, this);
215              if (!pInstrument) {              if (!newInstrument) {
216                  InstrumentStat = -1;                  throw InstrumentManagerException("resource was not created");
                 dmsg(1,("no instrument loaded!!!\n"));  
                 exit(EXIT_FAILURE);  
217              }              }
218          }          }
219          catch (RIFF::Exception e) {          catch (RIFF::Exception e) {
220              InstrumentStat = -2;              InstrumentStat = -2;
221                StatusChanged(true);
222              String msg = "gig::Engine error: Failed to load instrument, cause: " + e.Message;              String msg = "gig::Engine error: Failed to load instrument, cause: " + e.Message;
223              throw LinuxSamplerException(msg);              throw Exception(msg);
224          }          }
225          catch (InstrumentResourceManagerException e) {          catch (InstrumentManagerException e) {
226              InstrumentStat = -3;              InstrumentStat = -3;
227                StatusChanged(true);
228              String msg = "gig::Engine error: Failed to load instrument, cause: " + e.Message();              String msg = "gig::Engine error: Failed to load instrument, cause: " + e.Message();
229              throw LinuxSamplerException(msg);              throw Exception(msg);
230          }          }
231          catch (...) {          catch (...) {
232              InstrumentStat = -4;              InstrumentStat = -4;
233              throw LinuxSamplerException("gig::Engine error: Failed to load instrument, cause: Unknown exception while trying to parse gig file.");              StatusChanged(true);
234                throw Exception("gig::Engine error: Failed to load instrument, cause: Unknown exception while trying to parse gig file.");
235          }          }
236    
237          // rebuild ActiveKeyGroups map with key groups of current instrument          // rebuild ActiveKeyGroups map with key groups of current instrument
238          for (::gig::Region* pRegion = pInstrument->GetFirstRegion(); pRegion; pRegion = pInstrument->GetNextRegion())          for (::gig::Region* pRegion = newInstrument->GetFirstRegion(); pRegion; pRegion = newInstrument->GetNextRegion())
239              if (pRegion->KeyGroup) ActiveKeyGroups[pRegion->KeyGroup] = NULL;              if (pRegion->KeyGroup) ActiveKeyGroups[pRegion->KeyGroup] = NULL;
240    
241          InstrumentIdxName = pInstrument->pInfo->Name;          InstrumentIdxName = newInstrument->pInfo->Name;
242          InstrumentStat = 100;          InstrumentStat = 100;
243    
244          // inform audio driver for the need of two channels          ChangeInstrument(newInstrument);
         try {  
             if (pEngine && pEngine->pAudioOutputDevice)  
                 pEngine->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);  
         }  
245    
246          if (pEngine) pEngine->Enable();          StatusChanged(true);
247        }
248    
249    
250        /**
251         * Changes the instrument for an engine channel.
252         *
253         * @param pInstrument - new instrument
254         * @returns the resulting instrument change command after the
255         *          command switch, containing the old instrument and
256         *          the dimregions it is using
257         */
258        EngineChannel::instrument_change_command_t& EngineChannel::ChangeInstrument(::gig::Instrument* pInstrument) {
259            instrument_change_command_t& cmd = InstrumentChangeCommand.GetConfigForUpdate();
260            cmd.pInstrument = pInstrument;
261            cmd.bChangeInstrument = true;
262    
263            return InstrumentChangeCommand.SwitchConfig();
264      }      }
265    
266      /**      /**
267       * Will be called by the InstrumentResourceManager when the instrument       * Will be called by the InstrumentResourceManager when the instrument
268       * we are currently using in this engine is going to be updated, so we       * we are currently using on this EngineChannel is going to be updated,
269       * can stop playback before that happens.       * so we can stop playback before that happens.
270       */       */
271      void EngineChannel::ResourceToBeUpdated(::gig::Instrument* pResource, void*& pUpdateArg) {      void EngineChannel::ResourceToBeUpdated(::gig::Instrument* pResource, void*& pUpdateArg) {
272          dmsg(3,("gig::Engine: Received instrument update message.\n"));          dmsg(3,("gig::Engine: Received instrument update message.\n"));
# Line 212  namespace LinuxSampler { namespace gig { Line 282  namespace LinuxSampler { namespace gig {
282      void EngineChannel::ResourceUpdated(::gig::Instrument* pOldResource, ::gig::Instrument* pNewResource, void* pUpdateArg) {      void EngineChannel::ResourceUpdated(::gig::Instrument* pOldResource, ::gig::Instrument* pNewResource, void* pUpdateArg) {
283          this->pInstrument = pNewResource; //TODO: there are couple of engine parameters we should update here as well if the instrument was updated (see LoadInstrument())          this->pInstrument = pNewResource; //TODO: there are couple of engine parameters we should update here as well if the instrument was updated (see LoadInstrument())
284          if (pEngine) pEngine->Enable();          if (pEngine) pEngine->Enable();
285            bStatusChanged = true; // status of engine has changed, so set notify flag
286        }
287    
288        /**
289         * Will be called by the InstrumentResourceManager on progress changes
290         * while loading or realoading an instrument for this EngineChannel.
291         *
292         * @param fProgress - current progress as value between 0.0 and 1.0
293         */
294        void EngineChannel::OnResourceProgress(float fProgress) {
295            this->InstrumentStat = int(fProgress * 100.0f);
296            dmsg(7,("gig::EngineChannel: progress %d%", InstrumentStat));
297            bStatusChanged = true; // status of engine has changed, so set notify flag
298      }      }
299    
300      void EngineChannel::Connect(AudioOutputDevice* pAudioOut) {      void EngineChannel::Connect(AudioOutputDevice* pAudioOut) {
301          if (pEngine && pEngine->pAudioOutputDevice != pAudioOut) {          if (pEngine) {
302                if (pEngine->pAudioOutputDevice == pAudioOut) return;
303              DisconnectAudioOutputDevice();              DisconnectAudioOutputDevice();
304          }          }
305          pEngine = Engine::AcquireEngine(this, pAudioOut);          pEngine = Engine::AcquireEngine(this, pAudioOut);
306          ResetInternal();                  ResetInternal();
307            pEvents = new RTList<Event>(pEngine->pEventPool);
308    
309            // reset the instrument change command struct (need to be done
310            // twice, as it is double buffered)
311            {
312                instrument_change_command_t& cmd = InstrumentChangeCommand.GetConfigForUpdate();
313                cmd.pDimRegionsInUse = new RTList< ::gig::DimensionRegion*>(pEngine->pDimRegionPool[0]);
314                cmd.pInstrument = 0;
315                cmd.bChangeInstrument = false;
316            }
317            {
318                instrument_change_command_t& cmd = InstrumentChangeCommand.SwitchConfig();
319                cmd.pDimRegionsInUse = new RTList< ::gig::DimensionRegion*>(pEngine->pDimRegionPool[1]);
320                cmd.pInstrument = 0;
321                cmd.bChangeInstrument = false;
322            }
323    
324          for (uint i = 0; i < 128; i++) {          for (uint i = 0; i < 128; i++) {
325              pMIDIKeyInfo[i].pActiveVoices = new RTList<Voice>(pEngine->pVoicePool);              pMIDIKeyInfo[i].pActiveVoices = new RTList<Voice>(pEngine->pVoicePool);
326              pMIDIKeyInfo[i].pEvents       = new RTList<Event>(pEngine->pEventPool);              pMIDIKeyInfo[i].pEvents       = new RTList<Event>(pEngine->pEventPool);
327          }          }
328          AudioDeviceChannelLeft  = 0;          AudioDeviceChannelLeft  = 0;
329          AudioDeviceChannelRight = 1;          AudioDeviceChannelRight = 1;
330          pOutputLeft             = pAudioOut->Channel(0)->Buffer();          if (fxSends.empty()) { // render directly into the AudioDevice's output buffers
331          pOutputRight            = pAudioOut->Channel(1)->Buffer();              pChannelLeft  = pAudioOut->Channel(AudioDeviceChannelLeft);
332                pChannelRight = pAudioOut->Channel(AudioDeviceChannelRight);
333            } else { // use local buffers for rendering and copy later
334                // ensure the local buffers have the correct size
335                if (pChannelLeft)  delete pChannelLeft;
336                if (pChannelRight) delete pChannelRight;
337                pChannelLeft  = new AudioChannel(0, pAudioOut->MaxSamplesPerCycle());
338                pChannelRight = new AudioChannel(1, pAudioOut->MaxSamplesPerCycle());
339            }
340            if (pEngine->EngineDisabled.GetUnsafe()) pEngine->Enable();
341            MidiInputPort::AddSysexListener(pEngine);
342      }      }
343    
344      void EngineChannel::DisconnectAudioOutputDevice() {      void EngineChannel::DisconnectAudioOutputDevice() {
345          if (pEngine) { // if clause to prevent disconnect loops          if (pEngine) { // if clause to prevent disconnect loops
346    
347                // delete the structures used for instrument change
348                RTList< ::gig::DimensionRegion*>* d = InstrumentChangeCommand.GetConfigForUpdate().pDimRegionsInUse;
349                if (d) delete d;
350                EngineChannel::instrument_change_command_t& cmd = InstrumentChangeCommand.SwitchConfig();
351                d = cmd.pDimRegionsInUse;
352    
353                if (cmd.pInstrument) {
354                    // release the currently loaded instrument
355                    Engine::instruments.HandBackInstrument(cmd.pInstrument, this, d);
356                }
357    
358                if (d) delete d;
359    
360                // release all active dimension regions to resource
361                // manager
362                RTList<uint>::Iterator iuiKey = pActiveKeys->first();
363                RTList<uint>::Iterator end    = pActiveKeys->end();
364                while (iuiKey != end) { // iterate through all active keys
365                    midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey];
366                    ++iuiKey;
367    
368                    RTList<Voice>::Iterator itVoice     = pKey->pActiveVoices->first();
369                    RTList<Voice>::Iterator itVoicesEnd = pKey->pActiveVoices->end();
370                    for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key
371                        Engine::instruments.HandBackDimReg(itVoice->pDimRgn);
372                    }
373                }
374    
375              ResetInternal();              ResetInternal();
376                if (pEvents) {
377                    delete pEvents;
378                    pEvents = NULL;
379                }
380              for (uint i = 0; i < 128; i++) {              for (uint i = 0; i < 128; i++) {
381                  if (pMIDIKeyInfo[i].pActiveVoices) delete pMIDIKeyInfo[i].pActiveVoices;                  if (pMIDIKeyInfo[i].pActiveVoices) {
382                  if (pMIDIKeyInfo[i].pEvents)       delete pMIDIKeyInfo[i].pEvents;                      delete pMIDIKeyInfo[i].pActiveVoices;
383                        pMIDIKeyInfo[i].pActiveVoices = NULL;
384                    }
385                    if (pMIDIKeyInfo[i].pEvents) {
386                        delete pMIDIKeyInfo[i].pEvents;
387                        pMIDIKeyInfo[i].pEvents = NULL;
388                    }
389              }              }
390              Engine* oldEngine = pEngine;              Engine* oldEngine = pEngine;
391              AudioOutputDevice* oldAudioDevice = pEngine->pAudioOutputDevice;              AudioOutputDevice* oldAudioDevice = pEngine->pAudioOutputDevice;
392              pEngine = NULL;              pEngine = NULL;
393              Engine::FreeEngine(this, oldAudioDevice);              Engine::FreeEngine(this, oldAudioDevice);
394              AudioDeviceChannelLeft  = -1;              AudioDeviceChannelLeft  = -1;
395              AudioDeviceChannelRight = -1;                          AudioDeviceChannelRight = -1;
396                if (!fxSends.empty()) { // free the local rendering buffers
397                    if (pChannelLeft)  delete pChannelLeft;
398                    if (pChannelRight) delete pChannelRight;
399                }
400                pChannelLeft  = NULL;
401                pChannelRight = NULL;
402          }          }
403      }      }
404    
405        AudioOutputDevice* EngineChannel::GetAudioOutputDevice() {
406            return (pEngine) ? pEngine->pAudioOutputDevice : NULL;
407        }
408    
409      void EngineChannel::SetOutputChannel(uint EngineAudioChannel, uint AudioDeviceChannel) {      void EngineChannel::SetOutputChannel(uint EngineAudioChannel, uint AudioDeviceChannel) {
410          if (!pEngine || !pEngine->pAudioOutputDevice) throw AudioOutputException("No audio output device connected yet.");          if (!pEngine || !pEngine->pAudioOutputDevice) throw AudioOutputException("No audio output device connected yet.");
411            
412          AudioChannel* pChannel = pEngine->pAudioOutputDevice->Channel(AudioDeviceChannel);          AudioChannel* pChannel = pEngine->pAudioOutputDevice->Channel(AudioDeviceChannel);
413          if (!pChannel) throw AudioOutputException("Invalid audio output device channel " + ToString(AudioDeviceChannel));          if (!pChannel) throw AudioOutputException("Invalid audio output device channel " + ToString(AudioDeviceChannel));
414          switch (EngineAudioChannel) {          switch (EngineAudioChannel) {
415              case 0: // left output channel              case 0: // left output channel
416                  pOutputLeft = pChannel->Buffer();                  if (fxSends.empty()) pChannelLeft = pChannel;
417                  AudioDeviceChannelLeft = AudioDeviceChannel;                  AudioDeviceChannelLeft = AudioDeviceChannel;
418                  break;                  break;
419              case 1: // right output channel              case 1: // right output channel
420                  pOutputRight = pChannel->Buffer();                  if (fxSends.empty()) pChannelRight = pChannel;
421                  AudioDeviceChannelRight = AudioDeviceChannel;                  AudioDeviceChannelRight = AudioDeviceChannel;
422                  break;                  break;
423              default:              default:
424                  throw AudioOutputException("Invalid engine audio channel " + ToString(EngineAudioChannel));                  throw AudioOutputException("Invalid engine audio channel " + ToString(EngineAudioChannel));
425          }          }
426    
427            bStatusChanged = true;
428      }      }
429    
430      int EngineChannel::OutputChannel(uint EngineAudioChannel) {      int EngineChannel::OutputChannel(uint EngineAudioChannel) {
# Line 276  namespace LinuxSampler { namespace gig { Line 438  namespace LinuxSampler { namespace gig {
438          }          }
439      }      }
440    
441        void EngineChannel::Connect(MidiInputPort* pMidiPort, midi_chan_t MidiChannel) {
442            if (!pMidiPort || pMidiPort == this->pMidiInputPort) return;
443            DisconnectMidiInputPort();
444            this->pMidiInputPort = pMidiPort;
445            this->midiChannel    = MidiChannel;
446            pMidiPort->Connect(this, MidiChannel);
447        }
448    
449        void EngineChannel::DisconnectMidiInputPort() {
450            MidiInputPort* pOldPort = this->pMidiInputPort;
451            this->pMidiInputPort = NULL;
452            if (pOldPort) pOldPort->Disconnect(this);
453        }
454    
455        MidiInputPort* EngineChannel::GetMidiInputPort() {
456            return pMidiInputPort;
457        }
458    
459        midi_chan_t EngineChannel::MidiChannel() {
460            return midiChannel;
461        }
462    
463        FxSend* EngineChannel::AddFxSend(uint8_t MidiCtrl, String Name) throw (Exception) {
464            if (pEngine) pEngine->DisableAndLock();
465            FxSend* pFxSend = new FxSend(this, MidiCtrl, Name);
466            if (fxSends.empty()) {
467                if (pEngine && pEngine->pAudioOutputDevice) {
468                    AudioOutputDevice* pDevice = pEngine->pAudioOutputDevice;
469                    // create local render buffers
470                    pChannelLeft  = new AudioChannel(0, pDevice->MaxSamplesPerCycle());
471                    pChannelRight = new AudioChannel(1, pDevice->MaxSamplesPerCycle());
472                } else {
473                    // postpone local render buffer creation until audio device is assigned
474                    pChannelLeft  = NULL;
475                    pChannelRight = NULL;
476                }
477            }
478            fxSends.push_back(pFxSend);
479            if (pEngine) pEngine->Enable();
480            fireFxSendCountChanged(GetSamplerChannel()->Index(), GetFxSendCount());
481    
482            return pFxSend;
483        }
484    
485        FxSend* EngineChannel::GetFxSend(uint FxSendIndex) {
486            return (FxSendIndex < fxSends.size()) ? fxSends[FxSendIndex] : NULL;
487        }
488    
489        uint EngineChannel::GetFxSendCount() {
490            return fxSends.size();
491        }
492    
493        void EngineChannel::RemoveFxSend(FxSend* pFxSend) {
494            if (pEngine) pEngine->DisableAndLock();
495            for (
496                std::vector<FxSend*>::iterator iter = fxSends.begin();
497                iter != fxSends.end(); iter++
498            ) {
499                if (*iter == pFxSend) {
500                    delete pFxSend;
501                    fxSends.erase(iter);
502                    if (fxSends.empty()) {
503                        // destroy local render buffers
504                        if (pChannelLeft)  delete pChannelLeft;
505                        if (pChannelRight) delete pChannelRight;
506                        // fallback to render directly into AudioOutputDevice's buffers
507                        if (pEngine && pEngine->pAudioOutputDevice) {
508                            pChannelLeft  = pEngine->pAudioOutputDevice->Channel(AudioDeviceChannelLeft);
509                            pChannelRight = pEngine->pAudioOutputDevice->Channel(AudioDeviceChannelRight);
510                        } else { // we update the pointers later
511                            pChannelLeft  = NULL;
512                            pChannelRight = NULL;
513                        }
514                    }
515                    break;
516                }
517            }
518            if (pEngine) pEngine->Enable();
519            fireFxSendCountChanged(GetSamplerChannel()->Index(), GetFxSendCount());
520        }
521    
522      /**      /**
523       *  Will be called by the MIDIIn Thread to let the audio thread trigger a new       *  Will be called by the MIDIIn Thread to let the audio thread trigger a new
524       *  voice for the given key.       *  voice for the given key. This method is meant for real time rendering,
525         *  that is an event will immediately be created with the current system
526         *  time as time stamp.
527       *       *
528       *  @param Key      - MIDI key number of the triggered key       *  @param Key      - MIDI key number of the triggered key
529       *  @param Velocity - MIDI velocity value of the triggered key       *  @param Velocity - MIDI velocity value of the triggered key
# Line 289  namespace LinuxSampler { namespace gig { Line 534  namespace LinuxSampler { namespace gig {
534              event.Type                = Event::type_note_on;              event.Type                = Event::type_note_on;
535              event.Param.Note.Key      = Key;              event.Param.Note.Key      = Key;
536              event.Param.Note.Velocity = Velocity;              event.Param.Note.Velocity = Velocity;
537              event.pEngineChannel      = this;                          event.pEngineChannel      = this;
538                if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
539                else dmsg(1,("EngineChannel: Input event queue full!"));
540                // inform connected virtual MIDI devices if any ...
541                // (e.g. virtual MIDI keyboard in instrument editor(s))
542                ArrayList<VirtualMidiDevice*>& devices =
543                    const_cast<ArrayList<VirtualMidiDevice*>&>(
544                        virtualMidiDevicesReader_MidiThread.Lock()
545                    );
546                for (int i = 0; i < devices.size(); i++) {
547                    devices[i]->SendNoteOnToDevice(Key, Velocity);
548                }
549                virtualMidiDevicesReader_MidiThread.Unlock();
550            }
551        }
552    
553        /**
554         *  Will be called by the MIDIIn Thread to let the audio thread trigger a new
555         *  voice for the given key. This method is meant for offline rendering
556         *  and / or for cases where the exact position of the event in the current
557         *  audio fragment is already known.
558         *
559         *  @param Key         - MIDI key number of the triggered key
560         *  @param Velocity    - MIDI velocity value of the triggered key
561         *  @param FragmentPos - sample point position in the current audio
562         *                       fragment to which this event belongs to
563         */
564        void EngineChannel::SendNoteOn(uint8_t Key, uint8_t Velocity, int32_t FragmentPos) {
565            if (FragmentPos < 0) {
566                dmsg(1,("EngineChannel::SendNoteOn(): negative FragmentPos! Seems MIDI driver is buggy!"));
567            }
568            else if (pEngine) {
569                Event event               = pEngine->pEventGenerator->CreateEvent(FragmentPos);
570                event.Type                = Event::type_note_on;
571                event.Param.Note.Key      = Key;
572                event.Param.Note.Velocity = Velocity;
573                event.pEngineChannel      = this;
574              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
575              else dmsg(1,("EngineChannel: Input event queue full!"));              else dmsg(1,("EngineChannel: Input event queue full!"));
576                // inform connected virtual MIDI devices if any ...
577                // (e.g. virtual MIDI keyboard in instrument editor(s))
578                ArrayList<VirtualMidiDevice*>& devices =
579                    const_cast<ArrayList<VirtualMidiDevice*>&>(
580                        virtualMidiDevicesReader_MidiThread.Lock()
581                    );
582                for (int i = 0; i < devices.size(); i++) {
583                    devices[i]->SendNoteOnToDevice(Key, Velocity);
584                }
585                virtualMidiDevicesReader_MidiThread.Unlock();
586          }          }
587      }      }
588    
589      /**      /**
590       *  Will be called by the MIDIIn Thread to signal the audio thread to release       *  Will be called by the MIDIIn Thread to signal the audio thread to release
591       *  voice(s) on the given key.       *  voice(s) on the given key. This method is meant for real time rendering,
592         *  that is an event will immediately be created with the current system
593         *  time as time stamp.
594       *       *
595       *  @param Key      - MIDI key number of the released key       *  @param Key      - MIDI key number of the released key
596       *  @param Velocity - MIDI release velocity value of the released key       *  @param Velocity - MIDI release velocity value of the released key
# Line 311  namespace LinuxSampler { namespace gig { Line 604  namespace LinuxSampler { namespace gig {
604              event.pEngineChannel      = this;              event.pEngineChannel      = this;
605              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
606              else dmsg(1,("EngineChannel: Input event queue full!"));              else dmsg(1,("EngineChannel: Input event queue full!"));
607                // inform connected virtual MIDI devices if any ...
608                // (e.g. virtual MIDI keyboard in instrument editor(s))
609                ArrayList<VirtualMidiDevice*>& devices =
610                    const_cast<ArrayList<VirtualMidiDevice*>&>(
611                        virtualMidiDevicesReader_MidiThread.Lock()
612                    );
613                for (int i = 0; i < devices.size(); i++) {
614                    devices[i]->SendNoteOffToDevice(Key, Velocity);
615                }
616                virtualMidiDevicesReader_MidiThread.Unlock();
617            }
618        }
619    
620        /**
621         *  Will be called by the MIDIIn Thread to signal the audio thread to release
622         *  voice(s) on the given key. This method is meant for offline rendering
623         *  and / or for cases where the exact position of the event in the current
624         *  audio fragment is already known.
625         *
626         *  @param Key         - MIDI key number of the released key
627         *  @param Velocity    - MIDI release velocity value of the released key
628         *  @param FragmentPos - sample point position in the current audio
629         *                       fragment to which this event belongs to
630         */
631        void EngineChannel::SendNoteOff(uint8_t Key, uint8_t Velocity, int32_t FragmentPos) {
632            if (FragmentPos < 0) {
633                dmsg(1,("EngineChannel::SendNoteOff(): negative FragmentPos! Seems MIDI driver is buggy!"));
634            }
635            else if (pEngine) {
636                Event event               = pEngine->pEventGenerator->CreateEvent(FragmentPos);
637                event.Type                = Event::type_note_off;
638                event.Param.Note.Key      = Key;
639                event.Param.Note.Velocity = Velocity;
640                event.pEngineChannel      = this;
641                if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
642                else dmsg(1,("EngineChannel: Input event queue full!"));
643                // inform connected virtual MIDI devices if any ...
644                // (e.g. virtual MIDI keyboard in instrument editor(s))
645                ArrayList<VirtualMidiDevice*>& devices =
646                    const_cast<ArrayList<VirtualMidiDevice*>&>(
647                        virtualMidiDevicesReader_MidiThread.Lock()
648                    );
649                for (int i = 0; i < devices.size(); i++) {
650                    devices[i]->SendNoteOffToDevice(Key, Velocity);
651                }
652                virtualMidiDevicesReader_MidiThread.Unlock();
653          }          }
654      }      }
655    
656      /**      /**
657       *  Will be called by the MIDIIn Thread to signal the audio thread to change       *  Will be called by the MIDIIn Thread to signal the audio thread to change
658       *  the pitch value for all voices.       *  the pitch value for all voices. This method is meant for real time
659         *  rendering, that is an event will immediately be created with the
660         *  current system time as time stamp.
661       *       *
662       *  @param Pitch - MIDI pitch value (-8192 ... +8191)       *  @param Pitch - MIDI pitch value (-8192 ... +8191)
663       */       */
664      void EngineChannel::SendPitchbend(int Pitch) {      void EngineChannel::SendPitchbend(int Pitch) {
665          if (pEngine) {                  if (pEngine) {
666              Event event             = pEngine->pEventGenerator->CreateEvent();              Event event             = pEngine->pEventGenerator->CreateEvent();
667              event.Type              = Event::type_pitchbend;              event.Type              = Event::type_pitchbend;
668              event.Param.Pitch.Pitch = Pitch;              event.Param.Pitch.Pitch = Pitch;
# Line 332  namespace LinuxSampler { namespace gig { Line 673  namespace LinuxSampler { namespace gig {
673      }      }
674    
675      /**      /**
676         *  Will be called by the MIDIIn Thread to signal the audio thread to change
677         *  the pitch value for all voices. This method is meant for offline
678         *  rendering and / or for cases where the exact position of the event in
679         *  the current audio fragment is already known.
680         *
681         *  @param Pitch       - MIDI pitch value (-8192 ... +8191)
682         *  @param FragmentPos - sample point position in the current audio
683         *                       fragment to which this event belongs to
684         */
685        void EngineChannel::SendPitchbend(int Pitch, int32_t FragmentPos) {
686            if (FragmentPos < 0) {
687                dmsg(1,("EngineChannel::SendPitchBend(): negative FragmentPos! Seems MIDI driver is buggy!"));
688            }
689            else if (pEngine) {
690                Event event             = pEngine->pEventGenerator->CreateEvent(FragmentPos);
691                event.Type              = Event::type_pitchbend;
692                event.Param.Pitch.Pitch = Pitch;
693                event.pEngineChannel    = this;
694                if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
695                else dmsg(1,("EngineChannel: Input event queue full!"));
696            }
697        }
698    
699        /**
700       *  Will be called by the MIDIIn Thread to signal the audio thread that a       *  Will be called by the MIDIIn Thread to signal the audio thread that a
701       *  continuous controller value has changed.       *  continuous controller value has changed. This method is meant for real
702         *  time rendering, that is an event will immediately be created with the
703         *  current system time as time stamp.
704       *       *
705       *  @param Controller - MIDI controller number of the occured control change       *  @param Controller - MIDI controller number of the occured control change
706       *  @param Value      - value of the control change       *  @param Value      - value of the control change
# Line 350  namespace LinuxSampler { namespace gig { Line 717  namespace LinuxSampler { namespace gig {
717          }          }
718      }      }
719    
720        /**
721         *  Will be called by the MIDIIn Thread to signal the audio thread that a
722         *  continuous controller value has changed. This method is meant for
723         *  offline rendering and / or for cases where the exact position of the
724         *  event in the current audio fragment is already known.
725         *
726         *  @param Controller  - MIDI controller number of the occured control change
727         *  @param Value       - value of the control change
728         *  @param FragmentPos - sample point position in the current audio
729         *                       fragment to which this event belongs to
730         */
731        void EngineChannel::SendControlChange(uint8_t Controller, uint8_t Value, int32_t FragmentPos) {
732            if (FragmentPos < 0) {
733                dmsg(1,("EngineChannel::SendControlChange(): negative FragmentPos! Seems MIDI driver is buggy!"));
734            }
735            else if (pEngine) {
736                Event event               = pEngine->pEventGenerator->CreateEvent(FragmentPos);
737                event.Type                = Event::type_control_change;
738                event.Param.CC.Controller = Controller;
739                event.Param.CC.Value      = Value;
740                event.pEngineChannel      = this;
741                if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
742                else dmsg(1,("EngineChannel: Input event queue full!"));
743            }
744        }
745    
746        void EngineChannel::ClearEventLists() {
747            pEvents->clear();
748            // empty MIDI key specific event lists
749            {
750                RTList<uint>::Iterator iuiKey = pActiveKeys->first();
751                RTList<uint>::Iterator end    = pActiveKeys->end();
752                for(; iuiKey != end; ++iuiKey) {
753                    pMIDIKeyInfo[*iuiKey].pEvents->clear(); // free all events on the key
754                }
755            }
756        }
757    
758        void EngineChannel::ResetControllers() {
759            Pitch          = 0;
760            SustainPedal   = false;
761            SostenutoPedal = false;
762            GlobalVolume   = 1.0f;
763            MidiVolume     = 1.0;
764            GlobalPanLeft  = 1.0f;
765            GlobalPanRight = 1.0f;
766            iLastPanRequest = 64;
767            GlobalTranspose = 0;
768            // set all MIDI controller values to zero
769            memset(ControllerTable, 0x00, 129);
770            // reset all FX Send levels
771            for (
772                std::vector<FxSend*>::iterator iter = fxSends.begin();
773                iter != fxSends.end(); iter++
774            ) {
775                (*iter)->Reset();
776            }
777        }
778    
779        /**
780         * Copy all events from the engine channel's input event queue buffer to
781         * the internal event list. This will be done at the beginning of each
782         * audio cycle (that is each RenderAudio() call) to distinguish all
783         * events which have to be processed in the current audio cycle. Each
784         * EngineChannel has it's own input event queue for the common channel
785         * specific events (like NoteOn, NoteOff and ControlChange events).
786         * Beside that, the engine also has a input event queue for global
787         * events (usually SysEx messages).
788         *
789         * @param Samples - number of sample points to be processed in the
790         *                  current audio cycle
791         */
792        void EngineChannel::ImportEvents(uint Samples) {
793            // import events from pure software MIDI "devices"
794            // (e.g. virtual keyboard in instrument editor)
795            {
796                const int FragmentPos = 0; // randomly chosen, we don't care about jitter for virtual MIDI devices
797                Event event = pEngine->pEventGenerator->CreateEvent(FragmentPos);
798                VirtualMidiDevice::event_t devEvent; // the event format we get from the virtual MIDI device
799                // as we're going to (carefully) write some status to the
800                // synchronized struct, we cast away the const
801                ArrayList<VirtualMidiDevice*>& devices =
802                    const_cast<ArrayList<VirtualMidiDevice*>&>(virtualMidiDevicesReader_AudioThread.Lock());
803                // iterate through all virtual MIDI devices
804                for (int i = 0; i < devices.size(); i++) {
805                    VirtualMidiDevice* pDev = devices[i];
806                    // I think we can simply flush the whole FIFO(s), the user shouldn't be so fast ;-)
807                    while (pDev->GetMidiEventFromDevice(devEvent)) {
808                        event.Type =
809                            (devEvent.Type == VirtualMidiDevice::EVENT_TYPE_NOTEON) ?
810                                Event::type_note_on : Event::type_note_off;
811                        event.Param.Note.Key      = devEvent.Key;
812                        event.Param.Note.Velocity = devEvent.Velocity;
813                        event.pEngineChannel      = this;
814                        // copy event to internal event list
815                        if (pEvents->poolIsEmpty()) {
816                            dmsg(1,("Event pool emtpy!\n"));
817                            goto exitVirtualDevicesLoop;
818                        }
819                        *pEvents->allocAppend() = event;
820                    }
821                }
822            }
823            exitVirtualDevicesLoop:
824            virtualMidiDevicesReader_AudioThread.Unlock();
825    
826            // import events from the regular MIDI devices
827            RingBuffer<Event,false>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();
828            Event* pEvent;
829            while (true) {
830                // get next event from input event queue
831                if (!(pEvent = eventQueueReader.pop())) break;
832                // if younger event reached, ignore that and all subsequent ones for now
833                if (pEvent->FragmentPos() >= Samples) {
834                    eventQueueReader--;
835                    dmsg(2,("Younger Event, pos=%d ,Samples=%d!\n",pEvent->FragmentPos(),Samples));
836                    pEvent->ResetFragmentPos();
837                    break;
838                }
839                // copy event to internal event list
840                if (pEvents->poolIsEmpty()) {
841                    dmsg(1,("Event pool emtpy!\n"));
842                    break;
843                }
844                *pEvents->allocAppend() = *pEvent;
845            }
846            eventQueueReader.free(); // free all copied events from input queue
847        }
848    
849        void EngineChannel::RemoveAllFxSends() {
850            if (pEngine) pEngine->DisableAndLock();
851            if (!fxSends.empty()) { // free local render buffers
852                if (pChannelLeft) {
853                    delete pChannelLeft;
854                    if (pEngine && pEngine->pAudioOutputDevice) {
855                        // fallback to render directly to the AudioOutputDevice's buffer
856                        pChannelLeft = pEngine->pAudioOutputDevice->Channel(AudioDeviceChannelLeft);
857                    } else pChannelLeft = NULL;
858                }
859                if (pChannelRight) {
860                    delete pChannelRight;
861                    if (pEngine && pEngine->pAudioOutputDevice) {
862                        // fallback to render directly to the AudioOutputDevice's buffer
863                        pChannelRight = pEngine->pAudioOutputDevice->Channel(AudioDeviceChannelRight);
864                    } else pChannelRight = NULL;
865                }
866            }
867            for (int i = 0; i < fxSends.size(); i++) delete fxSends[i];
868            fxSends.clear();
869            if (pEngine) pEngine->Enable();
870        }
871    
872        void EngineChannel::Connect(VirtualMidiDevice* pDevice) {
873            // double buffer ... double work ...
874            {
875                ArrayList<VirtualMidiDevice*>& devices = virtualMidiDevices.GetConfigForUpdate();
876                devices.add(pDevice);
877            }
878            {
879                ArrayList<VirtualMidiDevice*>& devices = virtualMidiDevices.SwitchConfig();
880                devices.add(pDevice);
881            }
882        }
883    
884        void EngineChannel::Disconnect(VirtualMidiDevice* pDevice) {
885            // double buffer ... double work ...
886            {
887                ArrayList<VirtualMidiDevice*>& devices = virtualMidiDevices.GetConfigForUpdate();
888                devices.remove(pDevice);
889            }
890            {
891                ArrayList<VirtualMidiDevice*>& devices = virtualMidiDevices.SwitchConfig();
892                devices.remove(pDevice);
893            }
894        }
895    
896      float EngineChannel::Volume() {      float EngineChannel::Volume() {
897          return GlobalVolume;          return GlobalVolume;
898      }      }
899    
900      void EngineChannel::Volume(float f) {      void EngineChannel::Volume(float f) {
901          GlobalVolume = f;          GlobalVolume = f;
902            bStatusChanged = true; // status of engine channel has changed, so set notify flag
903        }
904    
905        float EngineChannel::Pan() {
906            return float(iLastPanRequest - 64) / 64.0f;
907        }
908    
909        void EngineChannel::Pan(float f) {
910            int iMidiPan = int(f * 64.0f) + 64;
911            if (iMidiPan > 127) iMidiPan = 127;
912            else if (iMidiPan < 0) iMidiPan = 0;
913            GlobalPanLeft  = Engine::PanCurve[128 - iMidiPan];
914            GlobalPanRight = Engine::PanCurve[iMidiPan];
915            iLastPanRequest = iMidiPan;
916      }      }
917    
918      uint EngineChannel::Channels() {      uint EngineChannel::Channels() {
# Line 376  namespace LinuxSampler { namespace gig { Line 933  namespace LinuxSampler { namespace gig {
933    
934      int EngineChannel::InstrumentStatus() {      int EngineChannel::InstrumentStatus() {
935          return InstrumentStat;          return InstrumentStat;
936      }          }
937    
938        String EngineChannel::EngineName() {
939            return LS_GIG_ENGINE_NAME;
940        }
941    
942        void EngineChannel::ClearDimRegionsInUse() {
943            {
944                instrument_change_command_t& cmd = InstrumentChangeCommand.GetConfigForUpdate();
945                if(cmd.pDimRegionsInUse != NULL) cmd.pDimRegionsInUse->clear();
946            }
947            {
948                instrument_change_command_t& cmd = InstrumentChangeCommand.SwitchConfig();
949                if(cmd.pDimRegionsInUse != NULL) cmd.pDimRegionsInUse->clear();
950            }
951        }
952    
953        void EngineChannel::ResetDimRegionsInUse() {
954            {
955                instrument_change_command_t& cmd = InstrumentChangeCommand.GetConfigForUpdate();
956                if(cmd.pDimRegionsInUse != NULL) {
957                    delete cmd.pDimRegionsInUse;
958                    cmd.pDimRegionsInUse = new RTList< ::gig::DimensionRegion*>(pEngine->pDimRegionPool[0]);
959                }
960            }
961            {
962                instrument_change_command_t& cmd = InstrumentChangeCommand.SwitchConfig();
963                if(cmd.pDimRegionsInUse != NULL) {
964                    delete cmd.pDimRegionsInUse;
965                    cmd.pDimRegionsInUse = new RTList< ::gig::DimensionRegion*>(pEngine->pDimRegionPool[1]);
966                }
967            }
968        }
969    
970  }} // namespace LinuxSampler::gig  }} // namespace LinuxSampler::gig

Legend:
Removed from v.412  
changed lines
  Added in v.1843

  ViewVC Help
Powered by ViewVC