/[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 1847 by iliev, Fri Feb 27 17:12:40 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            if (pInstrument != NULL) {
325                pInstrument = NULL;
326                InstrumentStat = -1;
327                InstrumentIdx  = -1;
328                InstrumentIdxName = "";
329                InstrumentFile = "";
330                bStatusChanged = true;
331            }
332    
333          for (uint i = 0; i < 128; i++) {          for (uint i = 0; i < 128; i++) {
334              pMIDIKeyInfo[i].pActiveVoices = new RTList<Voice>(pEngine->pVoicePool);              pMIDIKeyInfo[i].pActiveVoices = new RTList<Voice>(pEngine->pVoicePool);
335              pMIDIKeyInfo[i].pEvents       = new RTList<Event>(pEngine->pEventPool);              pMIDIKeyInfo[i].pEvents       = new RTList<Event>(pEngine->pEventPool);
# Line 287  namespace LinuxSampler { namespace gig { Line 352  namespace LinuxSampler { namespace gig {
352    
353      void EngineChannel::DisconnectAudioOutputDevice() {      void EngineChannel::DisconnectAudioOutputDevice() {
354          if (pEngine) { // if clause to prevent disconnect loops          if (pEngine) { // if clause to prevent disconnect loops
355    
356              ResetInternal();              ResetInternal();
357    
358                // delete the structures used for instrument change
359                RTList< ::gig::DimensionRegion*>* d = InstrumentChangeCommand.GetConfigForUpdate().pDimRegionsInUse;
360                if (d) delete d;
361                EngineChannel::instrument_change_command_t& cmd = InstrumentChangeCommand.SwitchConfig();
362                d = cmd.pDimRegionsInUse;
363                if (d) delete d;
364    
365                if (cmd.pInstrument) {
366                    // release the currently loaded instrument
367                    Engine::instruments.HandBack(cmd.pInstrument, this);
368                }
369    
370              if (pEvents) {              if (pEvents) {
371                  delete pEvents;                  delete pEvents;
372                  pEvents = NULL;                  pEvents = NULL;
# Line 302  namespace LinuxSampler { namespace gig { Line 381  namespace LinuxSampler { namespace gig {
381                      pMIDIKeyInfo[i].pEvents = NULL;                      pMIDIKeyInfo[i].pEvents = NULL;
382                  }                  }
383              }              }
             Engine* oldEngine = pEngine;  
384              AudioOutputDevice* oldAudioDevice = pEngine->pAudioOutputDevice;              AudioOutputDevice* oldAudioDevice = pEngine->pAudioOutputDevice;
385              pEngine = NULL;              pEngine = NULL;
386              Engine::FreeEngine(this, oldAudioDevice);              Engine::FreeEngine(this, oldAudioDevice);
# Line 338  namespace LinuxSampler { namespace gig { Line 416  namespace LinuxSampler { namespace gig {
416              default:              default:
417                  throw AudioOutputException("Invalid engine audio channel " + ToString(EngineAudioChannel));                  throw AudioOutputException("Invalid engine audio channel " + ToString(EngineAudioChannel));
418          }          }
419    
420            bStatusChanged = true;
421      }      }
422    
423      int EngineChannel::OutputChannel(uint EngineAudioChannel) {      int EngineChannel::OutputChannel(uint EngineAudioChannel) {
# Line 390  namespace LinuxSampler { namespace gig { Line 470  namespace LinuxSampler { namespace gig {
470          }          }
471          fxSends.push_back(pFxSend);          fxSends.push_back(pFxSend);
472          if (pEngine) pEngine->Enable();          if (pEngine) pEngine->Enable();
473            fireFxSendCountChanged(GetSamplerChannel()->Index(), GetFxSendCount());
474    
475          return pFxSend;          return pFxSend;
476      }      }
477    
# Line 427  namespace LinuxSampler { namespace gig { Line 509  namespace LinuxSampler { namespace gig {
509              }              }
510          }          }
511          if (pEngine) pEngine->Enable();          if (pEngine) pEngine->Enable();
512            fireFxSendCountChanged(GetSamplerChannel()->Index(), GetFxSendCount());
513      }      }
514    
515      /**      /**
# Line 447  namespace LinuxSampler { namespace gig { Line 530  namespace LinuxSampler { namespace gig {
530              event.pEngineChannel      = this;              event.pEngineChannel      = this;
531              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
532              else dmsg(1,("EngineChannel: Input event queue full!"));              else dmsg(1,("EngineChannel: Input event queue full!"));
533                // inform connected virtual MIDI devices if any ...
534                // (e.g. virtual MIDI keyboard in instrument editor(s))
535                ArrayList<VirtualMidiDevice*>& devices =
536                    const_cast<ArrayList<VirtualMidiDevice*>&>(
537                        virtualMidiDevicesReader_MidiThread.Lock()
538                    );
539                for (int i = 0; i < devices.size(); i++) {
540                    devices[i]->SendNoteOnToDevice(Key, Velocity);
541                }
542                virtualMidiDevicesReader_MidiThread.Unlock();
543          }          }
544      }      }
545    
# Line 473  namespace LinuxSampler { namespace gig { Line 566  namespace LinuxSampler { namespace gig {
566              event.pEngineChannel      = this;              event.pEngineChannel      = this;
567              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
568              else dmsg(1,("EngineChannel: Input event queue full!"));              else dmsg(1,("EngineChannel: Input event queue full!"));
569                // inform connected virtual MIDI devices if any ...
570                // (e.g. virtual MIDI keyboard in instrument editor(s))
571                ArrayList<VirtualMidiDevice*>& devices =
572                    const_cast<ArrayList<VirtualMidiDevice*>&>(
573                        virtualMidiDevicesReader_MidiThread.Lock()
574                    );
575                for (int i = 0; i < devices.size(); i++) {
576                    devices[i]->SendNoteOnToDevice(Key, Velocity);
577                }
578                virtualMidiDevicesReader_MidiThread.Unlock();
579          }          }
580      }      }
581    
# Line 494  namespace LinuxSampler { namespace gig { Line 597  namespace LinuxSampler { namespace gig {
597              event.pEngineChannel      = this;              event.pEngineChannel      = this;
598              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
599              else dmsg(1,("EngineChannel: Input event queue full!"));              else dmsg(1,("EngineChannel: Input event queue full!"));
600                // inform connected virtual MIDI devices if any ...
601                // (e.g. virtual MIDI keyboard in instrument editor(s))
602                ArrayList<VirtualMidiDevice*>& devices =
603                    const_cast<ArrayList<VirtualMidiDevice*>&>(
604                        virtualMidiDevicesReader_MidiThread.Lock()
605                    );
606                for (int i = 0; i < devices.size(); i++) {
607                    devices[i]->SendNoteOffToDevice(Key, Velocity);
608                }
609                virtualMidiDevicesReader_MidiThread.Unlock();
610          }          }
611      }      }
612    
# Line 520  namespace LinuxSampler { namespace gig { Line 633  namespace LinuxSampler { namespace gig {
633              event.pEngineChannel      = this;              event.pEngineChannel      = this;
634              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);              if (this->pEventQueue->write_space() > 0) this->pEventQueue->push(&event);
635              else dmsg(1,("EngineChannel: Input event queue full!"));              else dmsg(1,("EngineChannel: Input event queue full!"));
636                // inform connected virtual MIDI devices if any ...
637                // (e.g. virtual MIDI keyboard in instrument editor(s))
638                ArrayList<VirtualMidiDevice*>& devices =
639                    const_cast<ArrayList<VirtualMidiDevice*>&>(
640                        virtualMidiDevicesReader_MidiThread.Lock()
641                    );
642                for (int i = 0; i < devices.size(); i++) {
643                    devices[i]->SendNoteOffToDevice(Key, Velocity);
644                }
645                virtualMidiDevicesReader_MidiThread.Unlock();
646          }          }
647      }      }
648    
# Line 633  namespace LinuxSampler { namespace gig { Line 756  namespace LinuxSampler { namespace gig {
756          MidiVolume     = 1.0;          MidiVolume     = 1.0;
757          GlobalPanLeft  = 1.0f;          GlobalPanLeft  = 1.0f;
758          GlobalPanRight = 1.0f;          GlobalPanRight = 1.0f;
759            iLastPanRequest = 64;
760            GlobalTranspose = 0;
761          // set all MIDI controller values to zero          // set all MIDI controller values to zero
762          memset(ControllerTable, 0x00, 129);          memset(ControllerTable, 0x00, 129);
763            // reset all FX Send levels
764            for (
765                std::vector<FxSend*>::iterator iter = fxSends.begin();
766                iter != fxSends.end(); iter++
767            ) {
768                (*iter)->Reset();
769            }
770      }      }
771    
772      /**      /**
# Line 651  namespace LinuxSampler { namespace gig { Line 783  namespace LinuxSampler { namespace gig {
783       *                  current audio cycle       *                  current audio cycle
784       */       */
785      void EngineChannel::ImportEvents(uint Samples) {      void EngineChannel::ImportEvents(uint Samples) {
786            // import events from pure software MIDI "devices"
787            // (e.g. virtual keyboard in instrument editor)
788            {
789                const int FragmentPos = 0; // randomly chosen, we don't care about jitter for virtual MIDI devices
790                Event event = pEngine->pEventGenerator->CreateEvent(FragmentPos);
791                VirtualMidiDevice::event_t devEvent; // the event format we get from the virtual MIDI device
792                // as we're going to (carefully) write some status to the
793                // synchronized struct, we cast away the const
794                ArrayList<VirtualMidiDevice*>& devices =
795                    const_cast<ArrayList<VirtualMidiDevice*>&>(virtualMidiDevicesReader_AudioThread.Lock());
796                // iterate through all virtual MIDI devices
797                for (int i = 0; i < devices.size(); i++) {
798                    VirtualMidiDevice* pDev = devices[i];
799                    // I think we can simply flush the whole FIFO(s), the user shouldn't be so fast ;-)
800                    while (pDev->GetMidiEventFromDevice(devEvent)) {
801                        event.Type =
802                            (devEvent.Type == VirtualMidiDevice::EVENT_TYPE_NOTEON) ?
803                                Event::type_note_on : Event::type_note_off;
804                        event.Param.Note.Key      = devEvent.Key;
805                        event.Param.Note.Velocity = devEvent.Velocity;
806                        event.pEngineChannel      = this;
807                        // copy event to internal event list
808                        if (pEvents->poolIsEmpty()) {
809                            dmsg(1,("Event pool emtpy!\n"));
810                            goto exitVirtualDevicesLoop;
811                        }
812                        *pEvents->allocAppend() = event;
813                    }
814                }
815            }
816            exitVirtualDevicesLoop:
817            virtualMidiDevicesReader_AudioThread.Unlock();
818    
819            // import events from the regular MIDI devices
820          RingBuffer<Event,false>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();          RingBuffer<Event,false>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();
821          Event* pEvent;          Event* pEvent;
822          while (true) {          while (true) {
# Line 688  namespace LinuxSampler { namespace gig { Line 854  namespace LinuxSampler { namespace gig {
854                  if (pEngine && pEngine->pAudioOutputDevice) {                  if (pEngine && pEngine->pAudioOutputDevice) {
855                      // fallback to render directly to the AudioOutputDevice's buffer                      // fallback to render directly to the AudioOutputDevice's buffer
856                      pChannelRight = pEngine->pAudioOutputDevice->Channel(AudioDeviceChannelRight);                      pChannelRight = pEngine->pAudioOutputDevice->Channel(AudioDeviceChannelRight);
857                  } else pChannelRight = NULL;                  } else pChannelRight = NULL;
858              }              }
859          }          }
860          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 862  namespace LinuxSampler { namespace gig {
862          if (pEngine) pEngine->Enable();          if (pEngine) pEngine->Enable();
863      }      }
864    
865        void EngineChannel::Connect(VirtualMidiDevice* pDevice) {
866            // double buffer ... double work ...
867            {
868                ArrayList<VirtualMidiDevice*>& devices = virtualMidiDevices.GetConfigForUpdate();
869                devices.add(pDevice);
870            }
871            {
872                ArrayList<VirtualMidiDevice*>& devices = virtualMidiDevices.SwitchConfig();
873                devices.add(pDevice);
874            }
875        }
876    
877        void EngineChannel::Disconnect(VirtualMidiDevice* pDevice) {
878            // double buffer ... double work ...
879            {
880                ArrayList<VirtualMidiDevice*>& devices = virtualMidiDevices.GetConfigForUpdate();
881                devices.remove(pDevice);
882            }
883            {
884                ArrayList<VirtualMidiDevice*>& devices = virtualMidiDevices.SwitchConfig();
885                devices.remove(pDevice);
886            }
887        }
888    
889      float EngineChannel::Volume() {      float EngineChannel::Volume() {
890          return GlobalVolume;          return GlobalVolume;
891      }      }
# Line 705  namespace LinuxSampler { namespace gig { Line 895  namespace LinuxSampler { namespace gig {
895          bStatusChanged = true; // status of engine channel has changed, so set notify flag          bStatusChanged = true; // status of engine channel has changed, so set notify flag
896      }      }
897    
898        float EngineChannel::Pan() {
899            return float(iLastPanRequest - 64) / 64.0f;
900        }
901    
902        void EngineChannel::Pan(float f) {
903            int iMidiPan = int(f * 64.0f) + 64;
904            if (iMidiPan > 127) iMidiPan = 127;
905            else if (iMidiPan < 0) iMidiPan = 0;
906            GlobalPanLeft  = Engine::PanCurve[128 - iMidiPan];
907            GlobalPanRight = Engine::PanCurve[iMidiPan];
908            iLastPanRequest = iMidiPan;
909        }
910    
911      uint EngineChannel::Channels() {      uint EngineChannel::Channels() {
912          return 2;          return 2;
913      }      }
# Line 729  namespace LinuxSampler { namespace gig { Line 932  namespace LinuxSampler { namespace gig {
932          return LS_GIG_ENGINE_NAME;          return LS_GIG_ENGINE_NAME;
933      }      }
934    
935        void EngineChannel::ClearDimRegionsInUse() {
936            {
937                instrument_change_command_t& cmd = InstrumentChangeCommand.GetConfigForUpdate();
938                if(cmd.pDimRegionsInUse != NULL) cmd.pDimRegionsInUse->clear();
939            }
940            {
941                instrument_change_command_t& cmd = InstrumentChangeCommand.SwitchConfig();
942                if(cmd.pDimRegionsInUse != NULL) cmd.pDimRegionsInUse->clear();
943            }
944        }
945    
946        void EngineChannel::ResetDimRegionsInUse() {
947            {
948                instrument_change_command_t& cmd = InstrumentChangeCommand.GetConfigForUpdate();
949                if(cmd.pDimRegionsInUse != NULL) {
950                    delete cmd.pDimRegionsInUse;
951                    cmd.pDimRegionsInUse = new RTList< ::gig::DimensionRegion*>(pEngine->pDimRegionPool[0]);
952                }
953            }
954            {
955                instrument_change_command_t& cmd = InstrumentChangeCommand.SwitchConfig();
956                if(cmd.pDimRegionsInUse != NULL) {
957                    delete cmd.pDimRegionsInUse;
958                    cmd.pDimRegionsInUse = new RTList< ::gig::DimensionRegion*>(pEngine->pDimRegionPool[1]);
959                }
960            }
961        }
962    
963  }} // namespace LinuxSampler::gig  }} // namespace LinuxSampler::gig
Legend:
Removed from v.1039  
changed lines
  Added in v.1847
  ViewVC Help
Powered by ViewVC