/[svn]/linuxsampler/trunk/src/Sampler.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/Sampler.cpp

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

revision 778 by iliev, Fri Sep 23 06:58:26 2005 UTC revision 1212 by schoenebeck, Tue May 29 23:59:36 2007 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 - 2007 Christian Schoenebeck                       *
7   *                                                                         *   *                                                                         *
8   *   This program is free software; you can redistribute it and/or modify  *   *   This library 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  *
10   *   the Free Software Foundation; either version 2 of the License, or     *   *   the Free Software Foundation; either version 2 of the License, or     *
11   *   (at your option) any later version.                                   *   *   (at your option) any later version.                                   *
12   *                                                                         *   *                                                                         *
13   *   This program is distributed in the hope that it will be useful,       *   *   This library is distributed in the hope that it will be useful,       *
14   *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *   *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
15   *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *   *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
16   *   GNU General Public License for more details.                          *   *   GNU General Public License for more details.                          *
17   *                                                                         *   *                                                                         *
18   *   You should have received a copy of the GNU General Public License     *   *   You should have received a copy of the GNU General Public License     *
19   *   along with this program; if not, write to the Free Software           *   *   along with this library; if not, write to the Free Software           *
20   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston,                 *   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston,                 *
21   *   MA  02111-1307  USA                                                   *   *   MA  02111-1307  USA                                                   *
22   ***************************************************************************/   ***************************************************************************/
# Line 27  Line 27 
27    
28  #include "engines/EngineFactory.h"  #include "engines/EngineFactory.h"
29  #include "engines/EngineChannelFactory.h"  #include "engines/EngineChannelFactory.h"
30    #include "engines/InstrumentEditorFactory.h"
31  #include "drivers/audio/AudioOutputDeviceFactory.h"  #include "drivers/audio/AudioOutputDeviceFactory.h"
32  #include "drivers/midi/MidiInputDeviceFactory.h"  #include "drivers/midi/MidiInputDeviceFactory.h"
33  #include "network/lscpserver.h"  #include "drivers/midi/MidiInstrumentMapper.h"
34    
35  namespace LinuxSampler {  namespace LinuxSampler {
36    
# Line 48  namespace LinuxSampler { Line 49  namespace LinuxSampler {
49    
50      SamplerChannel::~SamplerChannel() {      SamplerChannel::~SamplerChannel() {
51          if (pEngineChannel) {          if (pEngineChannel) {
52                Engine* engine = pEngineChannel->GetEngine();
53                if (pAudioOutputDevice) pAudioOutputDevice->Disconnect(engine);
54    
55              MidiInputPort* pMidiInputPort = (pEngineChannel) ? pEngineChannel->GetMidiInputPort() : __GetMidiInputDevicePort(GetMidiInputChannel());              MidiInputPort* pMidiInputPort = (pEngineChannel) ? pEngineChannel->GetMidiInputPort() : __GetMidiInputDevicePort(GetMidiInputChannel());
56              if (pMidiInputPort) pMidiInputPort->Disconnect(pEngineChannel);              if (pMidiInputPort) pMidiInputPort->Disconnect(pEngineChannel);
57              if (pEngineChannel) {              if (pEngineChannel) {
58                  if (pAudioOutputDevice) pEngineChannel->DisconnectAudioOutputDevice();                  if (pAudioOutputDevice) pEngineChannel->DisconnectAudioOutputDevice();
59                  EngineChannelFactory::Destroy(pEngineChannel);                  EngineChannelFactory::Destroy(pEngineChannel);
60    
61                    // reconnect engine if it still exists
62                    const std::set<Engine*>& engines = EngineFactory::EngineInstances();
63                    if (engines.find(engine) != engines.end()) pAudioOutputDevice->Connect(engine);
64              }              }
65          }          }
66      }      }
67    
68      void SamplerChannel::SetEngineType(String EngineType) throw (LinuxSamplerException) {      void SamplerChannel::SetEngineType(String EngineType) throw (Exception) {
69          dmsg(2,("SamplerChannel: Assigning engine type..."));          dmsg(2,("SamplerChannel: Assigning engine type..."));
70    
71          // create new engine channel          // create new engine channel
72          EngineChannel* pNewEngineChannel = EngineChannelFactory::Create(EngineType);          EngineChannel* pNewEngineChannel = EngineChannelFactory::Create(EngineType);
73          if (!pNewEngineChannel) throw LinuxSamplerException("Unknown engine type");          if (!pNewEngineChannel) throw Exception("Unknown engine type");
74    
75          //FIXME: hack to allow fast retrieval of engine channel's sampler channel index          //FIXME: hack to allow fast retrieval of engine channel's sampler channel index
76          pNewEngineChannel->iSamplerChannelIndex = Index();          pNewEngineChannel->iSamplerChannelIndex = Index();
# Line 71  namespace LinuxSampler { Line 79  namespace LinuxSampler {
79          MidiInputPort* pMidiInputPort = __GetMidiInputDevicePort(GetMidiInputPort());          MidiInputPort* pMidiInputPort = __GetMidiInputDevicePort(GetMidiInputPort());
80          // disconnect old engine channel          // disconnect old engine channel
81          if (pEngineChannel) {          if (pEngineChannel) {
82                Engine* engine = pEngineChannel->GetEngine();
83                if (pAudioOutputDevice) pAudioOutputDevice->Disconnect(engine);
84    
85              if (pMidiInputPort) pMidiInputPort->Disconnect(pEngineChannel);              if (pMidiInputPort) pMidiInputPort->Disconnect(pEngineChannel);
86              if (pAudioOutputDevice) pEngineChannel->DisconnectAudioOutputDevice();              if (pAudioOutputDevice) pEngineChannel->DisconnectAudioOutputDevice();
87              EngineChannelFactory::Destroy(pEngineChannel);              EngineChannelFactory::Destroy(pEngineChannel);
88    
89                // reconnect engine if it still exists
90                const std::set<Engine*>& engines = EngineFactory::EngineInstances();
91                if (engines.find(engine) != engines.end()) pAudioOutputDevice->Connect(engine);
92          }          }
93    
94          // connect new engine channel          // connect new engine channel
         if (pMidiInputPort) pMidiInputPort->Connect(pNewEngineChannel, GetMidiInputChannel());  
95          if (pAudioOutputDevice) {          if (pAudioOutputDevice) {
96              pNewEngineChannel->Connect(pAudioOutputDevice);              pNewEngineChannel->Connect(pAudioOutputDevice);
97              pAudioOutputDevice->Connect(pNewEngineChannel->GetEngine());              pAudioOutputDevice->Connect(pNewEngineChannel->GetEngine());
98          }          }
99            if (pMidiInputPort) pMidiInputPort->Connect(pNewEngineChannel, GetMidiInputChannel());
100          pEngineChannel = pNewEngineChannel;          pEngineChannel = pNewEngineChannel;
101    
102          // from now on get MIDI device and port from EngineChannel object          // from now on get MIDI device and port from EngineChannel object
# Line 89  namespace LinuxSampler { Line 104  namespace LinuxSampler {
104          this->iMidiPort        = 0;          this->iMidiPort        = 0;
105    
106          pEngineChannel->StatusChanged(true);          pEngineChannel->StatusChanged(true);
107            fireEngineChanged();
108          dmsg(2,("OK\n"));          dmsg(2,("OK\n"));
109      }      }
110    
111      void SamplerChannel::SetAudioOutputDevice(AudioOutputDevice* pDevice) {      void SamplerChannel::SetAudioOutputDevice(AudioOutputDevice* pDevice) {
112            if(pAudioOutputDevice == pDevice) return;
113    
114          // disconnect old device          // disconnect old device
115          if (pAudioOutputDevice && pEngineChannel) pEngineChannel->DisconnectAudioOutputDevice();          if (pAudioOutputDevice && pEngineChannel) {
116                Engine* engine = pEngineChannel->GetEngine();
117                pAudioOutputDevice->Disconnect(engine);
118    
119                pEngineChannel->DisconnectAudioOutputDevice();
120    
121                // reconnect engine if it still exists
122                const std::set<Engine*>& engines = EngineFactory::EngineInstances();
123                if (engines.find(engine) != engines.end()) pAudioOutputDevice->Connect(engine);
124            }
125    
126          // connect new device          // connect new device
127          pAudioOutputDevice = pDevice;          pAudioOutputDevice = pDevice;
128          if (pEngineChannel) {          if (pEngineChannel) {
# Line 117  namespace LinuxSampler { Line 144  namespace LinuxSampler {
144      }      }
145    
146      void SamplerChannel::SetMidiInput(MidiInputDevice* pDevice, int iMidiPort, midi_chan_t MidiChannel) {      void SamplerChannel::SetMidiInput(MidiInputDevice* pDevice, int iMidiPort, midi_chan_t MidiChannel) {
147          if (!pDevice) throw LinuxSamplerException("No MIDI input device assigned.");          if (!pDevice) throw Exception("No MIDI input device assigned.");
148    
149          // get old and new midi input port          // get old and new midi input port
150          MidiInputPort* pOldMidiInputPort = __GetMidiInputDevicePort(GetMidiInputPort());          MidiInputPort* pOldMidiInputPort = __GetMidiInputDevicePort(GetMidiInputPort());
# Line 136  namespace LinuxSampler { Line 163  namespace LinuxSampler {
163          if (pNewMidiInputPort && pEngineChannel) pNewMidiInputPort->Connect(pEngineChannel, MidiChannel);          if (pNewMidiInputPort && pEngineChannel) pNewMidiInputPort->Connect(pEngineChannel, MidiChannel);
164          // Ooops.          // Ooops.
165          if (pNewMidiInputPort == NULL)          if (pNewMidiInputPort == NULL)
166              throw LinuxSamplerException("There is no MIDI input port with index " + ToString(iMidiPort) + ".");              throw Exception("There is no MIDI input port with index " + ToString(iMidiPort) + ".");
167      }      }
168    
169      EngineChannel* SamplerChannel::GetEngineChannel() {      EngineChannel* SamplerChannel::GetEngineChannel() {
# Line 175  namespace LinuxSampler { Line 202  namespace LinuxSampler {
202              }              }
203          }          }
204    
205          throw LinuxSamplerException("Internal error: SamplerChannel index not found");          throw Exception("Internal error: SamplerChannel index not found");
206        }
207    
208        void SamplerChannel::AddEngineChangeListener(EngineChangeListener* l) {
209            llEngineChangeListeners.AddListener(l);
210        }
211    
212        void SamplerChannel::RemoveEngineChangeListener(EngineChangeListener* l) {
213           llEngineChangeListeners.RemoveListener(l);
214        }
215    
216        void SamplerChannel::RemoveAllEngineChangeListeners() {
217           llEngineChangeListeners.RemoveAllListeners();
218        }
219    
220        void SamplerChannel::fireEngineChanged() {
221            for (int i = 0; i < llEngineChangeListeners.GetListenerCount(); i++) {
222                llEngineChangeListeners.GetListener(i)->EngineChanged(Index());
223            }
224      }      }
225    
226      MidiInputPort* SamplerChannel::__GetMidiInputDevicePort(int iMidiPort) {      MidiInputPort* SamplerChannel::__GetMidiInputDevicePort(int iMidiPort) {
# Line 192  namespace LinuxSampler { Line 237  namespace LinuxSampler {
237      // * Sampler      // * Sampler
238    
239      Sampler::Sampler() {      Sampler::Sampler() {
240            eventHandler.SetSampler(this);
241      }      }
242    
243      Sampler::~Sampler() {      Sampler::~Sampler() {
# Line 202  namespace LinuxSampler { Line 248  namespace LinuxSampler {
248          return mSamplerChannels.size();          return mSamplerChannels.size();
249      }      }
250    
251        void Sampler::AddChannelCountListener(ChannelCountListener* l) {
252            llChannelCountListeners.AddListener(l);
253        }
254    
255        void Sampler::RemoveChannelCountListener(ChannelCountListener* l) {
256           llChannelCountListeners.RemoveListener(l);
257        }
258    
259        void Sampler::fireChannelCountChanged(int NewCount) {
260            for (int i = 0; i < llChannelCountListeners.GetListenerCount(); i++) {
261                llChannelCountListeners.GetListener(i)->ChannelCountChanged(NewCount);
262            }
263        }
264    
265        void Sampler::AddAudioDeviceCountListener(AudioDeviceCountListener* l) {
266            llAudioDeviceCountListeners.AddListener(l);
267        }
268    
269        void Sampler::RemoveAudioDeviceCountListener(AudioDeviceCountListener* l) {
270            llAudioDeviceCountListeners.RemoveListener(l);
271        }
272    
273        void Sampler::fireAudioDeviceCountChanged(int NewCount) {
274            for (int i = 0; i < llAudioDeviceCountListeners.GetListenerCount(); i++) {
275                llAudioDeviceCountListeners.GetListener(i)->AudioDeviceCountChanged(NewCount);
276            }
277        }
278    
279        void Sampler::AddMidiDeviceCountListener(MidiDeviceCountListener* l) {
280            llMidiDeviceCountListeners.AddListener(l);
281        }
282    
283        void Sampler::RemoveMidiDeviceCountListener(MidiDeviceCountListener* l) {
284            llMidiDeviceCountListeners.RemoveListener(l);
285        }
286    
287        void Sampler::fireMidiDeviceCountChanged(int NewCount) {
288            for (int i = 0; i < llMidiDeviceCountListeners.GetListenerCount(); i++) {
289                llMidiDeviceCountListeners.GetListener(i)->MidiDeviceCountChanged(NewCount);
290            }
291        }
292    
293        void Sampler::AddVoiceCountListener(VoiceCountListener* l) {
294            llVoiceCountListeners.AddListener(l);
295        }
296    
297        void Sampler::RemoveVoiceCountListener(VoiceCountListener* l) {
298            llVoiceCountListeners.RemoveListener(l);
299        }
300    
301        void Sampler::fireVoiceCountChanged(int ChannelId, int NewCount) {
302            for (int i = 0; i < llVoiceCountListeners.GetListenerCount(); i++) {
303                llVoiceCountListeners.GetListener(i)->VoiceCountChanged(ChannelId, NewCount);
304            }
305        }
306    
307        void Sampler::AddStreamCountListener(StreamCountListener* l) {
308            llStreamCountListeners.AddListener(l);
309        }
310    
311        void Sampler::RemoveStreamCountListener(StreamCountListener* l) {
312            llStreamCountListeners.RemoveListener(l);
313        }
314    
315        void Sampler::fireStreamCountChanged(int ChannelId, int NewCount) {
316            for (int i = 0; i < llStreamCountListeners.GetListenerCount(); i++) {
317                llStreamCountListeners.GetListener(i)->StreamCountChanged(ChannelId, NewCount);
318            }
319        }
320    
321        void Sampler::AddBufferFillListener(BufferFillListener* l) {
322            llBufferFillListeners.AddListener(l);
323        }
324    
325        void Sampler::RemoveBufferFillListener(BufferFillListener* l) {
326            llBufferFillListeners.RemoveListener(l);
327        }
328    
329        void Sampler::fireBufferFillChanged(int ChannelId, String FillData) {
330            for (int i = 0; i < llBufferFillListeners.GetListenerCount(); i++) {
331                llBufferFillListeners.GetListener(i)->BufferFillChanged(ChannelId, FillData);
332            }
333        }
334    
335        void Sampler::AddTotalVoiceCountListener(TotalVoiceCountListener* l) {
336            llTotalVoiceCountListeners.AddListener(l);
337        }
338    
339        void Sampler::RemoveTotalVoiceCountListener(TotalVoiceCountListener* l) {
340            llTotalVoiceCountListeners.RemoveListener(l);
341        }
342    
343        void Sampler::fireTotalVoiceCountChanged(int NewCount) {
344            for (int i = 0; i < llTotalVoiceCountListeners.GetListenerCount(); i++) {
345                llTotalVoiceCountListeners.GetListener(i)->TotalVoiceCountChanged(NewCount);
346            }
347        }
348    
349        void Sampler::AddFxSendCountListener(FxSendCountListener* l) {
350            llFxSendCountListeners.AddListener(l);
351        }
352    
353        void Sampler::RemoveFxSendCountListener(FxSendCountListener* l) {
354            llFxSendCountListeners.RemoveListener(l);
355        }
356    
357        void Sampler::fireFxSendCountChanged(int ChannelId, int NewCount) {
358            for (int i = 0; i < llFxSendCountListeners.GetListenerCount(); i++) {
359                llFxSendCountListeners.GetListener(i)->FxSendCountChanged(ChannelId, NewCount);
360            }
361        }
362    
363        void Sampler::EventHandler::EngineChanged(int ChannelId) {
364            EngineChannel* engineChannel = pSampler->GetSamplerChannel(ChannelId)->GetEngineChannel();
365            if(engineChannel == NULL) return;
366            engineChannel->AddFxSendCountListener(this);
367        }
368    
369        void Sampler::EventHandler::FxSendCountChanged(int ChannelId, int NewCount) {
370            pSampler->fireFxSendCountChanged(ChannelId, NewCount);
371        }
372    
373    
374      SamplerChannel* Sampler::AddSamplerChannel() {      SamplerChannel* Sampler::AddSamplerChannel() {
375          // if there's no sampler channel yet          // if there's no sampler channel yet
376          if (!mSamplerChannels.size()) {          if (!mSamplerChannels.size()) {
377              SamplerChannel* pChannel = new SamplerChannel(this);              SamplerChannel* pChannel = new SamplerChannel(this);
378              mSamplerChannels[0] = pChannel;              mSamplerChannels[0] = pChannel;
379              LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, 1));              fireChannelCountChanged(1);
380                pChannel->AddEngineChangeListener(&eventHandler);
381              return pChannel;              return pChannel;
382          }          }
383    
# Line 222  namespace LinuxSampler { Line 392  namespace LinuxSampler {
392                  // we found an unused index, so insert the new channel there                  // we found an unused index, so insert the new channel there
393                  SamplerChannel* pChannel = new SamplerChannel(this);                  SamplerChannel* pChannel = new SamplerChannel(this);
394                  mSamplerChannels[i] = pChannel;                  mSamplerChannels[i] = pChannel;
395                  LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, i));                  fireChannelCountChanged(SamplerChannels());
396                    pChannel->AddEngineChangeListener(&eventHandler);
397                  return pChannel;                  return pChannel;
398              }              }
399              throw LinuxSamplerException("Internal error: could not find unoccupied sampler channel index.");              throw Exception("Internal error: could not find unoccupied sampler channel index.");
400          }          }
401    
402          // we have not reached the index limit so we just add the channel past the highest index          // we have not reached the index limit so we just add the channel past the highest index
403          SamplerChannel* pChannel = new SamplerChannel(this);          SamplerChannel* pChannel = new SamplerChannel(this);
404          mSamplerChannels[lastIndex + 1] = pChannel;          mSamplerChannels[lastIndex + 1] = pChannel;
405          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, lastIndex + 1));          fireChannelCountChanged(SamplerChannels());
406            pChannel->AddEngineChangeListener(&eventHandler);
407          return pChannel;          return pChannel;
408      }      }
409    
# Line 247  namespace LinuxSampler { Line 419  namespace LinuxSampler {
419          SamplerChannelMap::iterator iterChan = mSamplerChannels.begin();          SamplerChannelMap::iterator iterChan = mSamplerChannels.begin();
420          for (; iterChan != mSamplerChannels.end(); iterChan++) {          for (; iterChan != mSamplerChannels.end(); iterChan++) {
421              if (iterChan->second == pSamplerChannel) {              if (iterChan->second == pSamplerChannel) {
422                    pSamplerChannel->RemoveAllEngineChangeListeners();
423                  mSamplerChannels.erase(iterChan);                  mSamplerChannels.erase(iterChan);
424                  delete pSamplerChannel;                  delete pSamplerChannel;
425                  LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, mSamplerChannels.size()));                  fireChannelCountChanged(SamplerChannels());
426                  return;                  return;
427              }              }
428          }          }
# Line 265  namespace LinuxSampler { Line 438  namespace LinuxSampler {
438          return AudioOutputDeviceFactory::AvailableDrivers();          return AudioOutputDeviceFactory::AvailableDrivers();
439      }      }
440    
441      AudioOutputDevice* Sampler::CreateAudioOutputDevice(String AudioDriver, std::map<String,String> Parameters) throw (LinuxSamplerException) {      std::vector<String> Sampler::AvailableMidiInputDrivers() {
442            return MidiInputDeviceFactory::AvailableDrivers();
443        }
444    
445        std::vector<String> Sampler::AvailableEngineTypes() {
446            return EngineFactory::AvailableEngineTypes();
447        }
448    
449        AudioOutputDevice* Sampler::CreateAudioOutputDevice(String AudioDriver, std::map<String,String> Parameters) throw (Exception) {
450          // create new device          // create new device
451          AudioOutputDevice* pDevice = AudioOutputDeviceFactory::Create(AudioDriver, Parameters);          AudioOutputDevice* pDevice = AudioOutputDeviceFactory::Create(AudioDriver, Parameters);
452    
# Line 277  namespace LinuxSampler { Line 458  namespace LinuxSampler {
458              }              }
459          }          }
460    
461            fireAudioDeviceCountChanged(AudioOutputDevices());
462          return pDevice;          return pDevice;
463      }      }
464    
# Line 296  namespace LinuxSampler { Line 478  namespace LinuxSampler {
478          return mMidiInputDevices;          return mMidiInputDevices;
479      }      }
480    
481      void Sampler::DestroyAudioOutputDevice(AudioOutputDevice* pDevice) throw (LinuxSamplerException) {      void Sampler::DestroyAudioOutputDevice(AudioOutputDevice* pDevice) throw (Exception) {
482          AudioOutputDeviceMap::iterator iter = mAudioOutputDevices.begin();          AudioOutputDeviceMap::iterator iter = mAudioOutputDevices.begin();
483          for (; iter != mAudioOutputDevices.end(); iter++) {          for (; iter != mAudioOutputDevices.end(); iter++) {
484              if (iter->second == pDevice) {              if (iter->second == pDevice) {
485                  // check if there are still sampler engines connected to this device                  // check if there are still sampler engines connected to this device
486                  for (uint i = 0; i < SamplerChannels(); i++)                  for (uint i = 0; i < SamplerChannels(); i++)
487                      if (GetSamplerChannel(i)->GetAudioOutputDevice() == pDevice) throw LinuxSamplerException("Sampler channel " + ToString(i) + " is still connected to the audio output device.");                      if (GetSamplerChannel(i)->GetAudioOutputDevice() == pDevice) throw Exception("Sampler channel " + ToString(i) + " is still connected to the audio output device.");
488    
489                  // disable device                  // disable device
490                  pDevice->Stop();                  pDevice->Stop();
# Line 312  namespace LinuxSampler { Line 494  namespace LinuxSampler {
494    
495                  // destroy and free device from memory                  // destroy and free device from memory
496                  delete pDevice;                  delete pDevice;
497    
498                    fireAudioDeviceCountChanged(AudioOutputDevices());
499                    break;
500              }              }
501          }          }
502      }      }
503    
504      void Sampler::DestroyMidiInputDevice(MidiInputDevice* pDevice) throw (LinuxSamplerException) {      void Sampler::DestroyMidiInputDevice(MidiInputDevice* pDevice) throw (Exception) {
505          MidiInputDeviceMap::iterator iter = mMidiInputDevices.begin();          MidiInputDeviceMap::iterator iter = mMidiInputDevices.begin();
506          for (; iter != mMidiInputDevices.end(); iter++) {          for (; iter != mMidiInputDevices.end(); iter++) {
507              if (iter->second == pDevice) {              if (iter->second == pDevice) {
508                  // check if there are still sampler engines connected to this device                  // check if there are still sampler engines connected to this device
509                  for (uint i = 0; i < SamplerChannels(); i++)                  for (uint i = 0; i < SamplerChannels(); i++)
510                      if (GetSamplerChannel(i)->GetMidiInputDevice() == pDevice) throw LinuxSamplerException("Sampler channel " + ToString(i) + " is still connected to the midi input device.");                      if (GetSamplerChannel(i)->GetMidiInputDevice() == pDevice) throw Exception("Sampler channel " + ToString(i) + " is still connected to the midi input device.");
511    
512                  // disable device                  // disable device
513                  pDevice->StopListen();                  pDevice->StopListen();
# Line 332  namespace LinuxSampler { Line 517  namespace LinuxSampler {
517    
518                  // destroy and free device from memory                  // destroy and free device from memory
519                  delete pDevice;                  delete pDevice;
520    
521                    fireMidiDeviceCountChanged(MidiInputDevices());
522                    break;
523              }              }
524          }          }
525      }      }
526    
527      MidiInputDevice* Sampler::CreateMidiInputDevice(String MidiDriver, std::map<String,String> Parameters) throw (LinuxSamplerException) {      MidiInputDevice* Sampler::CreateMidiInputDevice(String MidiDriver, std::map<String,String> Parameters) throw (Exception) {
528          // create new device          // create new device
529          MidiInputDevice* pDevice = MidiInputDeviceFactory::Create(MidiDriver, Parameters, this);          MidiInputDevice* pDevice = MidiInputDeviceFactory::Create(MidiDriver, Parameters, this);
530    
# Line 348  namespace LinuxSampler { Line 536  namespace LinuxSampler {
536                  }                  }
537          }          }
538    
539            fireMidiDeviceCountChanged(MidiInputDevices());
540          return pDevice;          return pDevice;
541      }      }
542    
# Line 401  namespace LinuxSampler { Line 590  namespace LinuxSampler {
590              std::cerr << "Sampler::Reset(): Exception occured while trying to delete all audio output devices, exiting.\n" << std::flush;              std::cerr << "Sampler::Reset(): Exception occured while trying to delete all audio output devices, exiting.\n" << std::flush;
591              exit(EXIT_FAILURE);              exit(EXIT_FAILURE);
592          }          }
593    
594            // delete MIDI instrument maps
595            try {
596                MidiInstrumentMapper::RemoveAllMaps();
597            }
598            catch(...) {
599                std::cerr << "Sampler::Reset(): Exception occured while trying to delete all MIDI instrument maps, exiting.\n" << std::flush;
600                exit(EXIT_FAILURE);
601            }
602    
603            // unload all instrument editor DLLs
604            InstrumentEditorFactory::ClosePlugins();
605      }      }
606    
607  } // namespace LinuxSampler  } // namespace LinuxSampler

Legend:
Removed from v.778  
changed lines
  Added in v.1212

  ViewVC Help
Powered by ViewVC