/[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 1039 by persson, Sat Feb 3 20:46:44 2007 UTC revision 1844 by persson, Mon Feb 23 18:29:50 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, 2006 Christian Schoenebeck                        *   *   Copyright (C) 2005 - 2009 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    #include "../../common/global_private.h"
27    #include "../../Sampler.h"
28    
29  namespace LinuxSampler { namespace gig {  namespace LinuxSampler { namespace gig {
30    
31      EngineChannel::EngineChannel() {      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;
# Line 53  namespace LinuxSampler { namespace gig { Line 60  namespace LinuxSampler { namespace gig {
60          SoloMode       = false;          SoloMode       = false;
61          PortamentoMode = false;          PortamentoMode = false;
62          PortamentoTime = CONFIG_PORTAMENTO_TIME_DEFAULT;          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          DisconnectAudioOutputDevice();          DisconnectAudioOutputDevice();
82          if (pInstrument) Engine::instruments.HandBack(pInstrument, this);  
83            // In case the channel was removed before the instrument was
84            // fully loaded, try to give back instrument again (see bug #113)
85            instrument_change_command_t& cmd = ChangeInstrument(NULL);
86            if (cmd.pInstrument) {
87                    Engine::instruments.HandBack(cmd.pInstrument, this);
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;
# Line 159  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          ::gig::Instrument* oldInstrument = pInstrument;          // make sure we don't trigger any new notes with an old
196            // instrument
197          // free old instrument          instrument_change_command_t& cmd = ChangeInstrument(0);
198          if (oldInstrument) {          if (cmd.pInstrument) {
199              if (pEngine) {              // give old instrument back to instrument manager, but
200                  // make sure we don't trigger any new notes with the              // keep the dimension regions and samples that are in use
201                  // old instrument              Engine::instruments.HandBackInstrument(cmd.pInstrument, this, cmd.pDimRegionsInUse);
                 ::gig::DimensionRegion** dimRegionsInUse = pEngine->ChangeInstrument(this, 0);  
   
                 // give old instrument back to instrument manager, but  
                 // keep the dimension regions and samples that are in  
                 // use  
                 Engine::instruments.HandBackInstrument(oldInstrument, this, dimRegionsInUse);  
             } else {  
                 Engine::instruments.HandBack(oldInstrument, this);  
             }  
202          }          }
203            cmd.pDimRegionsInUse->clear();
204    
205          // delete all key groups          // delete all key groups
206          ActiveKeyGroups.clear();          ActiveKeyGroups.clear();
# Line 192  namespace LinuxSampler { namespace gig { Line 213  namespace LinuxSampler { namespace gig {
213              instrid.Index     = InstrumentIdx;              instrid.Index     = InstrumentIdx;
214              newInstrument = Engine::instruments.Borrow(instrid, this);              newInstrument = Engine::instruments.Borrow(instrid, this);
215              if (!newInstrument) {              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 Exception(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 Exception(msg);              throw Exception(msg);
230          }          }
231          catch (...) {          catch (...) {
232              InstrumentStat = -4;              InstrumentStat = -4;
233                StatusChanged(true);
234              throw Exception("gig::Engine error: Failed to load instrument, cause: Unknown exception while trying to parse gig file.");              throw Exception("gig::Engine error: Failed to load instrument, cause: Unknown exception while trying to parse gig file.");
235          }          }
236    
# Line 219  namespace LinuxSampler { namespace gig { Line 241  namespace LinuxSampler { namespace gig {
241          InstrumentIdxName = newInstrument->pInfo->Name;          InstrumentIdxName = newInstrument->pInfo->Name;
242          InstrumentStat = 100;          InstrumentStat = 100;
243    
244          if (pEngine) pEngine->ChangeInstrument(this, newInstrument);          ChangeInstrument(newInstrument);
245          else pInstrument = newInstrument;  
246            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      /**      /**
# Line 265  namespace LinuxSampler { namespace gig { Line 305  namespace LinuxSampler { namespace gig {
305          pEngine = Engine::AcquireEngine(this, pAudioOut);          pEngine = Engine::AcquireEngine(this, pAudioOut);
306          ResetInternal();          ResetInternal();
307          pEvents = new RTList<Event>(pEngine->pEventPool);          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);
# Line 287  namespace LinuxSampler { namespace gig { Line 343  namespace LinuxSampler { namespace gig {
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              ResetInternal();              ResetInternal();
348    
349                // delete the structures used for instrument change
350                RTList< ::gig::DimensionRegion*>* d = InstrumentChangeCommand.GetConfigForUpdate().pDimRegionsInUse;
351                if (d) delete d;
352                EngineChannel::instrument_change_command_t& cmd = InstrumentChangeCommand.SwitchConfig();
353                d = cmd.pDimRegionsInUse;
354                if (d) delete d;
355    
356                if (cmd.pInstrument) {
357                    // release the currently loaded instrument
358                    Engine::instruments.HandBack(cmd.pInstrument, this);
359                }
360    
361              if (pEvents) {              if (pEvents) {
362                  delete pEvents;                  delete pEvents;
363                  pEvents = NULL;                  pEvents = NULL;
# Line 302  namespace LinuxSampler { namespace gig { Line 372  namespace LinuxSampler { namespace gig {
372                      pMIDIKeyInfo[i].pEvents = NULL;                      pMIDIKeyInfo[i].pEvents = NULL;
373                  }                  }
374              }              }
             Engine* oldEngine = pEngine;  
375              AudioOutputDevice* oldAudioDevice = pEngine->pAudioOutputDevice;              AudioOutputDevice* oldAudioDevice = pEngine->pAudioOutputDevice;
376              pEngine = NULL;              pEngine = NULL;
377              Engine::FreeEngine(this, oldAudioDevice);              Engine::FreeEngine(this, oldAudioDevice);
# Line 338  namespace LinuxSampler { namespace gig { Line 407  namespace LinuxSampler { namespace gig {
407              default:              default:
408                  throw AudioOutputException("Invalid engine audio channel " + ToString(EngineAudioChannel));                  throw AudioOutputException("Invalid engine audio channel " + ToString(EngineAudioChannel));
409          }          }
410    
411            bStatusChanged = true;
412      }      }
413    
414      int EngineChannel::OutputChannel(uint EngineAudioChannel) {      int EngineChannel::OutputChannel(uint EngineAudioChannel) {
# Line 390  namespace LinuxSampler { namespace gig { Line 461  namespace LinuxSampler { namespace gig {
461          }          }
462          fxSends.push_back(pFxSend);          fxSends.push_back(pFxSend);
463          if (pEngine) pEngine->Enable();          if (pEngine) pEngine->Enable();
464            fireFxSendCountChanged(GetSamplerChannel()->Index(), GetFxSendCount());
465    
466          return pFxSend;          return pFxSend;
467      }      }
468    
# Line 427  namespace LinuxSampler { namespace gig { Line 500  namespace LinuxSampler { namespace gig {
500              }              }
501          }          }
502          if (pEngine) pEngine->Enable();          if (pEngine) pEngine->Enable();
503            fireFxSendCountChanged(GetSamplerChannel()->Index(), GetFxSendCount());
504      }      }
505    
506      /**      /**
# Line 447  namespace LinuxSampler { namespace gig { Line 521  namespace LinuxSampler { namespace gig {
521              event.pEngineChannel      = this;              event.pEngineChannel      = this;
522              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
523              else dmsg(1,("EngineChannel: Input event queue full!"));              else dmsg(1,("EngineChannel: Input event queue full!"));
524                // inform connected virtual MIDI devices if any ...
525                // (e.g. virtual MIDI keyboard in instrument editor(s))
526                ArrayList<VirtualMidiDevice*>& devices =
527                    const_cast<ArrayList<VirtualMidiDevice*>&>(
528                        virtualMidiDevicesReader_MidiThread.Lock()
529                    );
530                for (int i = 0; i < devices.size(); i++) {
531                    devices[i]->SendNoteOnToDevice(Key, Velocity);
532                }
533                virtualMidiDevicesReader_MidiThread.Unlock();
534          }          }
535      }      }
536    
# Line 473  namespace LinuxSampler { namespace gig { Line 557  namespace LinuxSampler { namespace gig {
557              event.pEngineChannel      = this;              event.pEngineChannel      = this;
558              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
559              else dmsg(1,("EngineChannel: Input event queue full!"));              else dmsg(1,("EngineChannel: Input event queue full!"));
560                // inform connected virtual MIDI devices if any ...
561                // (e.g. virtual MIDI keyboard in instrument editor(s))
562                ArrayList<VirtualMidiDevice*>& devices =
563                    const_cast<ArrayList<VirtualMidiDevice*>&>(
564                        virtualMidiDevicesReader_MidiThread.Lock()
565                    );
566                for (int i = 0; i < devices.size(); i++) {
567                    devices[i]->SendNoteOnToDevice(Key, Velocity);
568                }
569                virtualMidiDevicesReader_MidiThread.Unlock();
570          }          }
571      }      }
572    
# Line 494  namespace LinuxSampler { namespace gig { Line 588  namespace LinuxSampler { namespace gig {
588              event.pEngineChannel      = this;              event.pEngineChannel      = this;
589              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
590              else dmsg(1,("EngineChannel: Input event queue full!"));              else dmsg(1,("EngineChannel: Input event queue full!"));
591                // inform connected virtual MIDI devices if any ...
592                // (e.g. virtual MIDI keyboard in instrument editor(s))
593                ArrayList<VirtualMidiDevice*>& devices =
594                    const_cast<ArrayList<VirtualMidiDevice*>&>(
595                        virtualMidiDevicesReader_MidiThread.Lock()
596                    );
597                for (int i = 0; i < devices.size(); i++) {
598                    devices[i]->SendNoteOffToDevice(Key, Velocity);
599                }
600                virtualMidiDevicesReader_MidiThread.Unlock();
601          }          }
602      }      }
603    
# Line 520  namespace LinuxSampler { namespace gig { Line 624  namespace LinuxSampler { namespace gig {
624              event.pEngineChannel      = this;              event.pEngineChannel      = this;
625              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
626              else dmsg(1,("EngineChannel: Input event queue full!"));              else dmsg(1,("EngineChannel: Input event queue full!"));
627                // inform connected virtual MIDI devices if any ...
628                // (e.g. virtual MIDI keyboard in instrument editor(s))
629                ArrayList<VirtualMidiDevice*>& devices =
630                    const_cast<ArrayList<VirtualMidiDevice*>&>(
631                        virtualMidiDevicesReader_MidiThread.Lock()
632                    );
633                for (int i = 0; i < devices.size(); i++) {
634                    devices[i]->SendNoteOffToDevice(Key, Velocity);
635                }
636                virtualMidiDevicesReader_MidiThread.Unlock();
637          }          }
638      }      }
639    
# Line 633  namespace LinuxSampler { namespace gig { Line 747  namespace LinuxSampler { namespace gig {
747          MidiVolume     = 1.0;          MidiVolume     = 1.0;
748          GlobalPanLeft  = 1.0f;          GlobalPanLeft  = 1.0f;
749          GlobalPanRight = 1.0f;          GlobalPanRight = 1.0f;
750            iLastPanRequest = 64;
751            GlobalTranspose = 0;
752          // set all MIDI controller values to zero          // set all MIDI controller values to zero
753          memset(ControllerTable, 0x00, 129);          memset(ControllerTable, 0x00, 129);
754            // reset all FX Send levels
755            for (
756                std::vector<FxSend*>::iterator iter = fxSends.begin();
757                iter != fxSends.end(); iter++
758            ) {
759                (*iter)->Reset();
760            }
761      }      }
762    
763      /**      /**
# Line 651  namespace LinuxSampler { namespace gig { Line 774  namespace LinuxSampler { namespace gig {
774       *                  current audio cycle       *                  current audio cycle
775       */       */
776      void EngineChannel::ImportEvents(uint Samples) {      void EngineChannel::ImportEvents(uint Samples) {
777            // import events from pure software MIDI "devices"
778            // (e.g. virtual keyboard in instrument editor)
779            {
780                const int FragmentPos = 0; // randomly chosen, we don't care about jitter for virtual MIDI devices
781                Event event = pEngine->pEventGenerator->CreateEvent(FragmentPos);
782                VirtualMidiDevice::event_t devEvent; // the event format we get from the virtual MIDI device
783                // as we're going to (carefully) write some status to the
784                // synchronized struct, we cast away the const
785                ArrayList<VirtualMidiDevice*>& devices =
786                    const_cast<ArrayList<VirtualMidiDevice*>&>(virtualMidiDevicesReader_AudioThread.Lock());
787                // iterate through all virtual MIDI devices
788                for (int i = 0; i < devices.size(); i++) {
789                    VirtualMidiDevice* pDev = devices[i];
790                    // I think we can simply flush the whole FIFO(s), the user shouldn't be so fast ;-)
791                    while (pDev->GetMidiEventFromDevice(devEvent)) {
792                        event.Type =
793                            (devEvent.Type == VirtualMidiDevice::EVENT_TYPE_NOTEON) ?
794                                Event::type_note_on : Event::type_note_off;
795                        event.Param.Note.Key      = devEvent.Key;
796                        event.Param.Note.Velocity = devEvent.Velocity;
797                        event.pEngineChannel      = this;
798                        // copy event to internal event list
799                        if (pEvents->poolIsEmpty()) {
800                            dmsg(1,("Event pool emtpy!\n"));
801                            goto exitVirtualDevicesLoop;
802                        }
803                        *pEvents->allocAppend() = event;
804                    }
805                }
806            }
807            exitVirtualDevicesLoop:
808            virtualMidiDevicesReader_AudioThread.Unlock();
809    
810            // import events from the regular MIDI devices
811          RingBuffer<Event,false>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();          RingBuffer<Event,false>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();
812          Event* pEvent;          Event* pEvent;
813          while (true) {          while (true) {
# Line 688  namespace LinuxSampler { namespace gig { Line 845  namespace LinuxSampler { namespace gig {
845                  if (pEngine && pEngine->pAudioOutputDevice) {                  if (pEngine && pEngine->pAudioOutputDevice) {
846                      // fallback to render directly to the AudioOutputDevice's buffer                      // fallback to render directly to the AudioOutputDevice's buffer
847                      pChannelRight = pEngine->pAudioOutputDevice->Channel(AudioDeviceChannelRight);                      pChannelRight = pEngine->pAudioOutputDevice->Channel(AudioDeviceChannelRight);
848                  } else pChannelRight = NULL;                  } else pChannelRight = NULL;
849              }              }
850          }          }
851          for (int i = 0; i < fxSends.size(); i++) delete fxSends[i];          for (int i = 0; i < fxSends.size(); i++) delete fxSends[i];
# Line 696  namespace LinuxSampler { namespace gig { Line 853  namespace LinuxSampler { namespace gig {
853          if (pEngine) pEngine->Enable();          if (pEngine) pEngine->Enable();
854      }      }
855    
856        void EngineChannel::Connect(VirtualMidiDevice* pDevice) {
857            // double buffer ... double work ...
858            {
859                ArrayList<VirtualMidiDevice*>& devices = virtualMidiDevices.GetConfigForUpdate();
860                devices.add(pDevice);
861            }
862            {
863                ArrayList<VirtualMidiDevice*>& devices = virtualMidiDevices.SwitchConfig();
864                devices.add(pDevice);
865            }
866        }
867    
868        void EngineChannel::Disconnect(VirtualMidiDevice* pDevice) {
869            // double buffer ... double work ...
870            {
871                ArrayList<VirtualMidiDevice*>& devices = virtualMidiDevices.GetConfigForUpdate();
872                devices.remove(pDevice);
873            }
874            {
875                ArrayList<VirtualMidiDevice*>& devices = virtualMidiDevices.SwitchConfig();
876                devices.remove(pDevice);
877            }
878        }
879    
880      float EngineChannel::Volume() {      float EngineChannel::Volume() {
881          return GlobalVolume;          return GlobalVolume;
882      }      }
# Line 705  namespace LinuxSampler { namespace gig { Line 886  namespace LinuxSampler { namespace gig {
886          bStatusChanged = true; // status of engine channel has changed, so set notify flag          bStatusChanged = true; // status of engine channel has changed, so set notify flag
887      }      }
888    
889        float EngineChannel::Pan() {
890            return float(iLastPanRequest - 64) / 64.0f;
891        }
892    
893        void EngineChannel::Pan(float f) {
894            int iMidiPan = int(f * 64.0f) + 64;
895            if (iMidiPan > 127) iMidiPan = 127;
896            else if (iMidiPan < 0) iMidiPan = 0;
897            GlobalPanLeft  = Engine::PanCurve[128 - iMidiPan];
898            GlobalPanRight = Engine::PanCurve[iMidiPan];
899            iLastPanRequest = iMidiPan;
900        }
901    
902      uint EngineChannel::Channels() {      uint EngineChannel::Channels() {
903          return 2;          return 2;
904      }      }
# Line 729  namespace LinuxSampler { namespace gig { Line 923  namespace LinuxSampler { namespace gig {
923          return LS_GIG_ENGINE_NAME;          return LS_GIG_ENGINE_NAME;
924      }      }
925    
926        void EngineChannel::ClearDimRegionsInUse() {
927            {
928                instrument_change_command_t& cmd = InstrumentChangeCommand.GetConfigForUpdate();
929                if(cmd.pDimRegionsInUse != NULL) cmd.pDimRegionsInUse->clear();
930            }
931            {
932                instrument_change_command_t& cmd = InstrumentChangeCommand.SwitchConfig();
933                if(cmd.pDimRegionsInUse != NULL) cmd.pDimRegionsInUse->clear();
934            }
935        }
936    
937        void EngineChannel::ResetDimRegionsInUse() {
938            {
939                instrument_change_command_t& cmd = InstrumentChangeCommand.GetConfigForUpdate();
940                if(cmd.pDimRegionsInUse != NULL) {
941                    delete cmd.pDimRegionsInUse;
942                    cmd.pDimRegionsInUse = new RTList< ::gig::DimensionRegion*>(pEngine->pDimRegionPool[0]);
943                }
944            }
945            {
946                instrument_change_command_t& cmd = InstrumentChangeCommand.SwitchConfig();
947                if(cmd.pDimRegionsInUse != NULL) {
948                    delete cmd.pDimRegionsInUse;
949                    cmd.pDimRegionsInUse = new RTList< ::gig::DimensionRegion*>(pEngine->pDimRegionPool[1]);
950                }
951            }
952        }
953    
954  }} // namespace LinuxSampler::gig  }} // namespace LinuxSampler::gig

Legend:
Removed from v.1039  
changed lines
  Added in v.1844

  ViewVC Help
Powered by ViewVC