/[svn]/linuxsampler/trunk/src/network/lscpserver.cpp

Diff of /linuxsampler/trunk/src/network/lscpserver.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 1525 by schoenebeck,
Sun Nov 25 17:47:46 2007 UTC
+revision 2500 by schoenebeck,
Fri Jan 10 12:20:05 2014 UTC
 Line 3
   *   LinuxSampler - modular, streaming capable sampler                     *
   *                                                                         *
   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
-  *   Copyright (C) 2005 - 2007 Christian Schoenebeck                       *
+  *   Copyright (C) 2005 - 2014 Christian Schoenebeck                       *
   *                                                                         *
   *   This library is free software; you can redistribute it and/or modify  *
   *   it under the terms of the GNU General Public License as published by  *
 Line 21
   *   MA  02111-1307  USA                                                   *
   ***************************************************************************/
+ #include <algorithm>
+ #include <string>
+ #include "../common/File.h"
  #include "lscpserver.h"
  #include "lscpresultset.h"
  #include "lscpevent.h"
  #if defined(WIN32)
+ #include <windows.h>
  #else
  #include <fcntl.h>
  #endif
-Line 38
+Line 43
  #include "../engines/EngineChannelFactory.h"
  #include "../drivers/audio/AudioOutputDeviceFactory.h"
  #include "../drivers/midi/MidiInputDeviceFactory.h"
+ #include "../effects/EffectFactory.h"
+ namespace LinuxSampler {
  /**
   * Returns a copy of the given string where all special characters are
-Line 90 
 static String _escapeLscpResponse(String
+Line 97 
 static String _escapeLscpResponse(String
   */
  fd_set LSCPServer::fdSet;
  int LSCPServer::currentSocket = -1;
- std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();
+ std::vector<yyparse_param_t> LSCPServer::Sessions;
- std::vector<yyparse_param_t>::iterator itCurrentSession = std::vector<yyparse_param_t>::iterator();
+ std::vector<yyparse_param_t>::iterator itCurrentSession;
- std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();
+ std::map<int,String> LSCPServer::bufferedNotifies;
- std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();
+ std::map<int,String> LSCPServer::bufferedCommands;
- std::map< LSCPEvent::event_t, std::list<int> > LSCPServer::eventSubscriptions = std::map< LSCPEvent::event_t, std::list<int> >();
+ std::map< LSCPEvent::event_t, std::list<int> > LSCPServer::eventSubscriptions;
- Mutex LSCPServer::NotifyMutex = Mutex();
+ Mutex LSCPServer::NotifyMutex;
- Mutex LSCPServer::NotifyBufferMutex = Mutex();
+ Mutex LSCPServer::NotifyBufferMutex;
- Mutex LSCPServer::SubscriptionMutex = Mutex();
+ Mutex LSCPServer::SubscriptionMutex;
- Mutex LSCPServer::RTNotifyMutex = Mutex();
+ Mutex LSCPServer::RTNotifyMutex;
- LSCPServer::LSCPServer(Sampler* pSampler, long int addr, short int port) : Thread(true, false, 0, -4) {
+ LSCPServer::LSCPServer(Sampler* pSampler, long int addr, short int port) : Thread(true, false, 0, -4), eventHandler(this) {
      SocketAddress.sin_family      = AF_INET;
      SocketAddress.sin_addr.s_addr = addr;
      SocketAddress.sin_port        = port;
-Line 126 
 LSCPServer::LSCPServer(Sampler* pSampler
+Line 133 
 LSCPServer::LSCPServer(Sampler* pSampler
      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");
      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instrs_job_info, "DB_INSTRUMENTS_JOB_INFO");
      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_total_stream_count, "TOTAL_STREAM_COUNT");
      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");
      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_channel_midi, "CHANNEL_MIDI");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_device_midi, "DEVICE_MIDI");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_fx_instance_count, "EFFECT_INSTANCE_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_fx_instance_info, "EFFECT_INSTANCE_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_send_fx_chain_count, "SEND_EFFECT_CHAIN_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_send_fx_chain_info, "SEND_EFFECT_CHAIN_INFO");
      hSocket = -1;
  }
  LSCPServer::~LSCPServer() {
+     CloseAllConnections();
+     InstrumentManager::StopBackgroundThread();
  #if defined(WIN32)
      if (hSocket >= 0) closesocket(hSocket);
  #else
-Line 139 
 LSCPServer::~LSCPServer() {
+Line 155 
 LSCPServer::~LSCPServer() {
  #endif
  }
+ LSCPServer::EventHandler::EventHandler(LSCPServer* pParent) {
+     this->pParent = pParent;
+ }
+ LSCPServer::EventHandler::~EventHandler() {
+     std::vector<midi_listener_entry> l = channelMidiListeners;
+     channelMidiListeners.clear();
+     for (int i = 0; i < l.size(); i++)
+         delete l[i].pMidiListener;
+ }
  void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {
      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, NewCount));
  }
+ void LSCPServer::EventHandler::ChannelAdded(SamplerChannel* pChannel) {
+     pChannel->AddEngineChangeListener(this);
+ }
+ void LSCPServer::EventHandler::ChannelToBeRemoved(SamplerChannel* pChannel) {
+     if (!pChannel->GetEngineChannel()) return;
+     EngineToBeChanged(pChannel->Index());
+ }
+ void LSCPServer::EventHandler::EngineToBeChanged(int ChannelId) {
+     SamplerChannel* pSamplerChannel =
+         pParent->pSampler->GetSamplerChannel(ChannelId);
+     if (!pSamplerChannel) return;
+     EngineChannel* pEngineChannel =
+         pSamplerChannel->GetEngineChannel();
+     if (!pEngineChannel) return;
+     for (std::vector<midi_listener_entry>::iterator iter = channelMidiListeners.begin(); iter != channelMidiListeners.end(); ++iter) {
+         if ((*iter).pEngineChannel == pEngineChannel) {
+             VirtualMidiDevice* pMidiListener = (*iter).pMidiListener;
+             pEngineChannel->Disconnect(pMidiListener);
+             channelMidiListeners.erase(iter);
+             delete pMidiListener;
+             return;
+         }
+     }
+ }
+ void LSCPServer::EventHandler::EngineChanged(int ChannelId) {
+     SamplerChannel* pSamplerChannel =
+         pParent->pSampler->GetSamplerChannel(ChannelId);
+     if (!pSamplerChannel) return;
+     EngineChannel* pEngineChannel =
+         pSamplerChannel->GetEngineChannel();
+     if (!pEngineChannel) return;
+     VirtualMidiDevice* pMidiListener = new VirtualMidiDevice;
+     pEngineChannel->Connect(pMidiListener);
+     midi_listener_entry entry = {
+         pSamplerChannel, pEngineChannel, pMidiListener
+     };
+     channelMidiListeners.push_back(entry);
+ }
  void LSCPServer::EventHandler::AudioDeviceCountChanged(int NewCount) {
      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_audio_device_count, NewCount));
  }
-Line 151 
 void LSCPServer::EventHandler::MidiDevic
+Line 220 
 void LSCPServer::EventHandler::MidiDevic
      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_device_count, NewCount));
  }
+ void LSCPServer::EventHandler::MidiDeviceToBeDestroyed(MidiInputDevice* pDevice) {
+     pDevice->RemoveMidiPortCountListener(this);
+     for (int i = 0; i < pDevice->PortCount(); ++i)
+         MidiPortToBeRemoved(pDevice->GetPort(i));
+ }
+ void LSCPServer::EventHandler::MidiDeviceCreated(MidiInputDevice* pDevice) {
+     pDevice->AddMidiPortCountListener(this);
+     for (int i = 0; i < pDevice->PortCount(); ++i)
+         MidiPortAdded(pDevice->GetPort(i));
+ }
+ void LSCPServer::EventHandler::MidiPortCountChanged(int NewCount) {
+     // yet unused
+ }
+ void LSCPServer::EventHandler::MidiPortToBeRemoved(MidiInputPort* pPort) {
+     for (std::vector<device_midi_listener_entry>::iterator iter = deviceMidiListeners.begin(); iter != deviceMidiListeners.end(); ++iter) {
+         if ((*iter).pPort == pPort) {
+             VirtualMidiDevice* pMidiListener = (*iter).pMidiListener;
+             pPort->Disconnect(pMidiListener);
+             deviceMidiListeners.erase(iter);
+             delete pMidiListener;
+             return;
+         }
+     }
+ }
+ void LSCPServer::EventHandler::MidiPortAdded(MidiInputPort* pPort) {
+     // find out the device ID
+     std::map<uint, MidiInputDevice*> devices =
+         pParent->pSampler->GetMidiInputDevices();
+     for (
+         std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
+         iter != devices.end(); ++iter
+     ) {
+         if (iter->second == pPort->GetDevice()) { // found
+             VirtualMidiDevice* pMidiListener = new VirtualMidiDevice;
+             pPort->Connect(pMidiListener);
+             device_midi_listener_entry entry = {
+                 pPort, pMidiListener, iter->first
+             };
+             deviceMidiListeners.push_back(entry);
+             return;
+         }
+     }
+ }
  void LSCPServer::EventHandler::MidiInstrumentCountChanged(int MapId, int NewCount) {
      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_count, MapId, NewCount));
  }
-Line 187 
 void LSCPServer::EventHandler::TotalVoic
+Line 304 
 void LSCPServer::EventHandler::TotalVoic
      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_voice_count, NewCount));
  }
+ void LSCPServer::EventHandler::TotalStreamCountChanged(int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_stream_count, NewCount));
+ }
  #if HAVE_SQLITE3
  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {
      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, InstrumentsDb::toEscapedPath(Dir)));
-Line 221 
 void LSCPServer::DbInstrumentsEventHandl
+Line 342 
 void LSCPServer::DbInstrumentsEventHandl
  }
  #endif // HAVE_SQLITE3
+ void LSCPServer::RemoveListeners() {
+     pSampler->RemoveChannelCountListener(&eventHandler);
+     pSampler->RemoveAudioDeviceCountListener(&eventHandler);
+     pSampler->RemoveMidiDeviceCountListener(&eventHandler);
+     pSampler->RemoveVoiceCountListener(&eventHandler);
+     pSampler->RemoveStreamCountListener(&eventHandler);
+     pSampler->RemoveBufferFillListener(&eventHandler);
+     pSampler->RemoveTotalStreamCountListener(&eventHandler);
+     pSampler->RemoveTotalVoiceCountListener(&eventHandler);
+     pSampler->RemoveFxSendCountListener(&eventHandler);
+     MidiInstrumentMapper::RemoveMidiInstrumentCountListener(&eventHandler);
+     MidiInstrumentMapper::RemoveMidiInstrumentInfoListener(&eventHandler);
+     MidiInstrumentMapper::RemoveMidiInstrumentMapCountListener(&eventHandler);
+     MidiInstrumentMapper::RemoveMidiInstrumentMapInfoListener(&eventHandler);
+ #if HAVE_SQLITE3
+     InstrumentsDb::GetInstrumentsDb()->RemoveInstrumentsDbListener(&dbInstrumentsEventHandler);
+ #endif
+ }
  /**
   * Blocks the calling thread until the LSCP Server is initialized and
-Line 283 
 int LSCPServer::Main() {
+Line 422 
 int LSCPServer::Main() {
      pSampler->AddVoiceCountListener(&eventHandler);
      pSampler->AddStreamCountListener(&eventHandler);
      pSampler->AddBufferFillListener(&eventHandler);
+     pSampler->AddTotalStreamCountListener(&eventHandler);
      pSampler->AddTotalVoiceCountListener(&eventHandler);
      pSampler->AddFxSendCountListener(&eventHandler);
      MidiInstrumentMapper::AddMidiInstrumentCountListener(&eventHandler);
-Line 302 
 int LSCPServer::Main() {
+Line 442 
 int LSCPServer::Main() {
      timeval timeout;
      while (true) {
+         #if CONFIG_PTHREAD_TESTCANCEL
+                 TestCancel();
+         #endif
          // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers
          {
+             LockGuard lock(EngineChannelFactory::EngineChannelsMutex);
              std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();
              std::set<EngineChannel*>::iterator itEngineChannel = engineChannels.begin();
              std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();
              for (; itEngineChannel != itEnd; ++itEngineChannel) {
                  if ((*itEngineChannel)->StatusChanged()) {
-                     SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_info, (*itEngineChannel)->iSamplerChannelIndex));
+                     SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_info, (*itEngineChannel)->GetSamplerChannel()->Index()));
                  }
                  for (int i = 0; i < (*itEngineChannel)->GetFxSendCount(); i++) {
                      FxSend* fxs = (*itEngineChannel)->GetFxSend(i);
                      if(fxs != NULL && fxs->IsInfoChanged()) {
-                         int chn = (*itEngineChannel)->iSamplerChannelIndex;
+                         int chn = (*itEngineChannel)->GetSamplerChannel()->Index();
                          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, chn, fxs->Id()));
                          fxs->SetInfoChanged(false);
                      }
-Line 323 
 int LSCPServer::Main() {
+Line 467 
 int LSCPServer::Main() {
              }
          }
-         //Now let's deliver late notifies (if any)
+         // check if MIDI data arrived on some engine channel
-         NotifyBufferMutex.Lock();
+         for (int i = 0; i < eventHandler.channelMidiListeners.size(); ++i) {
-         for (std::map<int,String>::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) {
+             const EventHandler::midi_listener_entry entry =
+                 eventHandler.channelMidiListeners[i];
+             VirtualMidiDevice* pMidiListener = entry.pMidiListener;
+             if (pMidiListener->NotesChanged()) {
+                 for (int iNote = 0; iNote < 128; iNote++) {
+                     if (pMidiListener->NoteChanged(iNote)) {
+                         const bool bActive = pMidiListener->NoteIsActive(iNote);
+                         LSCPServer::SendLSCPNotify(
+                             LSCPEvent(
+                                 LSCPEvent::event_channel_midi,
+                                 entry.pSamplerChannel->Index(),
+                                 std::string(bActive ? "NOTE_ON" : "NOTE_OFF"),
+                                 iNote,
+                                 bActive ? pMidiListener->NoteOnVelocity(iNote)
+                                         : pMidiListener->NoteOffVelocity(iNote)
+                             )
+                         );
+                     }
+                 }
+             }
+         }
+         // check if MIDI data arrived on some MIDI device
+         for (int i = 0; i < eventHandler.deviceMidiListeners.size(); ++i) {
+             const EventHandler::device_midi_listener_entry entry =
+                 eventHandler.deviceMidiListeners[i];
+             VirtualMidiDevice* pMidiListener = entry.pMidiListener;
+             if (pMidiListener->NotesChanged()) {
+                 for (int iNote = 0; iNote < 128; iNote++) {
+                     if (pMidiListener->NoteChanged(iNote)) {
+                         const bool bActive = pMidiListener->NoteIsActive(iNote);
+                         LSCPServer::SendLSCPNotify(
+                             LSCPEvent(
+                                 LSCPEvent::event_device_midi,
+                                 entry.uiDeviceID,
+                                 entry.pPort->GetPortNumber(),
+                                 std::string(bActive ? "NOTE_ON" : "NOTE_OFF"),
+                                 iNote,
+                                 bActive ? pMidiListener->NoteOnVelocity(iNote)
+                                         : pMidiListener->NoteOffVelocity(iNote)
+                             )
+                         );
+                     }
+                 }
+             }
+         }
+         //Now let's deliver late notifies (if any)
+         {
+             LockGuard lock(NotifyBufferMutex);
+             for (std::map<int,String>::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) {
  #ifdef MSG_NOSIGNAL
                  send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), MSG_NOSIGNAL);
  #else
                  send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), 0);
  #endif
-         }
+             }
-         bufferedNotifies.clear();
+             bufferedNotifies.clear();
-         NotifyBufferMutex.Unlock();
+         }
          fd_set selectSet = fdSet;
          timeout.tv_sec  = 0;
-Line 341 
 int LSCPServer::Main() {
+Line 535 
 int LSCPServer::Main() {
          int retval = select(maxSessions+1, &selectSet, NULL, NULL, &timeout);
-         if (retval == 0)
+         if (retval == 0 || (retval == -1 && errno == EINTR))
                  continue; //Nothing try again
          if (retval == -1) {
                  std::cerr << "LSCPServer: Socket select error." << std::endl;
-Line 367 
 int LSCPServer::Main() {
+Line 561 
 int LSCPServer::Main() {
                    std::cerr << "LSCPServer: ioctlsocket: set FIONBIO failed. Error " << WSAGetLastError() << std::endl;
                    exit(EXIT_FAILURE);
                  }
          #else
+                 struct linger linger;
+                 linger.l_onoff = 1;
+                 linger.l_linger = 0;
+                 if(setsockopt(socket, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger))) {
+                     std::cerr << "LSCPServer: Failed to set SO_LINGER\n";
+                 }
                  if (fcntl(socket, F_SETFL, O_NONBLOCK)) {
                          std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;
                          exit(EXIT_FAILURE);
-Line 423 
 void LSCPServer::CloseConnection( std::v
+Line 624 
 void LSCPServer::CloseConnection( std::v
          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));
          Sessions.erase(iter);
          FD_CLR(socket,  &fdSet);
-         SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)
+         {
-         for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {
+             LockGuard lock(SubscriptionMutex);
-                 iter->second.remove(socket);
+             // Must unsubscribe this socket from all events (if any)
-         }
+             for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {
-         SubscriptionMutex.Unlock();
+                 iter->second.remove(socket);
-         NotifyMutex.Lock();
+             }
+         }
+         LockGuard lock(NotifyMutex);
          bufferedCommands.erase(socket);
          bufferedNotifies.erase(socket);
          #if defined(WIN32)
-Line 436 
 void LSCPServer::CloseConnection( std::v
+Line 639 
 void LSCPServer::CloseConnection( std::v
          #else
          close(socket);
          #endif
-         NotifyMutex.Unlock();
+ }
+ void LSCPServer::CloseAllConnections() {
+     std::vector<yyparse_param_t>::iterator iter = Sessions.begin();
+     while(iter != Sessions.end()) {
+         CloseConnection(iter);
+         iter = Sessions.begin();
+     }
  }
  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {
          int subs = 0;
-         SubscriptionMutex.Lock();
+         LockGuard lock(SubscriptionMutex);
          for( std::list<LSCPEvent::event_t>::iterator iter = events.begin();
                          iter != events.end(); iter++)
          {
                  subs += eventSubscriptions.count(*iter);
          }
-         SubscriptionMutex.Unlock();
          return subs;
  }
  void LSCPServer::SendLSCPNotify( LSCPEvent event ) {
-         SubscriptionMutex.Lock();
+         LockGuard lock(SubscriptionMutex);
          if (eventSubscriptions.count(event.GetType()) == 0) {
-                 SubscriptionMutex.Unlock();     //Nobody is subscribed to this event
+                 // Nobody is subscribed to this event
                  return;
          }
          std::list<int>::iterator iter = eventSubscriptions[event.GetType()].begin();
-Line 480 
 void LSCPServer::SendLSCPNotify( LSCPEve
+Line 689 
 void LSCPServer::SendLSCPNotify( LSCPEve
                          }
                  }
          }
-         SubscriptionMutex.Unlock();
  }
  extern int GetLSCPCommand( void *buf, int max_size ) {
-Line 538 
 bool LSCPServer::GetLSCPCommand( std::ve
+Line 746 
 bool LSCPServer::GetLSCPCommand( std::ve
                      int wsa_lasterror = WSAGetLastError();
                          if (wsa_lasterror == WSAEWOULDBLOCK) //Would block, try again later.
                                  return false;
                          dmsg(2,("LSCPScanner: Socket error after recv() Error %d.\n", wsa_lasterror));
                          CloseConnection(iter);
                          break;
                  }
-Line 595 
 bool LSCPServer::GetLSCPCommand( std::ve
+Line 803 
 bool LSCPServer::GetLSCPCommand( std::ve
  void LSCPServer::AnswerClient(String ReturnMessage) {
      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));
      if (currentSocket != -1) {
-             NotifyMutex.Lock();
+             LockGuard lock(NotifyMutex);
  #ifdef MSG_NOSIGNAL
              send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), MSG_NOSIGNAL);
  #else
              send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), 0);
  #endif
-             NotifyMutex.Unlock();
      }
  }
-Line 751 
 String LSCPServer::SetEngineType(String
+Line 958 
 String LSCPServer::SetEngineType(String
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
          if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         LockRTNotify();
+         LockGuard lock(RTNotifyMutex);
          pSamplerChannel->SetEngineType(EngineName);
          if(HasSoloChannel()) pSamplerChannel->GetEngineChannel()->SetMute(-1);
-         UnlockRTNotify();
      }
      catch (Exception e) {
           result.Error(e);
-Line 794 
 String LSCPServer::ListChannels() {
+Line 1000 
 String LSCPServer::ListChannels() {
   */
  String LSCPServer::AddChannel() {
      dmsg(2,("LSCPServer: AddChannel()\n"));
-     LockRTNotify();
+     SamplerChannel* pSamplerChannel;
-     SamplerChannel* pSamplerChannel = pSampler->AddSamplerChannel();
+     {
-     UnlockRTNotify();
+         LockGuard lock(RTNotifyMutex);
+         pSamplerChannel = pSampler->AddSamplerChannel();
+     }
      LSCPResultSet result(pSamplerChannel->Index());
      return result.Produce();
  }
-Line 807 
 String LSCPServer::AddChannel() {
+Line 1015 
 String LSCPServer::AddChannel() {
  String LSCPServer::RemoveChannel(uint uiSamplerChannel) {
      dmsg(2,("LSCPServer: RemoveChannel(SamplerChannel=%d)\n", uiSamplerChannel));
      LSCPResultSet result;
-     LockRTNotify();
+     {
-     pSampler->RemoveSamplerChannel(uiSamplerChannel);
+         LockGuard lock(RTNotifyMutex);
-     UnlockRTNotify();
+         pSampler->RemoveSamplerChannel(uiSamplerChannel);
+     }
      return result.Produce();
  }
-Line 852 
 String LSCPServer::ListAvailableEngines(
+Line 1061 
 String LSCPServer::ListAvailableEngines(
  String LSCPServer::GetEngineInfo(String EngineName) {
      dmsg(2,("LSCPServer: GetEngineInfo(EngineName=%s)\n", EngineName.c_str()));
      LSCPResultSet result;
-     LockRTNotify();
+     {
-     try {
+         LockGuard lock(RTNotifyMutex);
-         Engine* pEngine = EngineFactory::Create(EngineName);
+         try {
-         result.Add("DESCRIPTION", _escapeLscpResponse(pEngine->Description()));
+             Engine* pEngine = EngineFactory::Create(EngineName);
-         result.Add("VERSION",     pEngine->Version());
+             result.Add("DESCRIPTION", _escapeLscpResponse(pEngine->Description()));
-         EngineFactory::Destroy(pEngine);
+             result.Add("VERSION",     pEngine->Version());
-     }
+             EngineFactory::Destroy(pEngine);
-     catch (Exception e) {
+         }
-          result.Error(e);
+         catch (Exception e) {
+             result.Error(e);
+         }
      }
-     UnlockRTNotify();
      return result.Produce();
  }
-Line 961 
 String LSCPServer::GetVoiceCount(uint ui
+Line 1171 
 String LSCPServer::GetVoiceCount(uint ui
      dmsg(2,("LSCPServer: GetVoiceCount(SamplerChannel=%d)\n", uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine loaded on sampler channel");
          if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
          result.Add(pEngineChannel->GetEngine()->VoiceCount());
      }
-Line 982 
 String LSCPServer::GetStreamCount(uint u
+Line 1189 
 String LSCPServer::GetStreamCount(uint u
      dmsg(2,("LSCPServer: GetStreamCount(SamplerChannel=%d)\n", uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
          result.Add(pEngineChannel->GetEngine()->DiskStreamCount());
      }
-Line 1003 
 String LSCPServer::GetBufferFill(fill_re
+Line 1207 
 String LSCPServer::GetBufferFill(fill_re
      dmsg(2,("LSCPServer: GetBufferFill(ResponseType=%d, SamplerChannel=%d)\n", ResponseType, uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
          if (!pEngineChannel->GetEngine()->DiskStreamSupported()) result.Add("NA");
          else {
-Line 1094 
 String LSCPServer::GetMidiInputDriverInf
+Line 1295 
 String LSCPServer::GetMidiInputDriverInf
              for (;iter != parameters.end(); iter++) {
                  if (s != "") s += ",";
                  s += iter->first;
+                 delete iter->second;
              }
              result.Add("PARAMETERS", s);
          }
-Line 1118 
 String LSCPServer::GetAudioOutputDriverI
+Line 1320 
 String LSCPServer::GetAudioOutputDriverI
              for (;iter != parameters.end(); iter++) {
                  if (s != "") s += ",";
                  s += iter->first;
+                 delete iter->second;
              }
              result.Add("PARAMETERS", s);
          }
-Line 1148 
 String LSCPServer::GetMidiInputDriverPar
+Line 1351 
 String LSCPServer::GetMidiInputDriverPar
          if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
          if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
          if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
+         delete pParameter;
      }
      catch (Exception e) {
          result.Error(e);
-Line 1175 
 String LSCPServer::GetAudioOutputDriverP
+Line 1379 
 String LSCPServer::GetAudioOutputDriverP
          if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
          if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
          if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
+         delete pParameter;
      }
      catch (Exception e) {
          result.Error(e);
-Line 1516 
 String LSCPServer::SetAudioOutputChannel
+Line 1721 
 String LSCPServer::SetAudioOutputChannel
  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {
      dmsg(2,("LSCPServer: SetAudiotOutputDevice(AudioDeviceId=%d, SamplerChannel=%d)\n",AudioDeviceId,uiSamplerChannel));
      LSCPResultSet result;
-     LockRTNotify();
+     {
+         LockGuard lock(RTNotifyMutex);
+         try {
+             SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+             if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
+             std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
+             if (!devices.count(AudioDeviceId)) throw Exception("There is no audio output device with index " + ToString(AudioDeviceId));
+             AudioOutputDevice* pDevice = devices[AudioDeviceId];
+             pSamplerChannel->SetAudioOutputDevice(pDevice);
+         }
+         catch (Exception e) {
+             result.Error(e);
+         }
+     }
+     return result.Produce();
+ }
+ String LSCPServer::SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel) {
+     dmsg(2,("LSCPServer: SetAudioOutputType(String AudioOutputDriver=%s, SamplerChannel=%d)\n",AudioOutputDriver.c_str(),uiSamplerChannel));
+     LSCPResultSet result;
+     {
+         LockGuard lock(RTNotifyMutex);
+         try {
+             SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+             if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
+             // Driver type name aliasing...
+             if (AudioOutputDriver == "Alsa") AudioOutputDriver = "ALSA";
+             if (AudioOutputDriver == "Jack") AudioOutputDriver = "JACK";
+             // Check if there's one audio output device already created
+             // for the intended audio driver type (AudioOutputDriver)...
+             AudioOutputDevice *pDevice = NULL;
+             std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
+             std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
+             for (; iter != devices.end(); iter++) {
+                 if ((iter->second)->Driver() == AudioOutputDriver) {
+                     pDevice = iter->second;
+                     break;
+                 }
+             }
+             // If it doesn't exist, create a new one with default parameters...
+             if (pDevice == NULL) {
+                 std::map<String,String> params;
+                 pDevice = pSampler->CreateAudioOutputDevice(AudioOutputDriver, params);
+             }
+             // Must have a device...
+             if (pDevice == NULL)
+                 throw Exception("Internal error: could not create audio output device.");
+             // Set it as the current channel device...
+             pSamplerChannel->SetAudioOutputDevice(pDevice);
+         }
+         catch (Exception e) {
+             result.Error(e);
+         }
+     }
+     return result.Produce();
+ }
+ String LSCPServer::AddChannelMidiInput(uint uiSamplerChannel, uint MIDIDeviceId, uint MIDIPort) {
+     dmsg(2,("LSCPServer: AddChannelMidiInput(uiSamplerChannel=%d, MIDIDeviceId=%d, MIDIPort=%d)\n",uiSamplerChannel,MIDIDeviceId,MIDIPort));
+     LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
          if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices.count(AudioDeviceId)) throw Exception("There is no audio output device with index " + ToString(AudioDeviceId));
+         std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
-         AudioOutputDevice* pDevice = devices[AudioDeviceId];
+         if (!devices.count(MIDIDeviceId)) throw Exception("There is no MIDI input device with index " + ToString(MIDIDeviceId));
-         pSamplerChannel->SetAudioOutputDevice(pDevice);
+         MidiInputDevice* pDevice = devices[MIDIDeviceId];
+         MidiInputPort* pPort = pDevice->GetPort(MIDIPort);
+         if (!pPort) throw Exception("There is no MIDI input port with index " + ToString(MIDIPort) + " on MIDI input device with index " + ToString(MIDIDeviceId));
+         pSamplerChannel->Connect(pPort);
+     } catch (Exception e) {
+         result.Error(e);
      }
-     catch (Exception e) {
+     return result.Produce();
-          result.Error(e);
+ }
+ String LSCPServer::RemoveChannelMidiInput(uint uiSamplerChannel) {
+     dmsg(2,("LSCPServer: RemoveChannelMidiInput(uiSamplerChannel=%d)\n",uiSamplerChannel));
+     LSCPResultSet result;
+     try {
+         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         pSamplerChannel->DisconnectAllMidiInputPorts();
+     } catch (Exception e) {
+         result.Error(e);
      }
-     UnlockRTNotify();
      return result.Produce();
  }
- String LSCPServer::SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel) {
+ String LSCPServer::RemoveChannelMidiInput(uint uiSamplerChannel, uint MIDIDeviceId) {
-     dmsg(2,("LSCPServer: SetAudioOutputType(String AudioOutputDriver=%s, SamplerChannel=%d)\n",AudioOutputDriver.c_str(),uiSamplerChannel));
+     dmsg(2,("LSCPServer: RemoveChannelMidiInput(uiSamplerChannel=%d, MIDIDeviceId=%d)\n",uiSamplerChannel,MIDIDeviceId));
      LSCPResultSet result;
-     LockRTNotify();
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
          if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         // Driver type name aliasing...
-         if (AudioOutputDriver == "Alsa") AudioOutputDriver = "ALSA";
+         std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
-         if (AudioOutputDriver == "Jack") AudioOutputDriver = "JACK";
+         if (!devices.count(MIDIDeviceId)) throw Exception("There is no MIDI input device with index " + ToString(MIDIDeviceId));
-         // Check if there's one audio output device already created
+         MidiInputDevice* pDevice = devices[MIDIDeviceId];
-         // for the intended audio driver type (AudioOutputDriver)...
-         AudioOutputDevice *pDevice = NULL;
+         std::vector<MidiInputPort*> vPorts = pSamplerChannel->GetMidiInputPorts();
-         std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
+         for (int i = 0; i < vPorts.size(); ++i)
-         std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
+             if (vPorts[i]->GetDevice() == pDevice)
-         for (; iter != devices.end(); iter++) {
+                 pSamplerChannel->Disconnect(vPorts[i]);
-             if ((iter->second)->Driver() == AudioOutputDriver) {
-                 pDevice = iter->second;
+     } catch (Exception e) {
-                 break;
+         result.Error(e);
-             }
-         }
-         // If it doesn't exist, create a new one with default parameters...
-         if (pDevice == NULL) {
-             std::map<String,String> params;
-             pDevice = pSampler->CreateAudioOutputDevice(AudioOutputDriver, params);
-         }
-         // Must have a device...
-         if (pDevice == NULL)
-             throw Exception("Internal error: could not create audio output device.");
-         // Set it as the current channel device...
-         pSamplerChannel->SetAudioOutputDevice(pDevice);
      }
-     catch (Exception e) {
+     return result.Produce();
-          result.Error(e);
+ }
+ String LSCPServer::RemoveChannelMidiInput(uint uiSamplerChannel, uint MIDIDeviceId, uint MIDIPort) {
+     dmsg(2,("LSCPServer: RemoveChannelMidiInput(uiSamplerChannel=%d, MIDIDeviceId=%d, MIDIPort=%d)\n",uiSamplerChannel,MIDIDeviceId,MIDIPort));
+     LSCPResultSet result;
+     try {
+         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+         if (!devices.count(MIDIDeviceId)) throw Exception("There is no MIDI input device with index " + ToString(MIDIDeviceId));
+         MidiInputDevice* pDevice = devices[MIDIDeviceId];
+         MidiInputPort* pPort = pDevice->GetPort(MIDIPort);
+         if (!pPort) throw Exception("There is no MIDI input port with index " + ToString(MIDIPort) + " on MIDI input device with index " + ToString(MIDIDeviceId));
+         pSamplerChannel->Disconnect(pPort);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::ListChannelMidiInputs(uint uiSamplerChannel) {
+     dmsg(2,("LSCPServer: ListChannelMidiInputs(uiSamplerChannel=%d)\n",uiSamplerChannel));
+     LSCPResultSet result;
+     try {
+         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         std::vector<MidiInputPort*> vPorts = pSamplerChannel->GetMidiInputPorts();
+         String s;
+         for (int i = 0; i < vPorts.size(); ++i) {
+             const int iDeviceID = vPorts[i]->GetDevice()->MidiInputDeviceID();
+             const int iPortNr   = vPorts[i]->GetPortNumber();
+             if (s.size()) s += ",";
+             s += "{" + ToString(iDeviceID) + ","
+                      + ToString(iPortNr) + "}";
+         }
+         result.Add(s);
+     } catch (Exception e) {
+         result.Error(e);
      }
-     UnlockRTNotify();
      return result.Produce();
  }
-Line 1641 
 String LSCPServer::SetMIDIInputType(Stri
+Line 1948 
 String LSCPServer::SetMIDIInputType(Stri
              pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);
              // Make it with at least one initial port.
              std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
-             parameters["PORTS"]->SetValue("1");
          }
          // Must have a device...
          if (pDevice == NULL)
-Line 1684 
 String LSCPServer::SetVolume(double dVol
+Line 1990 
 String LSCPServer::SetVolume(double dVol
      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", dVolume, uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          pEngineChannel->Volume(dVolume);
      }
      catch (Exception e) {
-Line 1703 
 String LSCPServer::SetChannelMute(bool b
+Line 2006 
 String LSCPServer::SetChannelMute(bool b
      dmsg(2,("LSCPServer: SetChannelMute(bMute=%d,uiSamplerChannel=%d)\n",bMute,uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          if(!bMute) pEngineChannel->SetMute((HasSoloChannel() && !pEngineChannel->GetSolo()) ? -1 : 0);
          else pEngineChannel->SetMute(1);
-Line 1724 
 String LSCPServer::SetChannelSolo(bool b
+Line 2023 
 String LSCPServer::SetChannelSolo(bool b
      dmsg(2,("LSCPServer: SetChannelSolo(bSolo=%d,uiSamplerChannel=%d)\n",bSolo,uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          bool oldSolo = pEngineChannel->GetSolo();
          bool hadSoloChannel = HasSoloChannel();
-Line 1848 
 String LSCPServer::GetMidiInstrumentMapp
+Line 2143 
 String LSCPServer::GetMidiInstrumentMapp
      dmsg(2,("LSCPServer: GetMidiInstrumentMappings()\n"));
      LSCPResultSet result;
      try {
-         result.Add(MidiInstrumentMapper::Entries(MidiMapID).size());
+         result.Add(MidiInstrumentMapper::GetInstrumentCount(MidiMapID));
      } catch (Exception e) {
          result.Error(e);
      }
-Line 1859 
 String LSCPServer::GetMidiInstrumentMapp
+Line 2154 
 String LSCPServer::GetMidiInstrumentMapp
  String LSCPServer::GetAllMidiInstrumentMappings() {
      dmsg(2,("LSCPServer: GetAllMidiInstrumentMappings()\n"));
      LSCPResultSet result;
-     std::vector<int> maps = MidiInstrumentMapper::Maps();
+     try {
-     int totalMappings = 0;
+         result.Add(MidiInstrumentMapper::GetInstrumentCount());
-     for (int i = 0; i < maps.size(); i++) {
+     } catch (Exception e) {
-         try {
+         result.Error(e);
-             totalMappings += MidiInstrumentMapper::Entries(maps[i]).size();
-         } catch (Exception e) { /*NOOP*/ }
      }
-     result.Add(totalMappings);
      return result.Produce();
  }
-Line 1874 
 String LSCPServer::GetMidiInstrumentMapp
+Line 2166 
 String LSCPServer::GetMidiInstrumentMapp
      dmsg(2,("LSCPServer: GetMidiIstrumentMapping()\n"));
      LSCPResultSet result;
      try {
-         midi_prog_index_t idx;
+         MidiInstrumentMapper::entry_t entry = MidiInstrumentMapper::GetEntry(MidiMapID, MidiBank, MidiProg);
-         idx.midi_bank_msb = (MidiBank >> 7) & 0x7f;
+         // convert the filename into the correct encoding as defined for LSCP
-         idx.midi_bank_lsb = MidiBank & 0x7f;
+         // (especially in terms of special characters -> escape sequences)
-         idx.midi_prog     = MidiProg;
-         std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t> mappings = MidiInstrumentMapper::Entries(MidiMapID);
-         std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t>::iterator iter = mappings.find(idx);
-         if (iter == mappings.end()) result.Error("there is no map entry with that index");
-         else { // found
-             // convert the filename into the correct encoding as defined for LSCP
-             // (especially in terms of special characters -> escape sequences)
  #if WIN32
-             const String instrumentFileName = Path::fromWindows(iter->second.InstrumentFile).toLscp();
+         const String instrumentFileName = Path::fromWindows(entry.InstrumentFile).toLscp();
  #else
-             // assuming POSIX
+         // assuming POSIX
-             const String instrumentFileName = Path::fromPosix(iter->second.InstrumentFile).toLscp();
+         const String instrumentFileName = Path::fromPosix(entry.InstrumentFile).toLscp();
  #endif
-             result.Add("NAME", _escapeLscpResponse(iter->second.Name));
+         result.Add("NAME", _escapeLscpResponse(entry.Name));
-             result.Add("ENGINE_NAME", iter->second.EngineName);
+         result.Add("ENGINE_NAME", entry.EngineName);
-             result.Add("INSTRUMENT_FILE", instrumentFileName);
+         result.Add("INSTRUMENT_FILE", instrumentFileName);
-             result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);
+         result.Add("INSTRUMENT_NR", (int) entry.InstrumentIndex);
-             String instrumentName;
+         String instrumentName;
-             Engine* pEngine = EngineFactory::Create(iter->second.EngineName);
+         Engine* pEngine = EngineFactory::Create(entry.EngineName);
-             if (pEngine) {
+         if (pEngine) {
-                 if (pEngine->GetInstrumentManager()) {
+             if (pEngine->GetInstrumentManager()) {
-                     InstrumentManager::instrument_id_t instrID;
+                 InstrumentManager::instrument_id_t instrID;
-                     instrID.FileName = iter->second.InstrumentFile;
+                 instrID.FileName = entry.InstrumentFile;
-                     instrID.Index    = iter->second.InstrumentIndex;
+                 instrID.Index    = entry.InstrumentIndex;
-                     instrumentName = pEngine->GetInstrumentManager()->GetInstrumentName(instrID);
+                 instrumentName = pEngine->GetInstrumentManager()->GetInstrumentName(instrID);
-                 }
-                 EngineFactory::Destroy(pEngine);
-             }
-             result.Add("INSTRUMENT_NAME", _escapeLscpResponse(instrumentName));
-             switch (iter->second.LoadMode) {
-                 case MidiInstrumentMapper::ON_DEMAND:
-                     result.Add("LOAD_MODE", "ON_DEMAND");
-                     break;
-                 case MidiInstrumentMapper::ON_DEMAND_HOLD:
-                     result.Add("LOAD_MODE", "ON_DEMAND_HOLD");
-                     break;
-                 case MidiInstrumentMapper::PERSISTENT:
-                     result.Add("LOAD_MODE", "PERSISTENT");
-                     break;
-                 default:
-                     throw Exception("entry reflects invalid LOAD_MODE, consider this as a bug!");
              }
-             result.Add("VOLUME", iter->second.Volume);
+             EngineFactory::Destroy(pEngine);
          }
+         result.Add("INSTRUMENT_NAME", _escapeLscpResponse(instrumentName));
+         switch (entry.LoadMode) {
+             case MidiInstrumentMapper::ON_DEMAND:
+                 result.Add("LOAD_MODE", "ON_DEMAND");
+                 break;
+             case MidiInstrumentMapper::ON_DEMAND_HOLD:
+                 result.Add("LOAD_MODE", "ON_DEMAND_HOLD");
+                 break;
+             case MidiInstrumentMapper::PERSISTENT:
+                 result.Add("LOAD_MODE", "PERSISTENT");
+                 break;
+             default:
+                 throw Exception("entry reflects invalid LOAD_MODE, consider this as a bug!");
+         }
+         result.Add("VOLUME", entry.Volume);
      } catch (Exception e) {
          result.Error(e);
      }
-Line 2094 
 String LSCPServer::SetChannelMap(uint ui
+Line 2376 
 String LSCPServer::SetChannelMap(uint ui
      dmsg(2,("LSCPServer: SetChannelMap()\n"));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
          if      (MidiMapID == -1) pEngineChannel->SetMidiInstrumentMapToNone();
          else if (MidiMapID == -2) pEngineChannel->SetMidiInstrumentMapToDefault();
-Line 2206 
 String LSCPServer::GetFxSendInfo(uint ui
+Line 2484 
 String LSCPServer::GetFxSendInfo(uint ui
              AudioRouting += ToString(pFxSend->DestinationChannel(chan));
          }
+         const String sEffectRouting =
+             (pFxSend->DestinationEffectChain() >= 0 && pFxSend->DestinationEffectChainPosition() >= 0)
+                 ? ToString(pFxSend->DestinationEffectChain()) + "," + ToString(pFxSend->DestinationEffectChainPosition())
+                 : "NONE";
          // success
          result.Add("NAME", _escapeLscpResponse(pFxSend->Name()));
          result.Add("MIDI_CONTROLLER", pFxSend->MidiController());
          result.Add("LEVEL", ToString(pFxSend->Level()));
          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);
+         result.Add("EFFECT", sEffectRouting);
      } catch (Exception e) {
          result.Error(e);
      }
-Line 2273 
 String LSCPServer::SetFxSendLevel(uint u
+Line 2557 
 String LSCPServer::SetFxSendLevel(uint u
      return result.Produce();
  }
+ String LSCPServer::SetFxSendEffect(uint uiSamplerChannel, uint FxSendID, int iSendEffectChain, int iEffectChainPosition) {
+     dmsg(2,("LSCPServer: SetFxSendEffect(%d,%d)\n", iSendEffectChain, iEffectChainPosition));
+     LSCPResultSet result;
+     try {
+         FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);
+         pFxSend->SetDestinationEffect(iSendEffectChain, iEffectChainPosition);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, uiSamplerChannel, FxSendID));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::GetAvailableEffects() {
+     dmsg(2,("LSCPServer: GetAvailableEffects()\n"));
+     LSCPResultSet result;
+     try {
+         int n = EffectFactory::AvailableEffectsCount();
+         result.Add(n);
+     }
+     catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::ListAvailableEffects() {
+     dmsg(2,("LSCPServer: ListAvailableEffects()\n"));
+     LSCPResultSet result;
+     String list;
+     try {
+         //FIXME: for now we simply enumerate from 0 .. EffectFactory::AvailableEffectsCount() here, in future we should use unique IDs for effects during the whole sampler session. This issue comes into game when the user forces a reload of available effect plugins
+         int n = EffectFactory::AvailableEffectsCount();
+         for (int i = 0; i < n; i++) {
+             if (i) list += ",";
+             list += ToString(i);
+         }
+     }
+     catch (Exception e) {
+         result.Error(e);
+     }
+     result.Add(list);
+     return result.Produce();
+ }
+ String LSCPServer::GetEffectInfo(int iEffectIndex) {
+     dmsg(2,("LSCPServer: GetEffectInfo(%d)\n", iEffectIndex));
+     LSCPResultSet result;
+     try {
+         EffectInfo* pEffectInfo = EffectFactory::GetEffectInfo(iEffectIndex);
+         if (!pEffectInfo)
+             throw Exception("There is no effect with index " + ToString(iEffectIndex));
+         // convert the filename into the correct encoding as defined for LSCP
+         // (especially in terms of special characters -> escape sequences)
+ #if WIN32
+         const String dllFileName = Path::fromWindows(pEffectInfo->Module()).toLscp();
+ #else
+         // assuming POSIX
+         const String dllFileName = Path::fromPosix(pEffectInfo->Module()).toLscp();
+ #endif
+         result.Add("SYSTEM", pEffectInfo->EffectSystem());
+         result.Add("MODULE", dllFileName);
+         result.Add("NAME", _escapeLscpResponse(pEffectInfo->Name()));
+         result.Add("DESCRIPTION", _escapeLscpResponse(pEffectInfo->Description()));
+     }
+     catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::GetEffectInstanceInfo(int iEffectInstance) {
+     dmsg(2,("LSCPServer: GetEffectInstanceInfo(%d)\n", iEffectInstance));
+     LSCPResultSet result;
+     try {
+         Effect* pEffect = EffectFactory::GetEffectInstanceByID(iEffectInstance);
+         if (!pEffect)
+             throw Exception("There is no effect instance with ID " + ToString(iEffectInstance));
+         EffectInfo* pEffectInfo = pEffect->GetEffectInfo();
+         // convert the filename into the correct encoding as defined for LSCP
+         // (especially in terms of special characters -> escape sequences)
+ #if WIN32
+         const String dllFileName = Path::fromWindows(pEffectInfo->Module()).toLscp();
+ #else
+         // assuming POSIX
+         const String dllFileName = Path::fromPosix(pEffectInfo->Module()).toLscp();
+ #endif
+         result.Add("SYSTEM", pEffectInfo->EffectSystem());
+         result.Add("MODULE", dllFileName);
+         result.Add("NAME", _escapeLscpResponse(pEffectInfo->Name()));
+         result.Add("DESCRIPTION", _escapeLscpResponse(pEffectInfo->Description()));
+         result.Add("INPUT_CONTROLS", ToString(pEffect->InputControlCount()));
+     }
+     catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::GetEffectInstanceInputControlInfo(int iEffectInstance, int iInputControlIndex) {
+     dmsg(2,("LSCPServer: GetEffectInstanceInputControlInfo(%d,%d)\n", iEffectInstance, iInputControlIndex));
+     LSCPResultSet result;
+     try {
+         Effect* pEffect = EffectFactory::GetEffectInstanceByID(iEffectInstance);
+         if (!pEffect)
+             throw Exception("There is no effect instance with ID " + ToString(iEffectInstance));
+         EffectControl* pEffectControl = pEffect->InputControl(iInputControlIndex);
+         if (!pEffectControl)
+             throw Exception(
+                 "Effect instance " + ToString(iEffectInstance) +
+                 " does not have an input control with index " +
+                 ToString(iInputControlIndex)
+             );
+         result.Add("DESCRIPTION", _escapeLscpResponse(pEffectControl->Description()));
+         result.Add("VALUE", pEffectControl->Value());
+         if (pEffectControl->MinValue())
+              result.Add("RANGE_MIN", *pEffectControl->MinValue());
+         if (pEffectControl->MaxValue())
+              result.Add("RANGE_MAX", *pEffectControl->MaxValue());
+         if (!pEffectControl->Possibilities().empty())
+              result.Add("POSSIBILITIES", pEffectControl->Possibilities());
+         if (pEffectControl->DefaultValue())
+              result.Add("DEFAULT", *pEffectControl->DefaultValue());
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::SetEffectInstanceInputControlValue(int iEffectInstance, int iInputControlIndex, double dValue) {
+     dmsg(2,("LSCPServer: SetEffectInstanceInputControlValue(%d,%d,%f)\n", iEffectInstance, iInputControlIndex, dValue));
+     LSCPResultSet result;
+     try {
+         Effect* pEffect = EffectFactory::GetEffectInstanceByID(iEffectInstance);
+         if (!pEffect)
+             throw Exception("There is no effect instance with ID " + ToString(iEffectInstance));
+         EffectControl* pEffectControl = pEffect->InputControl(iInputControlIndex);
+         if (!pEffectControl)
+             throw Exception(
+                 "Effect instance " + ToString(iEffectInstance) +
+                 " does not have an input control with index " +
+                 ToString(iInputControlIndex)
+             );
+         pEffectControl->SetValue(dValue);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_instance_info, iEffectInstance));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::CreateEffectInstance(int iEffectIndex) {
+     dmsg(2,("LSCPServer: CreateEffectInstance(%d)\n", iEffectIndex));
+     LSCPResultSet result;
+     try {
+         EffectInfo* pEffectInfo = EffectFactory::GetEffectInfo(iEffectIndex);
+         if (!pEffectInfo)
+             throw Exception("There is no effect with index " + ToString(iEffectIndex));
+         Effect* pEffect = EffectFactory::Create(pEffectInfo);
+         result = pEffect->ID(); // success
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_instance_count, EffectFactory::EffectInstancesCount()));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::CreateEffectInstance(String effectSystem, String module, String effectName) {
+     dmsg(2,("LSCPServer: CreateEffectInstance('%s','%s','%s')\n", effectSystem.c_str(), module.c_str(), effectName.c_str()));
+     LSCPResultSet result;
+     try {
+         // to allow loading the same LSCP session file on different systems
+         // successfully, probably with different effect plugin DLL paths or even
+         // running completely different operating systems, we do the following
+         // for finding the right effect:
+         //
+         // first try to search for an exact match of the effect plugin DLL
+         // (a.k.a 'module'), to avoid picking the wrong DLL with the same
+         // effect name ...
+         EffectInfo* pEffectInfo = EffectFactory::GetEffectInfo(effectSystem, module, effectName, EffectFactory::MODULE_MATCH_EXACTLY);
+         // ... if no effect with exactly matchin DLL filename was found, then
+         // try to lower the restrictions of matching the effect plugin DLL
+         // filename and try again and again ...
+         if (!pEffectInfo) {
+             dmsg(2,("no exact module match, trying MODULE_IGNORE_PATH\n"));
+             pEffectInfo = EffectFactory::GetEffectInfo(effectSystem, module, effectName, EffectFactory::MODULE_IGNORE_PATH);
+         }
+         if (!pEffectInfo) {
+             dmsg(2,("no module match, trying MODULE_IGNORE_PATH | MODULE_IGNORE_CASE\n"));
+             pEffectInfo = EffectFactory::GetEffectInfo(effectSystem, module, effectName, EffectFactory::MODULE_IGNORE_PATH | EffectFactory::MODULE_IGNORE_CASE);
+         }
+         if (!pEffectInfo) {
+             dmsg(2,("no module match, trying MODULE_IGNORE_PATH | MODULE_IGNORE_CASE | MODULE_IGNORE_EXTENSION\n"));
+             pEffectInfo = EffectFactory::GetEffectInfo(effectSystem, module, effectName, EffectFactory::MODULE_IGNORE_PATH | EffectFactory::MODULE_IGNORE_CASE | EffectFactory::MODULE_IGNORE_EXTENSION);
+         }
+         // ... if there was still no effect found, then completely ignore the
+         // DLL plugin filename argument and just search for the matching effect
+         // system type and effect name
+         if (!pEffectInfo) {
+             dmsg(2,("no module match, trying MODULE_IGNORE_ALL\n"));
+             pEffectInfo = EffectFactory::GetEffectInfo(effectSystem, module, effectName, EffectFactory::MODULE_IGNORE_ALL);
+         }
+         if (!pEffectInfo)
+             throw Exception("There is no such effect '" + effectSystem + "' '" + module + "' '" + effectName + "'");
+         Effect* pEffect = EffectFactory::Create(pEffectInfo);
+         result = LSCPResultSet(pEffect->ID());
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_instance_count, EffectFactory::EffectInstancesCount()));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::DestroyEffectInstance(int iEffectInstance) {
+     dmsg(2,("LSCPServer: DestroyEffectInstance(%d)\n", iEffectInstance));
+     LSCPResultSet result;
+     try {
+         Effect* pEffect = EffectFactory::GetEffectInstanceByID(iEffectInstance);
+         if (!pEffect)
+             throw Exception("There is no effect instance with ID " + ToString(iEffectInstance));
+         EffectFactory::Destroy(pEffect);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_instance_count, EffectFactory::EffectInstancesCount()));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::GetEffectInstances() {
+     dmsg(2,("LSCPServer: GetEffectInstances()\n"));
+     LSCPResultSet result;
+     try {
+         int n = EffectFactory::EffectInstancesCount();
+         result.Add(n);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::ListEffectInstances() {
+     dmsg(2,("LSCPServer: ListEffectInstances()\n"));
+     LSCPResultSet result;
+     String list;
+     try {
+         int n = EffectFactory::EffectInstancesCount();
+         for (int i = 0; i < n; i++) {
+             Effect* pEffect = EffectFactory::GetEffectInstance(i);
+             if (i) list += ",";
+             list += ToString(pEffect->ID());
+         }
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     result.Add(list);
+     return result.Produce();
+ }
+ String LSCPServer::GetSendEffectChains(int iAudioOutputDevice) {
+     dmsg(2,("LSCPServer: GetSendEffectChains(%d)\n", iAudioOutputDevice));
+     LSCPResultSet result;
+     try {
+         std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
+         if (!devices.count(iAudioOutputDevice))
+             throw Exception("There is no audio output device with index " + ToString(iAudioOutputDevice) + ".");
+         AudioOutputDevice* pDevice = devices[iAudioOutputDevice];
+         int n = pDevice->SendEffectChainCount();
+         result.Add(n);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::ListSendEffectChains(int iAudioOutputDevice) {
+     dmsg(2,("LSCPServer: ListSendEffectChains(%d)\n", iAudioOutputDevice));
+     LSCPResultSet result;
+     String list;
+     try {
+         std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
+         if (!devices.count(iAudioOutputDevice))
+             throw Exception("There is no audio output device with index " + ToString(iAudioOutputDevice) + ".");
+         AudioOutputDevice* pDevice = devices[iAudioOutputDevice];
+         int n = pDevice->SendEffectChainCount();
+         for (int i = 0; i < n; i++) {
+             EffectChain* pEffectChain = pDevice->SendEffectChain(i);
+             if (i) list += ",";
+             list += ToString(pEffectChain->ID());
+         }
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     result.Add(list);
+     return result.Produce();
+ }
+ String LSCPServer::AddSendEffectChain(int iAudioOutputDevice) {
+     dmsg(2,("LSCPServer: AddSendEffectChain(%d)\n", iAudioOutputDevice));
+     LSCPResultSet result;
+     try {
+         std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
+         if (!devices.count(iAudioOutputDevice))
+             throw Exception("There is no audio output device with index " + ToString(iAudioOutputDevice) + ".");
+         AudioOutputDevice* pDevice = devices[iAudioOutputDevice];
+         EffectChain* pEffectChain = pDevice->AddSendEffectChain();
+         result = pEffectChain->ID();
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_send_fx_chain_count, iAudioOutputDevice, pDevice->SendEffectChainCount()));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::RemoveSendEffectChain(int iAudioOutputDevice, int iSendEffectChain) {
+     dmsg(2,("LSCPServer: RemoveSendEffectChain(%d,%d)\n", iAudioOutputDevice, iSendEffectChain));
+     LSCPResultSet result;
+     try {
+         std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
+         if (!devices.count(iAudioOutputDevice))
+             throw Exception("There is no audio output device with index " + ToString(iAudioOutputDevice) + ".");
+         std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();
+         std::set<EngineChannel*>::iterator itEngineChannel = engineChannels.begin();
+         std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();
+         for (; itEngineChannel != itEnd; ++itEngineChannel) {
+             AudioOutputDevice* pDev = (*itEngineChannel)->GetAudioOutputDevice();
+             if (pDev != NULL && pDev->deviceId() == iAudioOutputDevice) {
+                 for (int i = 0; i < (*itEngineChannel)->GetFxSendCount(); i++) {
+                     FxSend* fxs = (*itEngineChannel)->GetFxSend(i);
+                     if(fxs != NULL && fxs->DestinationEffectChain() == iSendEffectChain) {
+                         throw Exception("The effect chain is still in use by channel " + ToString((*itEngineChannel)->GetSamplerChannel()->Index()));
+                     }
+                 }
+             }
+         }
+         AudioOutputDevice* pDevice = devices[iAudioOutputDevice];
+         for (int i = 0; i < pDevice->SendEffectChainCount(); i++) {
+             EffectChain* pEffectChain = pDevice->SendEffectChain(i);
+             if (pEffectChain->ID() == iSendEffectChain) {
+                 pDevice->RemoveSendEffectChain(i);
+                 LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_send_fx_chain_count, iAudioOutputDevice, pDevice->SendEffectChainCount()));
+                 return result.Produce();
+             }
+         }
+         throw Exception(
+             "There is no send effect chain with ID " +
+             ToString(iSendEffectChain) + " for audio output device " +
+             ToString(iAudioOutputDevice) + "."
+         );
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ static EffectChain* _getSendEffectChain(Sampler* pSampler, int iAudioOutputDevice, int iSendEffectChain) throw (Exception) {
+     std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
+     if (!devices.count(iAudioOutputDevice))
+         throw Exception(
+             "There is no audio output device with index " +
+             ToString(iAudioOutputDevice) + "."
+         );
+     AudioOutputDevice* pDevice = devices[iAudioOutputDevice];
+     EffectChain* pEffectChain = pDevice->SendEffectChainByID(iSendEffectChain);
+     if(pEffectChain != NULL) return pEffectChain;
+     throw Exception(
+         "There is no send effect chain with ID " +
+         ToString(iSendEffectChain) + " for audio output device " +
+         ToString(iAudioOutputDevice) + "."
+     );
+ }
+ String LSCPServer::GetSendEffectChainInfo(int iAudioOutputDevice, int iSendEffectChain) {
+     dmsg(2,("LSCPServer: GetSendEffectChainInfo(%d,%d)\n", iAudioOutputDevice, iSendEffectChain));
+     LSCPResultSet result;
+     try {
+         EffectChain* pEffectChain =
+             _getSendEffectChain(pSampler, iAudioOutputDevice, iSendEffectChain);
+         String sEffectSequence;
+         for (int i = 0; i < pEffectChain->EffectCount(); i++) {
+             if (i) sEffectSequence += ",";
+             sEffectSequence += ToString(pEffectChain->GetEffect(i)->ID());
+         }
+         result.Add("EFFECT_COUNT", pEffectChain->EffectCount());
+         result.Add("EFFECT_SEQUENCE", sEffectSequence);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::AppendSendEffectChainEffect(int iAudioOutputDevice, int iSendEffectChain, int iEffectInstance) {
+     dmsg(2,("LSCPServer: AppendSendEffectChainEffect(%d,%d,%d)\n", iAudioOutputDevice, iSendEffectChain, iEffectInstance));
+     LSCPResultSet result;
+     try {
+         EffectChain* pEffectChain =
+             _getSendEffectChain(pSampler, iAudioOutputDevice, iSendEffectChain);
+         Effect* pEffect = EffectFactory::GetEffectInstanceByID(iEffectInstance);
+         if (!pEffect)
+             throw Exception("There is no effect instance with ID " + ToString(iEffectInstance));
+         pEffectChain->AppendEffect(pEffect);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_send_fx_chain_info, iAudioOutputDevice, iSendEffectChain, pEffectChain->EffectCount()));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::InsertSendEffectChainEffect(int iAudioOutputDevice, int iSendEffectChain, int iEffectChainPosition, int iEffectInstance) {
+     dmsg(2,("LSCPServer: InsertSendEffectChainEffect(%d,%d,%d,%d)\n", iAudioOutputDevice, iSendEffectChain, iEffectChainPosition, iEffectInstance));
+     LSCPResultSet result;
+     try {
+         EffectChain* pEffectChain =
+             _getSendEffectChain(pSampler, iAudioOutputDevice, iSendEffectChain);
+         Effect* pEffect = EffectFactory::GetEffectInstanceByID(iEffectInstance);
+         if (!pEffect)
+             throw Exception("There is no effect instance with index " + ToString(iEffectInstance));
+         pEffectChain->InsertEffect(pEffect, iEffectChainPosition);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_send_fx_chain_info, iAudioOutputDevice, iSendEffectChain, pEffectChain->EffectCount()));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::RemoveSendEffectChainEffect(int iAudioOutputDevice, int iSendEffectChain, int iEffectChainPosition) {
+     dmsg(2,("LSCPServer: RemoveSendEffectChainEffect(%d,%d,%d)\n", iAudioOutputDevice, iSendEffectChain, iEffectChainPosition));
+     LSCPResultSet result;
+     try {
+         EffectChain* pEffectChain =
+             _getSendEffectChain(pSampler, iAudioOutputDevice, iSendEffectChain);
+         std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();
+         std::set<EngineChannel*>::iterator itEngineChannel = engineChannels.begin();
+         std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();
+         for (; itEngineChannel != itEnd; ++itEngineChannel) {
+             AudioOutputDevice* pDev = (*itEngineChannel)->GetAudioOutputDevice();
+             if (pDev != NULL && pDev->deviceId() == iAudioOutputDevice) {
+                 for (int i = 0; i < (*itEngineChannel)->GetFxSendCount(); i++) {
+                     FxSend* fxs = (*itEngineChannel)->GetFxSend(i);
+                     if(fxs != NULL && fxs->DestinationEffectChain() == iSendEffectChain && fxs->DestinationEffectChainPosition() == iEffectChainPosition) {
+                         throw Exception("The effect instance is still in use by channel " + ToString((*itEngineChannel)->GetSamplerChannel()->Index()));
+                     }
+                 }
+             }
+         }
+         pEffectChain->RemoveEffect(iEffectChainPosition);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_send_fx_chain_info, iAudioOutputDevice, iSendEffectChain, pEffectChain->EffectCount()));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
  String LSCPServer::EditSamplerChannelInstrument(uint uiSamplerChannel) {
      dmsg(2,("LSCPServer: EditSamplerChannelInstrument(SamplerChannel=%d)\n", uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          if (pEngineChannel->InstrumentStatus() < 0) throw Exception("No instrument loaded to sampler channel");
          Engine* pEngine = pEngineChannel->GetEngine();
          InstrumentManager* pInstrumentManager = pEngine->GetInstrumentManager();
-Line 2295 
 String LSCPServer::EditSamplerChannelIns
+Line 3043 
 String LSCPServer::EditSamplerChannelIns
      return result.Produce();
  }
+ String LSCPServer::SendChannelMidiData(String MidiMsg, uint uiSamplerChannel, uint Arg1, uint Arg2) {
+     dmsg(2,("LSCPServer: SendChannelMidiData(MidiMsg=%s,uiSamplerChannel=%d,Arg1=%d,Arg2=%d)\n", MidiMsg.c_str(), uiSamplerChannel, Arg1, Arg2));
+     LSCPResultSet result;
+     try {
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
+         if (Arg1 > 127 || Arg2 > 127) {
+             throw Exception("Invalid MIDI message");
+         }
+         VirtualMidiDevice* pMidiDevice = NULL;
+         std::vector<EventHandler::midi_listener_entry>::iterator iter = eventHandler.channelMidiListeners.begin();
+         for (; iter != eventHandler.channelMidiListeners.end(); ++iter) {
+             if ((*iter).pEngineChannel == pEngineChannel) {
+                 pMidiDevice = (*iter).pMidiListener;
+                 break;
+             }
+         }
+         if(pMidiDevice == NULL) throw Exception("Couldn't find virtual MIDI device");
+         if (MidiMsg == "NOTE_ON") {
+             pMidiDevice->SendNoteOnToDevice(Arg1, Arg2);
+             bool b = pMidiDevice->SendNoteOnToSampler(Arg1, Arg2);
+             if (!b) throw Exception("MIDI event failed: " + MidiMsg + " " + ToString(Arg1) + " " + ToString(Arg2));
+         } else if (MidiMsg == "NOTE_OFF") {
+             pMidiDevice->SendNoteOffToDevice(Arg1, Arg2);
+             bool b = pMidiDevice->SendNoteOffToSampler(Arg1, Arg2);
+             if (!b) throw Exception("MIDI event failed: " + MidiMsg + " " + ToString(Arg1) + " " + ToString(Arg2));
+         } else if (MidiMsg == "CC") {
+             pMidiDevice->SendCCToDevice(Arg1, Arg2);
+             bool b = pMidiDevice->SendCCToSampler(Arg1, Arg2);
+             if (!b) throw Exception("MIDI event failed: " + MidiMsg + " " + ToString(Arg1) + " " + ToString(Arg2));
+         } else {
+             throw Exception("Unknown MIDI message type: " + MidiMsg);
+         }
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
  /**
   * Will be called by the parser to reset a particular sampler channel.
   */
-Line 2302 
 String LSCPServer::ResetChannel(uint uiS
+Line 3092 
 String LSCPServer::ResetChannel(uint uiS
      dmsg(2,("LSCPServer: ResetChannel(SamplerChannel=%d)\n", uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          pEngineChannel->Reset();
      }
      catch (Exception e) {
-Line 2346 
 String LSCPServer::GetServerInfo() {
+Line 3133 
 String LSCPServer::GetServerInfo() {
  }
  /**
+  * Will be called by the parser to return the current number of all active streams.
+  */
+ String LSCPServer::GetTotalStreamCount() {
+     dmsg(2,("LSCPServer: GetTotalStreamCount()\n"));
+     LSCPResultSet result;
+     result.Add(pSampler->GetDiskStreamCount());
+     return result.Produce();
+ }
+ /**
   * Will be called by the parser to return the current number of all active voices.
   */
  String LSCPServer::GetTotalVoiceCount() {
-Line 2361 
 String LSCPServer::GetTotalVoiceCount()
+Line 3158 
 String LSCPServer::GetTotalVoiceCount()
  String LSCPServer::GetTotalVoiceCountMax() {
      dmsg(2,("LSCPServer: GetTotalVoiceCountMax()\n"));
      LSCPResultSet result;
-     result.Add(EngineFactory::EngineInstances().size() * CONFIG_MAX_VOICES);
+     result.Add(EngineFactory::EngineInstances().size() * pSampler->GetGlobalMaxVoices());
+     return result.Produce();
+ }
+ /**
+  * Will be called by the parser to return the sampler global maximum
+  * allowed number of voices.
+  */
+ String LSCPServer::GetGlobalMaxVoices() {
+     dmsg(2,("LSCPServer: GetGlobalMaxVoices()\n"));
+     LSCPResultSet result;
+     result.Add(pSampler->GetGlobalMaxVoices());
+     return result.Produce();
+ }
+ /**
+  * Will be called by the parser to set the sampler global maximum number of
+  * voices.
+  */
+ String LSCPServer::SetGlobalMaxVoices(int iVoices) {
+     dmsg(2,("LSCPServer: SetGlobalMaxVoices(%d)\n", iVoices));
+     LSCPResultSet result;
+     try {
+         pSampler->SetGlobalMaxVoices(iVoices);
+         LSCPServer::SendLSCPNotify(
+             LSCPEvent(LSCPEvent::event_global_info, "VOICES", pSampler->GetGlobalMaxVoices())
+         );
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ /**
+  * Will be called by the parser to return the sampler global maximum
+  * allowed number of disk streams.
+  */
+ String LSCPServer::GetGlobalMaxStreams() {
+     dmsg(2,("LSCPServer: GetGlobalMaxStreams()\n"));
+     LSCPResultSet result;
+     result.Add(pSampler->GetGlobalMaxStreams());
+     return result.Produce();
+ }
+ /**
+  * Will be called by the parser to set the sampler global maximum number of
+  * disk streams.
+  */
+ String LSCPServer::SetGlobalMaxStreams(int iStreams) {
+     dmsg(2,("LSCPServer: SetGlobalMaxStreams(%d)\n", iStreams));
+     LSCPResultSet result;
+     try {
+         pSampler->SetGlobalMaxStreams(iStreams);
+         LSCPServer::SendLSCPNotify(
+             LSCPEvent(LSCPEvent::event_global_info, "STREAMS", pSampler->GetGlobalMaxStreams())
+         );
+     } catch (Exception e) {
+         result.Error(e);
+     }
      return result.Produce();
  }
-Line 2375 
 String LSCPServer::SetGlobalVolume(doubl
+Line 3230 
 String LSCPServer::SetGlobalVolume(doubl
      LSCPResultSet result;
      try {
          if (dVolume < 0) throw Exception("Volume may not be negative");
-         GLOBAL_VOLUME = dVolume; // see common/global.cpp
+         GLOBAL_VOLUME = dVolume; // see common/global_private.cpp
          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "VOLUME", GLOBAL_VOLUME));
      } catch (Exception e) {
          result.Error(e);
-Line 2384 
 String LSCPServer::SetGlobalVolume(doubl
+Line 3239 
 String LSCPServer::SetGlobalVolume(doubl
  }
  String LSCPServer::GetFileInstruments(String Filename) {
+     dmsg(2,("LSCPServer: GetFileInstruments(String Filename=%s)\n",Filename.c_str()));
      LSCPResultSet result;
+     try {
+         VerifyFile(Filename);
+     } catch (Exception e) {
+         result.Error(e);
+         return result.Produce();
+     }
      // try to find a sampler engine that can handle the file
      bool bFound = false;
      std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
-Line 2407 
 String LSCPServer::GetFileInstruments(St
+Line 3269 
 String LSCPServer::GetFileInstruments(St
          }
          if (pEngine) EngineFactory::Destroy(pEngine);
      }
+     if (!bFound) result.Error("Unknown file format");
      return result.Produce();
  }
  String LSCPServer::ListFileInstruments(String Filename) {
+     dmsg(2,("LSCPServer: ListFileInstruments(String Filename=%s)\n",Filename.c_str()));
      LSCPResultSet result;
+     try {
+         VerifyFile(Filename);
+     } catch (Exception e) {
+         result.Error(e);
+         return result.Produce();
+     }
      // try to find a sampler engine that can handle the file
      bool bFound = false;
      std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
-Line 2439 
 String LSCPServer::ListFileInstruments(S
+Line 3310 
 String LSCPServer::ListFileInstruments(S
          }
          if (pEngine) EngineFactory::Destroy(pEngine);
      }
+     if (!bFound) result.Error("Unknown file format");
      return result.Produce();
  }
  String LSCPServer::GetFileInstrumentInfo(String Filename, uint InstrumentID) {
+     dmsg(2,("LSCPServer: GetFileInstrumentInfo(String Filename=%s, InstrumentID=%d)\n",Filename.c_str(),InstrumentID));
      LSCPResultSet result;
+     try {
+         VerifyFile(Filename);
+     } catch (Exception e) {
+         result.Error(e);
+         return result.Produce();
+     }
      InstrumentManager::instrument_id_t id;
      id.FileName = Filename;
      id.Index    = InstrumentID;
      // try to find a sampler engine that can handle the file
      bool bFound = false;
+     bool bFatalErr = false;
      std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
-     for (int i = 0; !bFound && i < engineTypes.size(); i++) {
+     for (int i = 0; !bFound && !bFatalErr && i < engineTypes.size(); i++) {
          Engine* pEngine = NULL;
          try {
              pEngine = EngineFactory::Create(engineTypes[i]);
              if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
              InstrumentManager* pManager = pEngine->GetInstrumentManager();
              if (pManager) {
+                 // check if the instrument index is valid
+                 // FIXME: this won't work if an engine only supports parts of the instrument file
+                 std::vector<InstrumentManager::instrument_id_t> IDs =
+                     pManager->GetInstrumentFileContent(Filename);
+                 if (std::find(IDs.begin(), IDs.end(), id) == IDs.end()) {
+                     std::stringstream ss;
+                     ss << "Invalid instrument index " << InstrumentID << " for instrument file '" << Filename << "'";
+                     bFatalErr = true;
+                     throw Exception(ss.str());
+                 }
+                 // get the info of the requested instrument
                  InstrumentManager::instrument_info_t info =
                      pManager->GetInstrumentInfo(id);
                  // return detailed informations about the file
                  result.Add("NAME", info.InstrumentName);
-                 result.Add("FORMAT_NAME", engineTypes[i]);
+                 result.Add("FORMAT_FAMILY", engineTypes[i]);
                  result.Add("FORMAT_VERSION", info.FormatVersion);
                  result.Add("PRODUCT", info.Product);
                  result.Add("ARTISTS", info.Artists);
+                 std::stringstream ss;
+                 bool b = false;
+                 for (int i = 0; i < 128; i++) {
+                     if (info.KeyBindings[i]) {
+                         if (b) ss << ',';
+                         ss << i; b = true;
+                     }
+                 }
+                 result.Add("KEY_BINDINGS", ss.str());
+                 b = false;
+                 std::stringstream ss2;
+                 for (int i = 0; i < 128; i++) {
+                     if (info.KeySwitchBindings[i]) {
+                         if (b) ss2 << ',';
+                         ss2 << i; b = true;
+                     }
+                 }
+                 result.Add("KEYSWITCH_BINDINGS", ss2.str());
                  // no more need to ask other engine types
                  bFound = true;
              } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
          } catch (Exception e) {
-             // NOOP, as exception is thrown if engine doesn't support file
+             // usually NOOP, as exception is thrown if engine doesn't support file
+             if (bFatalErr) result.Error(e);
          }
          if (pEngine) EngineFactory::Destroy(pEngine);
      }
+     if (!bFound && !bFatalErr) result.Error("Unknown file format");
      return result.Produce();
  }
+ void LSCPServer::VerifyFile(String Filename) {
+     #if WIN32
+     WIN32_FIND_DATA win32FileAttributeData;
+     BOOL res = GetFileAttributesEx( Filename.c_str(), GetFileExInfoStandard, &win32FileAttributeData );
+     if (!res) {
+         std::stringstream ss;
+         ss << "File does not exist, GetFileAttributesEx failed `" << Filename << "`: Error " << GetLastError();
+         throw Exception(ss.str());
+     }
+     if ( win32FileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) {
+         throw Exception("Directory is specified");
+     }
+     #else
+     File f(Filename);
+     if(!f.Exist()) throw Exception(f.GetErrorMsg());
+     if (f.IsDirectory()) throw Exception("Directory is specified");
+     #endif
+ }
  /**
   * Will be called by the parser to subscribe a client (frontend) on the
   * server for receiving event messages.
-Line 2483 
 String LSCPServer::GetFileInstrumentInfo
+Line 3417 
 String LSCPServer::GetFileInstrumentInfo
  String LSCPServer::SubscribeNotification(LSCPEvent::event_t type) {
      dmsg(2,("LSCPServer: SubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
      LSCPResultSet result;
-     SubscriptionMutex.Lock();
+     {
-     eventSubscriptions[type].push_back(currentSocket);
+         LockGuard lock(SubscriptionMutex);
-     SubscriptionMutex.Unlock();
+         eventSubscriptions[type].push_back(currentSocket);
+     }
      return result.Produce();
  }
-Line 2496 
 String LSCPServer::SubscribeNotification
+Line 3431 
 String LSCPServer::SubscribeNotification
  String LSCPServer::UnsubscribeNotification(LSCPEvent::event_t type) {
      dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
      LSCPResultSet result;
-     SubscriptionMutex.Lock();
+     {
-     eventSubscriptions[type].remove(currentSocket);
+         LockGuard lock(SubscriptionMutex);
-     SubscriptionMutex.Unlock();
+         eventSubscriptions[type].remove(currentSocket);
+     }
      return result.Produce();
  }
-Line 2667 
 String LSCPServer::AddDbInstruments(Stri
+Line 3603 
 String LSCPServer::AddDbInstruments(Stri
      return result.Produce();
  }
- String LSCPServer::AddDbInstruments(String ScanMode, String DbDir, String FsDir, bool bBackground) {
+ String LSCPServer::AddDbInstruments(String ScanMode, String DbDir, String FsDir, bool bBackground, bool insDir) {
-     dmsg(2,("LSCPServer: AddDbInstruments(ScanMode=%s,DbDir=%s,FsDir=%s,bBackground=%d)\n", ScanMode.c_str(), DbDir.c_str(), FsDir.c_str(), bBackground));
+     dmsg(2,("LSCPServer: AddDbInstruments(ScanMode=%s,DbDir=%s,FsDir=%s,bBackground=%d,insDir=%d)\n", ScanMode.c_str(), DbDir.c_str(), FsDir.c_str(), bBackground, insDir));
      LSCPResultSet result;
  #if HAVE_SQLITE3
      try {
          int id;
          InstrumentsDb* db = InstrumentsDb::GetInstrumentsDb();
          if (ScanMode.compare("RECURSIVE") == 0) {
-            id = db->AddInstruments(RECURSIVE, DbDir, FsDir, bBackground);
+             id = db->AddInstruments(RECURSIVE, DbDir, FsDir, bBackground, insDir);
          } else if (ScanMode.compare("NON_RECURSIVE") == 0) {
-            id = db->AddInstruments(NON_RECURSIVE, DbDir, FsDir, bBackground);
+             id = db->AddInstruments(NON_RECURSIVE, DbDir, FsDir, bBackground, insDir);
          } else if (ScanMode.compare("FLAT") == 0) {
-            id = db->AddInstruments(FLAT, DbDir, FsDir, bBackground);
+             id = db->AddInstruments(FLAT, DbDir, FsDir, bBackground, insDir);
          } else {
              throw Exception("Unknown scan mode: " + ScanMode);
          }
-Line 2855 
 String LSCPServer::SetDbInstrumentDescri
+Line 3791 
 String LSCPServer::SetDbInstrumentDescri
      return result.Produce();
  }
+ String LSCPServer::SetDbInstrumentFilePath(String OldPath, String NewPath) {
+     dmsg(2,("LSCPServer: SetDbInstrumentFilePath(OldPath=%s,NewPath=%s)\n", OldPath.c_str(), NewPath.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->SetInstrumentFilePath(OldPath, NewPath);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::FindLostDbInstrumentFiles() {
+     dmsg(2,("LSCPServer: FindLostDbInstrumentFiles()\n"));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         String list;
+         StringListPtr pLostFiles = InstrumentsDb::GetInstrumentsDb()->FindLostInstrumentFiles();
+         for (int i = 0; i < pLostFiles->size(); i++) {
+             if (list != "") list += ",";
+             list += "'" + pLostFiles->at(i) + "'";
+         }
+         result.Add(list);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
  String LSCPServer::FindDbInstrumentDirectories(String Dir, std::map<String,String> Parameters, bool Recursive) {
      dmsg(2,("LSCPServer: FindDbInstrumentDirectories(Dir=%s)\n", Dir.c_str()));
      LSCPResultSet result;
-Line 2985 
 String LSCPServer::SetEcho(yyparse_param
+Line 3959 
 String LSCPServer::SetEcho(yyparse_param
      }
      return result.Produce();
  }
+ }

 Legend:



Removed from v.1525
 


changed lines


 
Added in v.2500
 Legend:



Removed from v.1525
 


changed lines


 
Added in v.2500
-Removed from v.1525
+Added in v.2500

	ViewVC Help
Powered by ViewVC