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

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

Parent Directory | Revision Log | View Patch Patch

-revision 778 by iliev,
Fri Sep 23 06:58:26 2005 UTC
+revision 1649 by nagata,
Fri Jan 25 15:06:02 2008 UTC
 Line 3
   *   LinuxSampler - modular, streaming capable sampler                     *
   *                                                                         *
   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
-  *   Copyright (C) 2005 Christian Schoenebeck                              *
+  *   Copyright (C) 2005 - 2007 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 24
  #include "lscpserver.h"
  #include "lscpresultset.h"
  #include "lscpevent.h"
- //#include "../common/global.h"
+ #if defined(WIN32)
+ #include <windows.h>
+ #else
  #include <fcntl.h>
+ #endif
- #if HAVE_SQLITE3
+ #if ! HAVE_SQLITE3
- # include "sqlite3.h"
+ #define DOESNT_HAVE_SQLITE3 "No database support. SQLITE3 was not installed when linuxsampler was built."
  #endif
  #include "../engines/EngineFactory.h"
-Line 37
+Line 40
  #include "../drivers/audio/AudioOutputDeviceFactory.h"
  #include "../drivers/midi/MidiInputDeviceFactory.h"
+ /**
+  * Returns a copy of the given string where all special characters are
+  * replaced by LSCP escape sequences ("\xHH"). This function shall be used
+  * to escape LSCP response fields in case the respective response field is
+  * actually defined as using escape sequences in the LSCP specs.
+  *
+  * @e Caution: DO NOT use this function for escaping path based responses,
+  * use the Path class (src/common/Path.h) for this instead!
+  */
+ static String _escapeLscpResponse(String txt) {
+     for (int i = 0; i < txt.length(); i++) {
+         const char c = txt.c_str()[i];
+         if (
+             !(c >= '0' && c <= '9') &&
+             !(c >= 'a' && c <= 'z') &&
+             !(c >= 'A' && c <= 'Z') &&
+             !(c == ' ') && !(c == '!') && !(c == '#') && !(c == '$') &&
+             !(c == '%') && !(c == '&') && !(c == '(') && !(c == ')') &&
+             !(c == '*') && !(c == '+') && !(c == ',') && !(c == '-') &&
+             !(c == '.') && !(c == '/') && !(c == ':') && !(c == ';') &&
+             !(c == '<') && !(c == '=') && !(c == '>') && !(c == '?') &&
+             !(c == '@') && !(c == '[') && !(c == ']') &&
+             !(c == '^') && !(c == '_') && !(c == '`') && !(c == '{') &&
+             !(c == '|') && !(c == '}') && !(c == '~')
+         ) {
+             // convert the "special" character into a "\xHH" LSCP escape sequence
+             char buf[5];
+             snprintf(buf, sizeof(buf), "\\x%02x", static_cast<unsigned char>(c));
+             txt.replace(i, 1, buf);
+             i += 3;
+         }
+     }
+     return txt;
+ }
  /**
   * Below are a few static members of the LSCPServer class.
   * The big assumption here is that LSCPServer is going to remain a singleton.
-Line 53
+Line 92
  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>::iterator itCurrentSession = std::vector<yyparse_param_t>::iterator();
  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();
  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();
  std::map< LSCPEvent::event_t, std::list<int> > LSCPServer::eventSubscriptions = std::map< LSCPEvent::event_t, std::list<int> >();
-Line 66 
 LSCPServer::LSCPServer(Sampler* pSampler
+Line 106 
 LSCPServer::LSCPServer(Sampler* pSampler
      SocketAddress.sin_addr.s_addr = addr;
      SocketAddress.sin_port        = port;
      this->pSampler = pSampler;
+     LSCPEvent::RegisterEvent(LSCPEvent::event_audio_device_count, "AUDIO_OUTPUT_DEVICE_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_audio_device_info, "AUDIO_OUTPUT_DEVICE_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_midi_device_count, "MIDI_INPUT_DEVICE_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_midi_device_info, "MIDI_INPUT_DEVICE_INFO");
      LSCPEvent::RegisterEvent(LSCPEvent::event_channel_count, "CHANNEL_COUNT");
      LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT");
      LSCPEvent::RegisterEvent(LSCPEvent::event_stream_count, "STREAM_COUNT");
      LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL");
      LSCPEvent::RegisterEvent(LSCPEvent::event_channel_info, "CHANNEL_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_fx_send_count, "FX_SEND_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_fx_send_info, "FX_SEND_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_midi_instr_map_count, "MIDI_INSTRUMENT_MAP_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_midi_instr_map_info, "MIDI_INSTRUMENT_MAP_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_midi_instr_count, "MIDI_INSTRUMENT_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_midi_instr_info, "MIDI_INSTRUMENT_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_dir_count, "DB_INSTRUMENT_DIRECTORY_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_dir_info, "DB_INSTRUMENT_DIRECTORY_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_count, "DB_INSTRUMENT_COUNT");
+     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");
      hSocket = -1;
  }
  LSCPServer::~LSCPServer() {
+ #if defined(WIN32)
+     if (hSocket >= 0) closesocket(hSocket);
+ #else
      if (hSocket >= 0) close(hSocket);
+ #endif
+ }
+ void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, NewCount));
+ }
+ void LSCPServer::EventHandler::AudioDeviceCountChanged(int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_audio_device_count, NewCount));
+ }
+ void LSCPServer::EventHandler::MidiDeviceCountChanged(int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_device_count, NewCount));
+ }
+ void LSCPServer::EventHandler::MidiInstrumentCountChanged(int MapId, int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_count, MapId, NewCount));
+ }
+ void LSCPServer::EventHandler::MidiInstrumentInfoChanged(int MapId, int Bank, int Program) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_info, MapId, Bank, Program));
+ }
+ void LSCPServer::EventHandler::MidiInstrumentMapCountChanged(int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_map_count, NewCount));
+ }
+ void LSCPServer::EventHandler::MidiInstrumentMapInfoChanged(int MapId) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_map_info, MapId));
+ }
+ void LSCPServer::EventHandler::FxSendCountChanged(int ChannelId, int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_count, ChannelId, NewCount));
+ }
+ void LSCPServer::EventHandler::VoiceCountChanged(int ChannelId, int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_voice_count, ChannelId, NewCount));
+ }
+ void LSCPServer::EventHandler::StreamCountChanged(int ChannelId, int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_stream_count, ChannelId, NewCount));
+ }
+ void LSCPServer::EventHandler::BufferFillChanged(int ChannelId, String FillData) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_buffer_fill, ChannelId, FillData));
+ }
+ void LSCPServer::EventHandler::TotalVoiceCountChanged(int NewCount) {
+     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)));
+ }
+ void LSCPServer::DbInstrumentsEventHandler::DirectoryInfoChanged(String Dir) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, InstrumentsDb::toEscapedPath(Dir)));
  }
+ void LSCPServer::DbInstrumentsEventHandler::DirectoryNameChanged(String Dir, String NewName) {
+     Dir = "'" + InstrumentsDb::toEscapedPath(Dir) + "'";
+     NewName = "'" + InstrumentsDb::toEscapedPath(NewName) + "'";
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, "NAME", Dir, NewName));
+ }
+ void LSCPServer::DbInstrumentsEventHandler::InstrumentCountChanged(String Dir) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_count, InstrumentsDb::toEscapedPath(Dir)));
+ }
+ void LSCPServer::DbInstrumentsEventHandler::InstrumentInfoChanged(String Instr) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, InstrumentsDb::toEscapedPath(Instr)));
+ }
+ void LSCPServer::DbInstrumentsEventHandler::InstrumentNameChanged(String Instr, String NewName) {
+     Instr = "'" + InstrumentsDb::toEscapedPath(Instr) + "'";
+     NewName = "'" + InstrumentsDb::toEscapedPath(NewName) + "'";
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, "NAME", Instr, NewName));
+ }
+ void LSCPServer::DbInstrumentsEventHandler::JobStatusChanged(int JobId) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instrs_job_info, JobId));
+ }
+ #endif // HAVE_SQLITE3
  /**
   * Blocks the calling thread until the LSCP Server is initialized and
   * accepting socket connections, if the server is already initialized then
-Line 95 
 int LSCPServer::WaitUntilInitialized(lon
+Line 243 
 int LSCPServer::WaitUntilInitialized(lon
  }
  int LSCPServer::Main() {
+         #if defined(WIN32)
+         WSADATA wsaData;
+         int iResult;
+         iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
+         if (iResult != 0) {
+                 std::cerr << "LSCPServer: WSAStartup failed: " << iResult << "\n";
+                 exit(EXIT_FAILURE);
+         }
+         #endif
      hSocket = socket(AF_INET, SOCK_STREAM, 0);
      if (hSocket < 0) {
          std::cerr << "LSCPServer: Could not create server socket." << std::endl;
-Line 108 
 int LSCPServer::Main() {
+Line 265 
 int LSCPServer::Main() {
              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {
                      std::cerr << "gave up!" << std::endl;
+                     #if defined(WIN32)
+                     closesocket(hSocket);
+                     #else
                      close(hSocket);
+                     #endif
                      //return -1;
                      exit(EXIT_FAILURE);
                  }
-Line 121 
 int LSCPServer::Main() {
+Line 282 
 int LSCPServer::Main() {
      listen(hSocket, 1);
      Initialized.Set(true);
+     // Registering event listeners
+     pSampler->AddChannelCountListener(&eventHandler);
+     pSampler->AddAudioDeviceCountListener(&eventHandler);
+     pSampler->AddMidiDeviceCountListener(&eventHandler);
+     pSampler->AddVoiceCountListener(&eventHandler);
+     pSampler->AddStreamCountListener(&eventHandler);
+     pSampler->AddBufferFillListener(&eventHandler);
+     pSampler->AddTotalStreamCountListener(&eventHandler);
+     pSampler->AddTotalVoiceCountListener(&eventHandler);
+     pSampler->AddFxSendCountListener(&eventHandler);
+     MidiInstrumentMapper::AddMidiInstrumentCountListener(&eventHandler);
+     MidiInstrumentMapper::AddMidiInstrumentInfoListener(&eventHandler);
+     MidiInstrumentMapper::AddMidiInstrumentMapCountListener(&eventHandler);
+     MidiInstrumentMapper::AddMidiInstrumentMapInfoListener(&eventHandler);
+ #if HAVE_SQLITE3
+     InstrumentsDb::GetInstrumentsDb()->AddInstrumentsDbListener(&dbInstrumentsEventHandler);
+ #endif
      // now wait for client connections and handle their requests
      sockaddr_in client;
      int length = sizeof(client);
-Line 128 
 int LSCPServer::Main() {
+Line 306 
 int LSCPServer::Main() {
      FD_SET(hSocket, &fdSet);
      int maxSessions = hSocket;
+     timeval timeout;
      while (true) {
-         fd_set selectSet = fdSet;
+         #if CONFIG_PTHREAD_TESTCANCEL
-         int retval = select(maxSessions+1, &selectSet, NULL, NULL, NULL);
+                 TestCancel();
+         #endif
+         // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers
+         {
+             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));
+                 }
+                 for (int i = 0; i < (*itEngineChannel)->GetFxSendCount(); i++) {
+                     FxSend* fxs = (*itEngineChannel)->GetFxSend(i);
+                     if(fxs != NULL && fxs->IsInfoChanged()) {
+                         int chn = (*itEngineChannel)->iSamplerChannelIndex;
+                         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, chn, fxs->Id()));
+                         fxs->SetInfoChanged(false);
+                     }
+                 }
+             }
+         }
+         //Now let's deliver late notifies (if any)
+         NotifyBufferMutex.Lock();
+         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();
+         NotifyBufferMutex.Unlock();
+         fd_set selectSet = fdSet;
+         timeout.tv_sec  = 0;
+         timeout.tv_usec = 100000;
+         int retval = select(maxSessions+1, &selectSet, NULL, NULL, &timeout);
          if (retval == 0)
                  continue; //Nothing try again
          if (retval == -1) {
                  std::cerr << "LSCPServer: Socket select error." << std::endl;
+                 #if defined(WIN32)
+                 closesocket(hSocket);
+                 #else
                  close(hSocket);
+                 #endif
                  exit(EXIT_FAILURE);
          }
-Line 147 
 int LSCPServer::Main() {
+Line 371 
 int LSCPServer::Main() {
                          exit(EXIT_FAILURE);
                  }
+                 #if defined(WIN32)
+                 u_long nonblock_io = 1;
+                 if( ioctlsocket(socket, FIONBIO, &nonblock_io) ) {
+                   std::cerr << "LSCPServer: ioctlsocket: set FIONBIO failed. Error " << WSAGetLastError() << std::endl;
+                   exit(EXIT_FAILURE);
+                 }
+         #else
                  if (fcntl(socket, F_SETFL, O_NONBLOCK)) {
                          std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;
                          exit(EXIT_FAILURE);
                  }
+                 #endif
                  // Parser initialization
                  yyparse_param_t yyparse_param;
-Line 174 
 int LSCPServer::Main() {
+Line 406 
 int LSCPServer::Main() {
                                  int dummy; // just a temporary hack to fulfill the restart() function prototype
                                  restart(NULL, dummy); // restart the 'scanner'
                                  currentSocket = (*iter).hSession;  //a hack
+                                 itCurrentSession = iter; // another hack
                                  dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));
                                  if ((*iter).bVerbose) { // if echo mode enabled
                                      AnswerClient(bufferedCommands[currentSocket]);
                                  }
                                  int result = yyparse(&(*iter));
                                  currentSocket = -1;     //continuation of a hack
+                                 itCurrentSession = Sessions.end(); // hack as well
                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?
                                          CloseConnection(iter);
-Line 190 
 int LSCPServer::Main() {
+Line 424 
 int LSCPServer::Main() {
                          break;
                  }
          }
-         // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers
-         {
-             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));
-                 }
-             }
-         }
-         //Now let's deliver late notifies (if any)
-         NotifyBufferMutex.Lock();
-         for (std::map<int,String>::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) {
-                 send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), MSG_NOSIGNAL);
-                 bufferedNotifies.erase(iterNotify);
-         }
-         NotifyBufferMutex.Unlock();
      }
  }
-Line 227 
 void LSCPServer::CloseConnection( std::v
+Line 441 
 void LSCPServer::CloseConnection( std::v
          NotifyMutex.Lock();
          bufferedCommands.erase(socket);
          bufferedNotifies.erase(socket);
+         #if defined(WIN32)
+         closesocket(socket);
+         #else
          close(socket);
+         #endif
          NotifyMutex.Unlock();
  }
+ void LSCPServer::LockRTNotify() {
+     RTNotifyMutex.Lock();
+ }
+ void LSCPServer::UnlockRTNotify() {
+     RTNotifyMutex.Unlock();
+ }
  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {
          int subs = 0;
          SubscriptionMutex.Lock();
-Line 256 
 void LSCPServer::SendLSCPNotify( LSCPEve
+Line 482 
 void LSCPServer::SendLSCPNotify( LSCPEve
          while (true) {
                  if (NotifyMutex.Trylock()) {
                          for(;iter != end; iter++)
+ #ifdef MSG_NOSIGNAL
                                  send(*iter, notify.c_str(), notify.size(), MSG_NOSIGNAL);
+ #else
+                                 send(*iter, notify.c_str(), notify.size(), 0);
+ #endif
                          NotifyMutex.Unlock();
                          break;
                  } else {
-Line 288 
 extern int GetLSCPCommand( void *buf, in
+Line 518 
 extern int GetLSCPCommand( void *buf, in
          return command.size();
  }
+ extern yyparse_param_t* GetCurrentYaccSession() {
+     return &(*itCurrentSession);
+ }
  /**
   * Will be called to try to read the command from the socket
   * If command is read, it will return true. Otherwise false is returned.
-Line 298 
 bool LSCPServer::GetLSCPCommand( std::ve
+Line 532 
 bool LSCPServer::GetLSCPCommand( std::ve
          char c;
          int i = 0;
          while (true) {
+                 #if defined(WIN32)
+                 int result = recv(socket, (char *)&c, 1, 0); //Read one character at a time for now
+                 #else
                  int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now
+                 #endif
                  if (result == 0) { //socket was selected, so 0 here means client has closed the connection
                          CloseConnection(iter);
                          break;
-Line 308 
 bool LSCPServer::GetLSCPCommand( std::ve
+Line 546 
 bool LSCPServer::GetLSCPCommand( std::ve
                                  continue; //Ignore CR
                          if (c == '\n') {
                                  LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));
-                                 bufferedCommands[socket] += "\n";
+                                 bufferedCommands[socket] += "\r\n";
                                  return true; //Complete command was read
                          }
                          bufferedCommands[socket] += c;
                  }
+                 #if defined(WIN32)
+                 if (result == SOCKET_ERROR) {
+                     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;
+                 }
+                 #else
                  if (result == -1) {
                          if (errno == EAGAIN) //Would block, try again later.
                                  return false;
-Line 351 
 bool LSCPServer::GetLSCPCommand( std::ve
+Line 599 
 bool LSCPServer::GetLSCPCommand( std::ve
                          CloseConnection(iter);
                          break;
                  }
+                 #endif
          }
          return false;
  }
-Line 365 
 void LSCPServer::AnswerClient(String Ret
+Line 614 
 void LSCPServer::AnswerClient(String Ret
      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));
      if (currentSocket != -1) {
              NotifyMutex.Lock();
+ #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 409 
 String LSCPServer::CreateAudioOutputDevi
+Line 662 
 String LSCPServer::CreateAudioOutputDevi
          AudioOutputDevice* pDevice = pSampler->CreateAudioOutputDevice(Driver, Parameters);
          // search for the created device to get its index
          int index = GetAudioOutputDeviceIndex(pDevice);
-         if (index == -1) throw LinuxSamplerException("Internal error: could not find created audio output device.");
+         if (index == -1) throw Exception("Internal error: could not find created audio output device.");
          result = index; // success
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 425 
 String LSCPServer::CreateMidiInputDevice
+Line 678 
 String LSCPServer::CreateMidiInputDevice
          MidiInputDevice* pDevice = pSampler->CreateMidiInputDevice(Driver, Parameters);
          // search for the created device to get its index
          int index = GetMidiInputDeviceIndex(pDevice);
-         if (index == -1) throw LinuxSamplerException("Internal error: could not find created midi input device.");
+         if (index == -1) throw Exception("Internal error: could not find created midi input device.");
          result = index; // success
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 439 
 String LSCPServer::DestroyAudioOutputDev
+Line 692 
 String LSCPServer::DestroyAudioOutputDev
      LSCPResultSet result;
      try {
          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
+         if (!devices.count(DeviceIndex)) throw Exception("There is no audio output device with index " + ToString(DeviceIndex) + ".");
          AudioOutputDevice* pDevice = devices[DeviceIndex];
          pSampler->DestroyAudioOutputDevice(pDevice);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 454 
 String LSCPServer::DestroyMidiInputDevic
+Line 707 
 String LSCPServer::DestroyMidiInputDevic
      LSCPResultSet result;
      try {
          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
-         if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
+         if (!devices.count(DeviceIndex)) throw Exception("There is no audio output device with index " + ToString(DeviceIndex) + ".");
          MidiInputDevice* pDevice = devices[DeviceIndex];
          pSampler->DestroyMidiInputDevice(pDevice);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
  }
+ EngineChannel* LSCPServer::GetEngineChannel(uint uiSamplerChannel) {
+     SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(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");
+     return pEngineChannel;
+ }
  /**
   * Will be called by the parser to load an instrument.
   */
-Line 472 
 String LSCPServer::LoadInstrument(String
+Line 735 
 String LSCPServer::LoadInstrument(String
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel yet");
+         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel yet");
          if (!pSamplerChannel->GetAudioOutputDevice())
-             throw LinuxSamplerException("No audio output device connected to sampler channel");
+             throw Exception("No audio output device connected to sampler channel");
          if (bBackground) {
-             InstrumentLoader.StartNewLoad(Filename, uiInstrument, pEngineChannel);
+             InstrumentManager::instrument_id_t id;
+             id.FileName = Filename;
+             id.Index    = uiInstrument;
+             InstrumentManager::LoadInstrumentInBackground(id, pEngineChannel);
          }
          else {
              // tell the engine channel which instrument to load
-Line 487 
 String LSCPServer::LoadInstrument(String
+Line 753 
 String LSCPServer::LoadInstrument(String
              pEngineChannel->LoadInstrument();
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 502 
 String LSCPServer::SetEngineType(String
+Line 768 
 String LSCPServer::SetEngineType(String
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          LockRTNotify();
          pSamplerChannel->SetEngineType(EngineName);
          if(HasSoloChannel()) pSamplerChannel->GetEngineChannel()->SetMute(-1);
          UnlockRTNotify();
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 546 
 String LSCPServer::ListChannels() {
+Line 812 
 String LSCPServer::ListChannels() {
   */
  String LSCPServer::AddChannel() {
      dmsg(2,("LSCPServer: AddChannel()\n"));
+     LockRTNotify();
      SamplerChannel* pSamplerChannel = pSampler->AddSamplerChannel();
+     UnlockRTNotify();
      LSCPResultSet result(pSamplerChannel->Index());
      return result.Produce();
  }
-Line 568 
 String LSCPServer::RemoveChannel(uint ui
+Line 836 
 String LSCPServer::RemoveChannel(uint ui
   */
  String LSCPServer::GetAvailableEngines() {
      dmsg(2,("LSCPServer: GetAvailableEngines()\n"));
-     LSCPResultSet result("1");
+     LSCPResultSet result;
+     try {
+         int n = EngineFactory::AvailableEngineTypes().size();
+         result.Add(n);
+     }
+     catch (Exception e) {
+         result.Error(e);
+     }
      return result.Produce();
  }
-Line 577 
 String LSCPServer::GetAvailableEngines()
+Line 852 
 String LSCPServer::GetAvailableEngines()
   */
  String LSCPServer::ListAvailableEngines() {
      dmsg(2,("LSCPServer: ListAvailableEngines()\n"));
-     LSCPResultSet result("\'GIG\'");
+     LSCPResultSet result;
+     try {
+         String s = EngineFactory::AvailableEngineTypesAsString();
+         result.Add(s);
+     }
+     catch (Exception e) {
+         result.Error(e);
+     }
      return result.Produce();
  }
-Line 588 
 String LSCPServer::ListAvailableEngines(
+Line 870 
 String LSCPServer::ListAvailableEngines(
  String LSCPServer::GetEngineInfo(String EngineName) {
      dmsg(2,("LSCPServer: GetEngineInfo(EngineName=%s)\n", EngineName.c_str()));
      LSCPResultSet result;
+     LockRTNotify();
      try {
          Engine* pEngine = EngineFactory::Create(EngineName);
-         result.Add("DESCRIPTION", pEngine->Description());
+         result.Add("DESCRIPTION", _escapeLscpResponse(pEngine->Description()));
          result.Add("VERSION",     pEngine->Version());
          EngineFactory::Destroy(pEngine);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
+     UnlockRTNotify();
      return result.Produce();
  }
-Line 609 
 String LSCPServer::GetChannelInfo(uint u
+Line 893 
 String LSCPServer::GetChannelInfo(uint u
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
          //Defaults values
-Line 623 
 String LSCPServer::GetChannelInfo(uint u
+Line 907 
 String LSCPServer::GetChannelInfo(uint u
          String AudioRouting;
          int Mute = 0;
          bool Solo = false;
+         String MidiInstrumentMap = "NONE";
          if (pEngineChannel) {
              EngineName          = pEngineChannel->EngineName();
-Line 640 
 String LSCPServer::GetChannelInfo(uint u
+Line 925 
 String LSCPServer::GetChannelInfo(uint u
              }
              Mute = pEngineChannel->GetMute();
              Solo = pEngineChannel->GetSolo();
+             if (pEngineChannel->UsesNoMidiInstrumentMap())
+                 MidiInstrumentMap = "NONE";
+             else if (pEngineChannel->UsesDefaultMidiInstrumentMap())
+                 MidiInstrumentMap = "DEFAULT";
+             else
+                 MidiInstrumentMap = ToString(pEngineChannel->GetMidiInstrumentMap());
          }
          result.Add("ENGINE_NAME", EngineName);
-Line 655 
 String LSCPServer::GetChannelInfo(uint u
+Line 946 
 String LSCPServer::GetChannelInfo(uint u
          if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");
          else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
+         // convert the filename into the correct encoding as defined for LSCP
+         // (especially in terms of special characters -> escape sequences)
+         if (InstrumentFileName != "NONE" && InstrumentFileName != "") {
+ #if WIN32
+             InstrumentFileName = Path::fromWindows(InstrumentFileName).toLscp();
+ #else
+             // assuming POSIX
+             InstrumentFileName = Path::fromPosix(InstrumentFileName).toLscp();
+ #endif
+         }
          result.Add("INSTRUMENT_FILE", InstrumentFileName);
          result.Add("INSTRUMENT_NR", InstrumentIndex);
-         result.Add("INSTRUMENT_NAME", InstrumentName);
+         result.Add("INSTRUMENT_NAME", _escapeLscpResponse(InstrumentName));
          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
          result.Add("MUTE", Mute == -1 ? "MUTED_BY_SOLO" : (Mute ? "true" : "false"));
          result.Add("SOLO", Solo);
+         result.Add("MIDI_INSTRUMENT_MAP", MidiInstrumentMap);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 677 
 String LSCPServer::GetVoiceCount(uint ui
+Line 980 
 String LSCPServer::GetVoiceCount(uint ui
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw LinuxSamplerException("No engine loaded on sampler channel");
+         if (!pEngineChannel) throw Exception("No engine loaded on sampler channel");
-         if (!pEngineChannel->GetEngine()) throw LinuxSamplerException("No audio output device connected to sampler channel");
+         if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
          result.Add(pEngineChannel->GetEngine()->VoiceCount());
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 698 
 String LSCPServer::GetStreamCount(uint u
+Line 1001 
 String LSCPServer::GetStreamCount(uint u
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
+         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
-         if (!pEngineChannel->GetEngine()) throw LinuxSamplerException("No audio output device connected to sampler channel");
+         if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
          result.Add(pEngineChannel->GetEngine()->DiskStreamCount());
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 719 
 String LSCPServer::GetBufferFill(fill_re
+Line 1022 
 String LSCPServer::GetBufferFill(fill_re
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
+         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
-         if (!pEngineChannel->GetEngine()) throw LinuxSamplerException("No audio output device connected to sampler channel");
+         if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
          if (!pEngineChannel->GetEngine()->DiskStreamSupported()) result.Add("NA");
          else {
              switch (ResponseType) {
-Line 733 
 String LSCPServer::GetBufferFill(fill_re
+Line 1036 
 String LSCPServer::GetBufferFill(fill_re
                      result.Add(pEngineChannel->GetEngine()->DiskStreamBufferFillPercentage());
                      break;
                  default:
-                     throw LinuxSamplerException("Unknown fill response type");
+                     throw Exception("Unknown fill response type");
              }
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 750 
 String LSCPServer::GetAvailableAudioOutp
+Line 1053 
 String LSCPServer::GetAvailableAudioOutp
          int n = AudioOutputDeviceFactory::AvailableDrivers().size();
          result.Add(n);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 763 
 String LSCPServer::ListAvailableAudioOut
+Line 1066 
 String LSCPServer::ListAvailableAudioOut
          String s = AudioOutputDeviceFactory::AvailableDriversAsString();
          result.Add(s);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 776 
 String LSCPServer::GetAvailableMidiInput
+Line 1079 
 String LSCPServer::GetAvailableMidiInput
          int n = MidiInputDeviceFactory::AvailableDrivers().size();
          result.Add(n);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 789 
 String LSCPServer::ListAvailableMidiInpu
+Line 1092 
 String LSCPServer::ListAvailableMidiInpu
          String s = MidiInputDeviceFactory::AvailableDriversAsString();
          result.Add(s);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 813 
 String LSCPServer::GetMidiInputDriverInf
+Line 1116 
 String LSCPServer::GetMidiInputDriverInf
              result.Add("PARAMETERS", s);
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 837 
 String LSCPServer::GetAudioOutputDriverI
+Line 1140 
 String LSCPServer::GetAudioOutputDriverI
              result.Add("PARAMETERS", s);
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 864 
 String LSCPServer::GetMidiInputDriverPar
+Line 1167 
 String LSCPServer::GetMidiInputDriverPar
          if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
          if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 891 
 String LSCPServer::GetAudioOutputDriverP
+Line 1194 
 String LSCPServer::GetAudioOutputDriverP
          if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
          if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 904 
 String LSCPServer::GetAudioOutputDeviceC
+Line 1207 
 String LSCPServer::GetAudioOutputDeviceC
          uint count = pSampler->AudioOutputDevices();
          result.Add(count); // success
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 917 
 String LSCPServer::GetMidiInputDeviceCou
+Line 1220 
 String LSCPServer::GetMidiInputDeviceCou
          uint count = pSampler->MidiInputDevices();
          result.Add(count); // success
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 936 
 String LSCPServer::GetAudioOutputDevices
+Line 1239 
 String LSCPServer::GetAudioOutputDevices
          }
          result.Add(s);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 955 
 String LSCPServer::GetMidiInputDevices()
+Line 1258 
 String LSCPServer::GetMidiInputDevices()
          }
          result.Add(s);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 966 
 String LSCPServer::GetAudioOutputDeviceI
+Line 1269 
 String LSCPServer::GetAudioOutputDeviceI
      LSCPResultSet result;
      try {
          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
+         if (!devices.count(DeviceIndex)) throw Exception("There is no audio output device with index " + ToString(DeviceIndex) + ".");
          AudioOutputDevice* pDevice = devices[DeviceIndex];
          result.Add("DRIVER", pDevice->Driver());
          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
-Line 975 
 String LSCPServer::GetAudioOutputDeviceI
+Line 1278 
 String LSCPServer::GetAudioOutputDeviceI
              result.Add(iter->first, iter->second->Value());
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 986 
 String LSCPServer::GetMidiInputDeviceInf
+Line 1289 
 String LSCPServer::GetMidiInputDeviceInf
      LSCPResultSet result;
      try {
          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
-         if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
+         if (!devices.count(DeviceIndex)) throw Exception("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
          MidiInputDevice* pDevice = devices[DeviceIndex];
          result.Add("DRIVER", pDevice->Driver());
          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
-Line 995 
 String LSCPServer::GetMidiInputDeviceInf
+Line 1298 
 String LSCPServer::GetMidiInputDeviceInf
              result.Add(iter->first, iter->second->Value());
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 1006 
 String LSCPServer::GetMidiInputPortInfo(
+Line 1309 
 String LSCPServer::GetMidiInputPortInfo(
      try {
          // get MIDI input device
          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
-         if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
+         if (!devices.count(DeviceIndex)) throw Exception("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
          MidiInputDevice* pDevice = devices[DeviceIndex];
          // get MIDI port
          MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
-         if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
+         if (!pMidiInputPort) throw Exception("There is no MIDI input port with index " + ToString(PortIndex) + ".");
          // return the values of all MIDI port parameters
          std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
-Line 1020 
 String LSCPServer::GetMidiInputPortInfo(
+Line 1323 
 String LSCPServer::GetMidiInputPortInfo(
              result.Add(iter->first, iter->second->Value());
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 1032 
 String LSCPServer::GetAudioOutputChannel
+Line 1335 
 String LSCPServer::GetAudioOutputChannel
      try {
          // get audio output device
          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceId) + ".");
+         if (!devices.count(DeviceId)) throw Exception("There is no audio output device with index " + ToString(DeviceId) + ".");
          AudioOutputDevice* pDevice = devices[DeviceId];
          // get audio channel
          AudioChannel* pChannel = pDevice->Channel(ChannelId);
-         if (!pChannel) throw LinuxSamplerException("Audio output device does not have audio channel " + ToString(ChannelId) + ".");
+         if (!pChannel) throw Exception("Audio output device does not have audio channel " + ToString(ChannelId) + ".");
          // return the values of all audio channel parameters
          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
-Line 1046 
 String LSCPServer::GetAudioOutputChannel
+Line 1349 
 String LSCPServer::GetAudioOutputChannel
              result.Add(iter->first, iter->second->Value());
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 1058 
 String LSCPServer::GetMidiInputPortParam
+Line 1361 
 String LSCPServer::GetMidiInputPortParam
      try {
          // get MIDI input device
          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
-         if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");
+         if (!devices.count(DeviceId)) throw Exception("There is no midi input device with index " + ToString(DeviceId) + ".");
          MidiInputDevice* pDevice = devices[DeviceId];
          // get midi port
          MidiInputPort* pPort = pDevice->GetPort(PortId);
-         if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");
+         if (!pPort) throw Exception("Midi input device does not have port " + ToString(PortId) + ".");
          // get desired port parameter
          std::map<String,DeviceRuntimeParameter*> parameters = pPort->PortParameters();
-         if (!parameters.count(ParameterName)) throw LinuxSamplerException("Midi port does not provide a parameter '" + ParameterName + "'.");
+         if (!parameters.count(ParameterName)) throw Exception("Midi port does not provide a parameter '" + ParameterName + "'.");
          DeviceRuntimeParameter* pParameter = parameters[ParameterName];
          // return all fields of this audio channel parameter
-Line 1079 
 String LSCPServer::GetMidiInputPortParam
+Line 1382 
 String LSCPServer::GetMidiInputPortParam
          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 1091 
 String LSCPServer::GetAudioOutputChannel
+Line 1394 
 String LSCPServer::GetAudioOutputChannel
      try {
          // get audio output device
          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceId) + ".");
+         if (!devices.count(DeviceId)) throw Exception("There is no audio output device with index " + ToString(DeviceId) + ".");
          AudioOutputDevice* pDevice = devices[DeviceId];
          // get audio channel
          AudioChannel* pChannel = pDevice->Channel(ChannelId);
-         if (!pChannel) throw LinuxSamplerException("Audio output device does not have audio channel " + ToString(ChannelId) + ".");
+         if (!pChannel) throw Exception("Audio output device does not have audio channel " + ToString(ChannelId) + ".");
          // get desired audio channel parameter
          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
-         if (!parameters.count(ParameterName)) throw LinuxSamplerException("Audio channel does not provide a parameter '" + ParameterName + "'.");
+         if (!parameters.count(ParameterName)) throw Exception("Audio channel does not provide a parameter '" + ParameterName + "'.");
          DeviceRuntimeParameter* pParameter = parameters[ParameterName];
          // return all fields of this audio channel parameter
-Line 1112 
 String LSCPServer::GetAudioOutputChannel
+Line 1415 
 String LSCPServer::GetAudioOutputChannel
          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 1124 
 String LSCPServer::SetAudioOutputChannel
+Line 1427 
 String LSCPServer::SetAudioOutputChannel
      try {
          // get audio output device
          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceId) + ".");
+         if (!devices.count(DeviceId)) throw Exception("There is no audio output device with index " + ToString(DeviceId) + ".");
          AudioOutputDevice* pDevice = devices[DeviceId];
          // get audio channel
          AudioChannel* pChannel = pDevice->Channel(ChannelId);
-         if (!pChannel) throw LinuxSamplerException("Audio output device does not have audio channel " + ToString(ChannelId) + ".");
+         if (!pChannel) throw Exception("Audio output device does not have audio channel " + ToString(ChannelId) + ".");
          // get desired audio channel parameter
          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
-         if (!parameters.count(ParamKey)) throw LinuxSamplerException("Audio channel does not provide a parameter '" + ParamKey + "'.");
+         if (!parameters.count(ParamKey)) throw Exception("Audio channel does not provide a parameter '" + ParamKey + "'.");
          DeviceRuntimeParameter* pParameter = parameters[ParamKey];
          // set new channel parameter value
          pParameter->SetValue(ParamVal);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_audio_device_info, DeviceId));
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 1150 
 String LSCPServer::SetAudioOutputDeviceP
+Line 1454 
 String LSCPServer::SetAudioOutputDeviceP
      LSCPResultSet result;
      try {
          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
+         if (!devices.count(DeviceIndex)) throw Exception("There is no audio output device with index " + ToString(DeviceIndex) + ".");
          AudioOutputDevice* pDevice = devices[DeviceIndex];
          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
-         if (!parameters.count(ParamKey)) throw LinuxSamplerException("Audio output device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
+         if (!parameters.count(ParamKey)) throw Exception("Audio output device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
          parameters[ParamKey]->SetValue(ParamVal);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_audio_device_info, DeviceIndex));
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 1167 
 String LSCPServer::SetMidiInputDevicePar
+Line 1472 
 String LSCPServer::SetMidiInputDevicePar
      LSCPResultSet result;
      try {
          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
-         if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
+         if (!devices.count(DeviceIndex)) throw Exception("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
          MidiInputDevice* pDevice = devices[DeviceIndex];
          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
-         if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
+         if (!parameters.count(ParamKey)) throw Exception("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
          parameters[ParamKey]->SetValue(ParamVal);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_device_info, DeviceIndex));
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 1185 
 String LSCPServer::SetMidiInputPortParam
+Line 1491 
 String LSCPServer::SetMidiInputPortParam
      try {
          // get MIDI input device
          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
-         if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
+         if (!devices.count(DeviceIndex)) throw Exception("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
          MidiInputDevice* pDevice = devices[DeviceIndex];
          // get MIDI port
          MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
-         if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
+         if (!pMidiInputPort) throw Exception("There is no MIDI input port with index " + ToString(PortIndex) + ".");
          // set port parameter value
          std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
-         if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
+         if (!parameters.count(ParamKey)) throw Exception("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
          parameters[ParamKey]->SetValue(ParamVal);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_device_info, DeviceIndex));
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 1212 
 String LSCPServer::SetAudioOutputChannel
+Line 1519 
 String LSCPServer::SetAudioOutputChannel
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw LinuxSamplerException("No engine type yet assigned to sampler channel " + ToString(uiSamplerChannel));
+         if (!pEngineChannel) throw Exception("No engine type yet assigned to sampler channel " + ToString(uiSamplerChannel));
-         if (!pSamplerChannel->GetAudioOutputDevice()) throw LinuxSamplerException("No audio output device connected to sampler channel " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel->GetAudioOutputDevice()) throw Exception("No audio output device connected to sampler channel " + ToString(uiSamplerChannel));
          pEngineChannel->SetOutputChannel(ChannelAudioOutputChannel, AudioOutputDeviceInputChannel);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 1227 
 String LSCPServer::SetAudioOutputChannel
+Line 1534 
 String LSCPServer::SetAudioOutputChannel
  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {
      dmsg(2,("LSCPServer: SetAudiotOutputDevice(AudioDeviceId=%d, SamplerChannel=%d)\n",AudioDeviceId,uiSamplerChannel));
      LSCPResultSet result;
+     LockRTNotify();
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices.count(AudioDeviceId)) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));
+         if (!devices.count(AudioDeviceId)) throw Exception("There is no audio output device with index " + ToString(AudioDeviceId));
          AudioOutputDevice* pDevice = devices[AudioDeviceId];
          pSamplerChannel->SetAudioOutputDevice(pDevice);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
+     UnlockRTNotify();
      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;
+     LockRTNotify();
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(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";
-Line 1268 
 String LSCPServer::SetAudioOutputType(St
+Line 1578 
 String LSCPServer::SetAudioOutputType(St
          }
          // Must have a device...
          if (pDevice == NULL)
-             throw LinuxSamplerException("Internal error: could not create audio output device.");
+             throw Exception("Internal error: could not create audio output device.");
          // Set it as the current channel device...
          pSamplerChannel->SetAudioOutputDevice(pDevice);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
+     UnlockRTNotify();
      return result.Produce();
  }
-Line 1283 
 String LSCPServer::SetMIDIInputPort(uint
+Line 1594 
 String LSCPServer::SetMIDIInputPort(uint
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          pSamplerChannel->SetMidiInputPort(MIDIPort);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 1297 
 String LSCPServer::SetMIDIInputChannel(u
+Line 1608 
 String LSCPServer::SetMIDIInputChannel(u
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          pSamplerChannel->SetMidiInputChannel((midi_chan_t) MIDIChannel);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 1311 
 String LSCPServer::SetMIDIInputDevice(ui
+Line 1622 
 String LSCPServer::SetMIDIInputDevice(ui
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
-         if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
+         if (!devices.count(MIDIDeviceId)) throw Exception("There is no MIDI input device with index " + ToString(MIDIDeviceId));
          MidiInputDevice* pDevice = devices[MIDIDeviceId];
          pSamplerChannel->SetMidiInputDevice(pDevice);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 1328 
 String LSCPServer::SetMIDIInputType(Stri
+Line 1639 
 String LSCPServer::SetMIDIInputType(Stri
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          // Driver type name aliasing...
          if (MidiInputDriver == "Alsa") MidiInputDriver = "ALSA";
          // Check if there's one MIDI input device already created
-Line 1352 
 String LSCPServer::SetMIDIInputType(Stri
+Line 1663 
 String LSCPServer::SetMIDIInputType(Stri
          }
          // Must have a device...
          if (pDevice == NULL)
-             throw LinuxSamplerException("Internal error: could not create MIDI input device.");
+             throw Exception("Internal error: could not create MIDI input device.");
          // Set it as the current channel device...
          pSamplerChannel->SetMidiInputDevice(pDevice);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 1371 
 String LSCPServer::SetMIDIInput(uint MID
+Line 1682 
 String LSCPServer::SetMIDIInput(uint MID
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();
-         if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
+         if (!devices.count(MIDIDeviceId)) throw Exception("There is no MIDI input device with index " + ToString(MIDIDeviceId));
          MidiInputDevice* pDevice = devices[MIDIDeviceId];
          pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (midi_chan_t) MIDIChannel);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 1392 
 String LSCPServer::SetVolume(double dVol
+Line 1703 
 String LSCPServer::SetVolume(double dVol
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
+         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          pEngineChannel->Volume(dVolume);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 1411 
 String LSCPServer::SetChannelMute(bool b
+Line 1722 
 String LSCPServer::SetChannelMute(bool b
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
+         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          if(!bMute) pEngineChannel->SetMute((HasSoloChannel() && !pEngineChannel->GetSolo()) ? -1 : 0);
          else pEngineChannel->SetMute(1);
-     } catch (LinuxSamplerException e) {
+     } catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 1432 
 String LSCPServer::SetChannelSolo(bool b
+Line 1743 
 String LSCPServer::SetChannelSolo(bool b
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
+         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          bool oldSolo = pEngineChannel->GetSolo();
          bool hadSoloChannel = HasSoloChannel();
          pEngineChannel->SetSolo(bSolo);
          if(!oldSolo && bSolo) {
              if(pEngineChannel->GetMute() == -1) pEngineChannel->SetMute(0);
              if(!hadSoloChannel) MuteNonSoloChannels();
          }
          if(oldSolo && !bSolo) {
              if(!HasSoloChannel()) UnmuteChannels();
              else if(!pEngineChannel->GetMute()) pEngineChannel->SetMute(-1);
          }
-     } catch (LinuxSamplerException e) {
+     } catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 1504 
 void  LSCPServer::UnmuteChannels() {
+Line 1815 
 void  LSCPServer::UnmuteChannels() {
      }
  }
+ String LSCPServer::AddOrReplaceMIDIInstrumentMapping(uint MidiMapID, uint MidiBank, uint MidiProg, String EngineType, String InstrumentFile, uint InstrumentIndex, float Volume, MidiInstrumentMapper::mode_t LoadMode, String Name, bool bModal) {
+     dmsg(2,("LSCPServer: AddOrReplaceMIDIInstrumentMapping()\n"));
+     midi_prog_index_t idx;
+     idx.midi_bank_msb = (MidiBank >> 7) & 0x7f;
+     idx.midi_bank_lsb = MidiBank & 0x7f;
+     idx.midi_prog     = MidiProg;
+     MidiInstrumentMapper::entry_t entry;
+     entry.EngineName      = EngineType;
+     entry.InstrumentFile  = InstrumentFile;
+     entry.InstrumentIndex = InstrumentIndex;
+     entry.LoadMode        = LoadMode;
+     entry.Volume          = Volume;
+     entry.Name            = Name;
+     LSCPResultSet result;
+     try {
+         // PERSISTENT mapping commands might block for a long time, so in
+         // that case we add/replace the mapping in another thread in case
+         // the NON_MODAL argument was supplied, non persistent mappings
+         // should return immediately, so we don't need to do that for them
+         bool bInBackground = (entry.LoadMode == MidiInstrumentMapper::PERSISTENT && !bModal);
+         MidiInstrumentMapper::AddOrReplaceEntry(MidiMapID, idx, entry, bInBackground);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::RemoveMIDIInstrumentMapping(uint MidiMapID, uint MidiBank, uint MidiProg) {
+     dmsg(2,("LSCPServer: RemoveMIDIInstrumentMapping()\n"));
+     midi_prog_index_t idx;
+     idx.midi_bank_msb = (MidiBank >> 7) & 0x7f;
+     idx.midi_bank_lsb = MidiBank & 0x7f;
+     idx.midi_prog     = MidiProg;
+     LSCPResultSet result;
+     try {
+         MidiInstrumentMapper::RemoveEntry(MidiMapID, idx);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::GetMidiInstrumentMappings(uint MidiMapID) {
+     dmsg(2,("LSCPServer: GetMidiInstrumentMappings()\n"));
+     LSCPResultSet result;
+     try {
+         result.Add(MidiInstrumentMapper::Entries(MidiMapID).size());
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::GetAllMidiInstrumentMappings() {
+     dmsg(2,("LSCPServer: GetAllMidiInstrumentMappings()\n"));
+     LSCPResultSet result;
+     std::vector<int> maps = MidiInstrumentMapper::Maps();
+     int totalMappings = 0;
+     for (int i = 0; i < maps.size(); i++) {
+         try {
+             totalMappings += MidiInstrumentMapper::Entries(maps[i]).size();
+         } catch (Exception e) { /*NOOP*/ }
+     }
+     result.Add(totalMappings);
+     return result.Produce();
+ }
+ String LSCPServer::GetMidiInstrumentMapping(uint MidiMapID, uint MidiBank, uint MidiProg) {
+     dmsg(2,("LSCPServer: GetMidiIstrumentMapping()\n"));
+     LSCPResultSet result;
+     try {
+         midi_prog_index_t idx;
+         idx.midi_bank_msb = (MidiBank >> 7) & 0x7f;
+         idx.midi_bank_lsb = MidiBank & 0x7f;
+         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();
+ #else
+             // assuming POSIX
+             const String instrumentFileName = Path::fromPosix(iter->second.InstrumentFile).toLscp();
+ #endif
+             result.Add("NAME", _escapeLscpResponse(iter->second.Name));
+             result.Add("ENGINE_NAME", iter->second.EngineName);
+             result.Add("INSTRUMENT_FILE", instrumentFileName);
+             result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);
+             String instrumentName;
+             Engine* pEngine = EngineFactory::Create(iter->second.EngineName);
+             if (pEngine) {
+                 if (pEngine->GetInstrumentManager()) {
+                     InstrumentManager::instrument_id_t instrID;
+                     instrID.FileName = iter->second.InstrumentFile;
+                     instrID.Index    = iter->second.InstrumentIndex;
+                     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);
+         }
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::ListMidiInstrumentMappings(uint MidiMapID) {
+     dmsg(2,("LSCPServer: ListMidiInstrumentMappings()\n"));
+     LSCPResultSet result;
+     try {
+         String s;
+         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.begin();
+         for (; iter != mappings.end(); iter++) {
+             if (s.size()) s += ",";
+             s += "{" + ToString(MidiMapID) + ","
+                      + ToString((int(iter->first.midi_bank_msb) << 7) | int(iter->first.midi_bank_lsb)) + ","
+                      + ToString(int(iter->first.midi_prog)) + "}";
+         }
+         result.Add(s);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::ListAllMidiInstrumentMappings() {
+     dmsg(2,("LSCPServer: ListAllMidiInstrumentMappings()\n"));
+     LSCPResultSet result;
+     try {
+         std::vector<int> maps = MidiInstrumentMapper::Maps();
+         String s;
+         for (int i = 0; i < maps.size(); i++) {
+             std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t> mappings = MidiInstrumentMapper::Entries(maps[i]);
+             std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t>::iterator iter = mappings.begin();
+             for (; iter != mappings.end(); iter++) {
+                 if (s.size()) s += ",";
+                 s += "{" + ToString(maps[i]) + ","
+                          + ToString((int(iter->first.midi_bank_msb) << 7) | int(iter->first.midi_bank_lsb)) + ","
+                          + ToString(int(iter->first.midi_prog)) + "}";
+             }
+         }
+         result.Add(s);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::ClearMidiInstrumentMappings(uint MidiMapID) {
+     dmsg(2,("LSCPServer: ClearMidiInstrumentMappings()\n"));
+     LSCPResultSet result;
+     try {
+         MidiInstrumentMapper::RemoveAllEntries(MidiMapID);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::ClearAllMidiInstrumentMappings() {
+     dmsg(2,("LSCPServer: ClearAllMidiInstrumentMappings()\n"));
+     LSCPResultSet result;
+     try {
+         std::vector<int> maps = MidiInstrumentMapper::Maps();
+         for (int i = 0; i < maps.size(); i++)
+             MidiInstrumentMapper::RemoveAllEntries(maps[i]);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::AddMidiInstrumentMap(String MapName) {
+     dmsg(2,("LSCPServer: AddMidiInstrumentMap()\n"));
+     LSCPResultSet result;
+     try {
+         int MapID = MidiInstrumentMapper::AddMap(MapName);
+         result = LSCPResultSet(MapID);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::RemoveMidiInstrumentMap(uint MidiMapID) {
+     dmsg(2,("LSCPServer: RemoveMidiInstrumentMap()\n"));
+     LSCPResultSet result;
+     try {
+         MidiInstrumentMapper::RemoveMap(MidiMapID);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::RemoveAllMidiInstrumentMaps() {
+     dmsg(2,("LSCPServer: RemoveAllMidiInstrumentMaps()\n"));
+     LSCPResultSet result;
+     try {
+         MidiInstrumentMapper::RemoveAllMaps();
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::GetMidiInstrumentMaps() {
+     dmsg(2,("LSCPServer: GetMidiInstrumentMaps()\n"));
+     LSCPResultSet result;
+     try {
+         result.Add(MidiInstrumentMapper::Maps().size());
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::ListMidiInstrumentMaps() {
+     dmsg(2,("LSCPServer: ListMidiInstrumentMaps()\n"));
+     LSCPResultSet result;
+     try {
+         std::vector<int> maps = MidiInstrumentMapper::Maps();
+         String sList;
+         for (int i = 0; i < maps.size(); i++) {
+             if (sList != "") sList += ",";
+             sList += ToString(maps[i]);
+         }
+         result.Add(sList);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::GetMidiInstrumentMap(uint MidiMapID) {
+     dmsg(2,("LSCPServer: GetMidiInstrumentMap()\n"));
+     LSCPResultSet result;
+     try {
+         result.Add("NAME", _escapeLscpResponse(MidiInstrumentMapper::MapName(MidiMapID)));
+         result.Add("DEFAULT", MidiInstrumentMapper::GetDefaultMap() == MidiMapID);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::SetMidiInstrumentMapName(uint MidiMapID, String NewName) {
+     dmsg(2,("LSCPServer: SetMidiInstrumentMapName()\n"));
+     LSCPResultSet result;
+     try {
+         MidiInstrumentMapper::RenameMap(MidiMapID, NewName);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ /**
+  * Set the MIDI instrument map the given sampler channel shall use for
+  * handling MIDI program change messages. There are the following two
+  * special (negative) values:
+  *
+  *    - (-1) :  set to NONE (ignore program changes)
+  *    - (-2) :  set to DEFAULT map
+  */
+ String LSCPServer::SetChannelMap(uint uiSamplerChannel, int MidiMapID) {
+     dmsg(2,("LSCPServer: SetChannelMap()\n"));
+     LSCPResultSet result;
+     try {
+         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(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();
+         else                      pEngineChannel->SetMidiInstrumentMap(MidiMapID);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::CreateFxSend(uint uiSamplerChannel, uint MidiCtrl, String Name) {
+     dmsg(2,("LSCPServer: CreateFxSend()\n"));
+     LSCPResultSet result;
+     try {
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
+         FxSend* pFxSend = pEngineChannel->AddFxSend(MidiCtrl, Name);
+         if (!pFxSend) throw Exception("Could not add FxSend, don't ask, I don't know why (probably a bug)");
+         result = LSCPResultSet(pFxSend->Id()); // success
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::DestroyFxSend(uint uiSamplerChannel, uint FxSendID) {
+     dmsg(2,("LSCPServer: DestroyFxSend()\n"));
+     LSCPResultSet result;
+     try {
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
+         FxSend* pFxSend = NULL;
+         for (int i = 0; i < pEngineChannel->GetFxSendCount(); i++) {
+             if (pEngineChannel->GetFxSend(i)->Id() == FxSendID) {
+                 pFxSend = pEngineChannel->GetFxSend(i);
+                 break;
+             }
+         }
+         if (!pFxSend) throw Exception("There is no FxSend with that ID on the given sampler channel");
+         pEngineChannel->RemoveFxSend(pFxSend);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::GetFxSends(uint uiSamplerChannel) {
+     dmsg(2,("LSCPServer: GetFxSends()\n"));
+     LSCPResultSet result;
+     try {
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
+         result.Add(pEngineChannel->GetFxSendCount());
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::ListFxSends(uint uiSamplerChannel) {
+     dmsg(2,("LSCPServer: ListFxSends()\n"));
+     LSCPResultSet result;
+     String list;
+     try {
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
+         for (int i = 0; i < pEngineChannel->GetFxSendCount(); i++) {
+             FxSend* pFxSend = pEngineChannel->GetFxSend(i);
+             if (list != "") list += ",";
+             list += ToString(pFxSend->Id());
+         }
+         result.Add(list);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ FxSend* LSCPServer::GetFxSend(uint uiSamplerChannel, uint FxSendID) {
+     EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
+     FxSend* pFxSend = NULL;
+     for (int i = 0; i < pEngineChannel->GetFxSendCount(); i++) {
+         if (pEngineChannel->GetFxSend(i)->Id() == FxSendID) {
+             pFxSend = pEngineChannel->GetFxSend(i);
+             break;
+         }
+     }
+     if (!pFxSend) throw Exception("There is no FxSend with that ID on the given sampler channel");
+     return pFxSend;
+ }
+ String LSCPServer::GetFxSendInfo(uint uiSamplerChannel, uint FxSendID) {
+     dmsg(2,("LSCPServer: GetFxSendInfo()\n"));
+     LSCPResultSet result;
+     try {
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
+         FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);
+         // gather audio routing informations
+         String AudioRouting;
+         for (int chan = 0; chan < pEngineChannel->Channels(); chan++) {
+             if (AudioRouting != "") AudioRouting += ",";
+             AudioRouting += ToString(pFxSend->DestinationChannel(chan));
+         }
+         // 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);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::SetFxSendName(uint uiSamplerChannel, uint FxSendID, String Name) {
+     dmsg(2,("LSCPServer: SetFxSendName()\n"));
+     LSCPResultSet result;
+     try {
+         FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);
+         pFxSend->SetName(Name);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, uiSamplerChannel, FxSendID));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::SetFxSendAudioOutputChannel(uint uiSamplerChannel, uint FxSendID, uint FxSendChannel, uint DeviceChannel) {
+     dmsg(2,("LSCPServer: SetFxSendAudioOutputChannel()\n"));
+     LSCPResultSet result;
+     try {
+         FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);
+         pFxSend->SetDestinationChannel(FxSendChannel, DeviceChannel);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, uiSamplerChannel, FxSendID));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::SetFxSendMidiController(uint uiSamplerChannel, uint FxSendID, uint MidiController) {
+     dmsg(2,("LSCPServer: SetFxSendMidiController()\n"));
+     LSCPResultSet result;
+     try {
+         FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);
+         pFxSend->SetMidiController(MidiController);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, uiSamplerChannel, FxSendID));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::SetFxSendLevel(uint uiSamplerChannel, uint FxSendID, double dLevel) {
+     dmsg(2,("LSCPServer: SetFxSendLevel()\n"));
+     LSCPResultSet result;
+     try {
+         FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);
+         pFxSend->SetLevel((float)dLevel);
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, uiSamplerChannel, FxSendID));
+     } 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);
+         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();
+         if (!pInstrumentManager) throw Exception("Engine does not provide an instrument manager");
+         InstrumentManager::instrument_id_t instrumentID;
+         instrumentID.FileName = pEngineChannel->InstrumentFileName();
+         instrumentID.Index    = pEngineChannel->InstrumentIndex();
+         pInstrumentManager->LaunchInstrumentEditor(instrumentID);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
  /**
   * Will be called by the parser to reset a particular sampler channel.
   */
-Line 1512 
 String LSCPServer::ResetChannel(uint uiS
+Line 2321 
 String LSCPServer::ResetChannel(uint uiS
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
+         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          pEngineChannel->Reset();
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 1539 
 String LSCPServer::ResetSampler() {
+Line 2348 
 String LSCPServer::ResetSampler() {
   */
  String LSCPServer::GetServerInfo() {
      dmsg(2,("LSCPServer: GetServerInfo()\n"));
+     const std::string description =
+         _escapeLscpResponse("LinuxSampler - modular, streaming capable sampler");
      LSCPResultSet result;
-     result.Add("DESCRIPTION", "LinuxSampler - modular, streaming capable sampler");
+     result.Add("DESCRIPTION", description);
      result.Add("VERSION", VERSION);
-     result.Add("PROTOCOL_VERSION", "1.0");
+     result.Add("PROTOCOL_VERSION", ToString(LSCP_RELEASE_MAJOR) + "." + ToString(LSCP_RELEASE_MINOR));
+ #if HAVE_SQLITE3
+     result.Add("INSTRUMENTS_DB_SUPPORT", "yes");
+ #else
+     result.Add("INSTRUMENTS_DB_SUPPORT", "no");
+ #endif
+     return result.Produce();
+ }
+ /**
+  * 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();
  }
-Line 1566 
 String LSCPServer::GetTotalVoiceCountMax
+Line 2393 
 String LSCPServer::GetTotalVoiceCountMax
      return result.Produce();
  }
+ String LSCPServer::GetGlobalVolume() {
+     LSCPResultSet result;
+     result.Add(ToString(GLOBAL_VOLUME)); // see common/global.cpp
+     return result.Produce();
+ }
+ String LSCPServer::SetGlobalVolume(double dVolume) {
+     LSCPResultSet result;
+     try {
+         if (dVolume < 0) throw Exception("Volume may not be negative");
+         GLOBAL_VOLUME = dVolume; // see common/global.cpp
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "VOLUME", GLOBAL_VOLUME));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ 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();
+     for (int i = 0; !bFound && 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) {
+                 std::vector<InstrumentManager::instrument_id_t> IDs =
+                     pManager->GetInstrumentFileContent(Filename);
+                 // return the amount of instruments in the file
+                 result.Add(IDs.size());
+                 // 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
+         }
+         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();
+     for (int i = 0; !bFound && 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) {
+                 std::vector<InstrumentManager::instrument_id_t> IDs =
+                     pManager->GetInstrumentFileContent(Filename);
+                 // return a list of IDs of the instruments in the file
+                 String s;
+                 for (int j = 0; j < IDs.size(); j++) {
+                     if (s.size()) s += ",";
+                     s += ToString(IDs[j].Index);
+                 }
+                 result.Add(s);
+                 // 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
+         }
+         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 && !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_FAMILY", engineTypes[i]);
+                 result.Add("FORMAT_VERSION", info.FormatVersion);
+                 result.Add("PRODUCT", info.Product);
+                 result.Add("ARTISTS", info.Artists);
+                 // 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) {
+             // 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
+     struct stat statBuf;
+     int res = stat(Filename.c_str(), &statBuf);
+     if (res) {
+         std::stringstream ss;
+         ss << "Fail to stat `" << Filename << "`: " << strerror(errno);
+         throw Exception(ss.str());
+     }
+     if (S_ISDIR(statBuf.st_mode)) {
+         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 1592 
 String LSCPServer::UnsubscribeNotificati
+Line 2597 
 String LSCPServer::UnsubscribeNotificati
      return result.Produce();
  }
- static int select_callback(void * lscpResultSet, int argc,
+ String LSCPServer::AddDbInstrumentDirectory(String Dir) {
-                         char **argv, char **azColName)
+     dmsg(2,("LSCPServer: AddDbInstrumentDirectory(Dir=%s)\n", Dir.c_str()));
- {
+     LSCPResultSet result;
-     LSCPResultSet* resultSet = (LSCPResultSet*) lscpResultSet;
+ #if HAVE_SQLITE3
-     resultSet->Add(argc, argv);
+     try {
-     return 0;
+         InstrumentsDb::GetInstrumentsDb()->AddDirectory(Dir);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
  }
- String LSCPServer::QueryDatabase(String query) {
+ String LSCPServer::RemoveDbInstrumentDirectory(String Dir, bool Force) {
+     dmsg(2,("LSCPServer: RemoveDbInstrumentDirectory(Dir=%s,Force=%d)\n", Dir.c_str(), Force));
      LSCPResultSet result;
  #if HAVE_SQLITE3
-     char* zErrMsg = NULL;
+     try {
-     sqlite3 *db;
+         InstrumentsDb::GetInstrumentsDb()->RemoveDirectory(Dir, Force);
-     String selectStr = "SELECT " + query;
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
-     int rc = sqlite3_open("linuxsampler.db", &db);
+ String LSCPServer::GetDbInstrumentDirectoryCount(String Dir, bool Recursive) {
-     if (rc == SQLITE_OK)
+     dmsg(2,("LSCPServer: GetDbInstrumentDirectoryCount(Dir=%s,Recursive=%d)\n", Dir.c_str(), Recursive));
-     {
+     LSCPResultSet result;
-             rc = sqlite3_exec(db, selectStr.c_str(), select_callback, &result, &zErrMsg);
+ #if HAVE_SQLITE3
+     try {
+         result.Add(InstrumentsDb::GetInstrumentsDb()->GetDirectoryCount(Dir, Recursive));
+     } catch (Exception e) {
+          result.Error(e);
      }
-     if ( rc != SQLITE_OK )
+ #else
-     {
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
-             result.Error(String(zErrMsg), rc);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::GetDbInstrumentDirectories(String Dir, bool Recursive) {
+     dmsg(2,("LSCPServer: GetDbInstrumentDirectories(Dir=%s,Recursive=%d)\n", Dir.c_str(), Recursive));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         String list;
+         StringListPtr dirs = InstrumentsDb::GetInstrumentsDb()->GetDirectories(Dir, Recursive);
+         for (int i = 0; i < dirs->size(); i++) {
+             if (list != "") list += ",";
+             list += "'" + InstrumentsDb::toEscapedPath(dirs->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::GetDbInstrumentDirectoryInfo(String Dir) {
+     dmsg(2,("LSCPServer: GetDbInstrumentDirectoryInfo(Dir=%s)\n", Dir.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         DbDirectory info = InstrumentsDb::GetInstrumentsDb()->GetDirectoryInfo(Dir);
+         result.Add("DESCRIPTION", _escapeLscpResponse(info.Description));
+         result.Add("CREATED", info.Created);
+         result.Add("MODIFIED", info.Modified);
+     } catch (Exception e) {
+          result.Error(e);
      }
-     sqlite3_close(db);
  #else
-     result.Error(String("SQLITE3 was not installed when linuxsampler was built. SELECT statement is not available."), 0);
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
  #endif
      return result.Produce();
  }
+ String LSCPServer::SetDbInstrumentDirectoryName(String Dir, String Name) {
+     dmsg(2,("LSCPServer: SetDbInstrumentDirectoryName(Dir=%s,Name=%s)\n", Dir.c_str(), Name.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->RenameDirectory(Dir, Name);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::MoveDbInstrumentDirectory(String Dir, String Dst) {
+     dmsg(2,("LSCPServer: MoveDbInstrumentDirectory(Dir=%s,Dst=%s)\n", Dir.c_str(), Dst.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->MoveDirectory(Dir, Dst);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::CopyDbInstrumentDirectory(String Dir, String Dst) {
+     dmsg(2,("LSCPServer: CopyDbInstrumentDirectory(Dir=%s,Dst=%s)\n", Dir.c_str(), Dst.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->CopyDirectory(Dir, Dst);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::SetDbInstrumentDirectoryDescription(String Dir, String Desc) {
+     dmsg(2,("LSCPServer: SetDbInstrumentDirectoryDescription(Dir=%s,Desc=%s)\n", Dir.c_str(), Desc.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->SetDirectoryDescription(Dir, Desc);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::AddDbInstruments(String DbDir, String FilePath, int Index, bool bBackground) {
+     dmsg(2,("LSCPServer: AddDbInstruments(DbDir=%s,FilePath=%s,Index=%d,bBackground=%d)\n", DbDir.c_str(), FilePath.c_str(), Index, bBackground));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         int id;
+         InstrumentsDb* db = InstrumentsDb::GetInstrumentsDb();
+         id = db->AddInstruments(DbDir, FilePath, Index, bBackground);
+         if (bBackground) result = id;
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::AddDbInstruments(String ScanMode, String DbDir, String FsDir, bool bBackground) {
+     dmsg(2,("LSCPServer: AddDbInstruments(ScanMode=%s,DbDir=%s,FsDir=%s,bBackground=%d)\n", ScanMode.c_str(), DbDir.c_str(), FsDir.c_str(), bBackground));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         int id;
+         InstrumentsDb* db = InstrumentsDb::GetInstrumentsDb();
+         if (ScanMode.compare("RECURSIVE") == 0) {
+            id = db->AddInstruments(RECURSIVE, DbDir, FsDir, bBackground);
+         } else if (ScanMode.compare("NON_RECURSIVE") == 0) {
+            id = db->AddInstruments(NON_RECURSIVE, DbDir, FsDir, bBackground);
+         } else if (ScanMode.compare("FLAT") == 0) {
+            id = db->AddInstruments(FLAT, DbDir, FsDir, bBackground);
+         } else {
+             throw Exception("Unknown scan mode: " + ScanMode);
+         }
+         if (bBackground) result = id;
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::RemoveDbInstrument(String Instr) {
+     dmsg(2,("LSCPServer: RemoveDbInstrument(Instr=%s)\n", Instr.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->RemoveInstrument(Instr);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::GetDbInstrumentCount(String Dir, bool Recursive) {
+     dmsg(2,("LSCPServer: GetDbInstrumentCount(Dir=%s,Recursive=%d)\n", Dir.c_str(), Recursive));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         result.Add(InstrumentsDb::GetInstrumentsDb()->GetInstrumentCount(Dir, Recursive));
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::GetDbInstruments(String Dir, bool Recursive) {
+     dmsg(2,("LSCPServer: GetDbInstruments(Dir=%s,Recursive=%d)\n", Dir.c_str(), Recursive));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         String list;
+         StringListPtr instrs = InstrumentsDb::GetInstrumentsDb()->GetInstruments(Dir, Recursive);
+         for (int i = 0; i < instrs->size(); i++) {
+             if (list != "") list += ",";
+             list += "'" + InstrumentsDb::toEscapedPath(instrs->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::GetDbInstrumentInfo(String Instr) {
+     dmsg(2,("LSCPServer: GetDbInstrumentInfo(Instr=%s)\n", Instr.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         DbInstrument info = InstrumentsDb::GetInstrumentsDb()->GetInstrumentInfo(Instr);
+         result.Add("INSTRUMENT_FILE", info.InstrFile);
+         result.Add("INSTRUMENT_NR", info.InstrNr);
+         result.Add("FORMAT_FAMILY", info.FormatFamily);
+         result.Add("FORMAT_VERSION", info.FormatVersion);
+         result.Add("SIZE", (int)info.Size);
+         result.Add("CREATED", info.Created);
+         result.Add("MODIFIED", info.Modified);
+         result.Add("DESCRIPTION", _escapeLscpResponse(info.Description));
+         result.Add("IS_DRUM", info.IsDrum);
+         result.Add("PRODUCT", _escapeLscpResponse(info.Product));
+         result.Add("ARTISTS", _escapeLscpResponse(info.Artists));
+         result.Add("KEYWORDS", _escapeLscpResponse(info.Keywords));
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::GetDbInstrumentsJobInfo(int JobId) {
+     dmsg(2,("LSCPServer: GetDbInstrumentsJobInfo(JobId=%d)\n", JobId));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         ScanJob job = InstrumentsDb::GetInstrumentsDb()->Jobs.GetJobById(JobId);
+         result.Add("FILES_TOTAL", job.FilesTotal);
+         result.Add("FILES_SCANNED", job.FilesScanned);
+         result.Add("SCANNING", job.Scanning);
+         result.Add("STATUS", job.Status);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::SetDbInstrumentName(String Instr, String Name) {
+     dmsg(2,("LSCPServer: SetDbInstrumentName(Instr=%s,Name=%s)\n", Instr.c_str(), Name.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->RenameInstrument(Instr, Name);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::MoveDbInstrument(String Instr, String Dst) {
+     dmsg(2,("LSCPServer: MoveDbInstrument(Instr=%s,Dst=%s)\n", Instr.c_str(), Dst.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->MoveInstrument(Instr, Dst);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::CopyDbInstrument(String Instr, String Dst) {
+     dmsg(2,("LSCPServer: CopyDbInstrument(Instr=%s,Dst=%s)\n", Instr.c_str(), Dst.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->CopyInstrument(Instr, Dst);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::SetDbInstrumentDescription(String Instr, String Desc) {
+     dmsg(2,("LSCPServer: SetDbInstrumentDescription(Instr=%s,Desc=%s)\n", Instr.c_str(), Desc.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->SetInstrumentDescription(Instr, Desc);
+     } 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;
+ #if HAVE_SQLITE3
+     try {
+         SearchQuery Query;
+         std::map<String,String>::iterator iter;
+         for (iter = Parameters.begin(); iter != Parameters.end(); iter++) {
+             if (iter->first.compare("NAME") == 0) {
+                 Query.Name = iter->second;
+             } else if (iter->first.compare("CREATED") == 0) {
+                 Query.SetCreated(iter->second);
+             } else if (iter->first.compare("MODIFIED") == 0) {
+                 Query.SetModified(iter->second);
+             } else if (iter->first.compare("DESCRIPTION") == 0) {
+                 Query.Description = iter->second;
+             } else {
+                 throw Exception("Unknown search criteria: " + iter->first);
+             }
+         }
+         String list;
+         StringListPtr pDirectories =
+             InstrumentsDb::GetInstrumentsDb()->FindDirectories(Dir, &Query, Recursive);
+         for (int i = 0; i < pDirectories->size(); i++) {
+             if (list != "") list += ",";
+             list += "'" + InstrumentsDb::toEscapedPath(pDirectories->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::FindDbInstruments(String Dir, std::map<String,String> Parameters, bool Recursive) {
+     dmsg(2,("LSCPServer: FindDbInstruments(Dir=%s)\n", Dir.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         SearchQuery Query;
+         std::map<String,String>::iterator iter;
+         for (iter = Parameters.begin(); iter != Parameters.end(); iter++) {
+             if (iter->first.compare("NAME") == 0) {
+                 Query.Name = iter->second;
+             } else if (iter->first.compare("FORMAT_FAMILIES") == 0) {
+                 Query.SetFormatFamilies(iter->second);
+             } else if (iter->first.compare("SIZE") == 0) {
+                 Query.SetSize(iter->second);
+             } else if (iter->first.compare("CREATED") == 0) {
+                 Query.SetCreated(iter->second);
+             } else if (iter->first.compare("MODIFIED") == 0) {
+                 Query.SetModified(iter->second);
+             } else if (iter->first.compare("DESCRIPTION") == 0) {
+                 Query.Description = iter->second;
+             } else if (iter->first.compare("IS_DRUM") == 0) {
+                 if (!strcasecmp(iter->second.c_str(), "true")) {
+                     Query.InstrType = SearchQuery::DRUM;
+                 } else {
+                     Query.InstrType = SearchQuery::CHROMATIC;
+                 }
+             } else if (iter->first.compare("PRODUCT") == 0) {
+                  Query.Product = iter->second;
+             } else if (iter->first.compare("ARTISTS") == 0) {
+                  Query.Artists = iter->second;
+             } else if (iter->first.compare("KEYWORDS") == 0) {
+                  Query.Keywords = iter->second;
+             } else {
+                 throw Exception("Unknown search criteria: " + iter->first);
+             }
+         }
+         String list;
+         StringListPtr pInstruments =
+             InstrumentsDb::GetInstrumentsDb()->FindInstruments(Dir, &Query, Recursive);
+         for (int i = 0; i < pInstruments->size(); i++) {
+             if (list != "") list += ",";
+             list += "'" + InstrumentsDb::toEscapedPath(pInstruments->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::FormatInstrumentsDb() {
+     dmsg(2,("LSCPServer: FormatInstrumentsDb()\n"));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->Format();
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
  /**
   * Will be called by the parser to enable or disable echo mode; if echo
   * mode is enabled, all commands from the client will (immediately) be
-Line 1634 
 String LSCPServer::SetEcho(yyparse_param
+Line 3073 
 String LSCPServer::SetEcho(yyparse_param
      try {
          if      (boolean_value == 0) pSession->bVerbose = false;
          else if (boolean_value == 1) pSession->bVerbose = true;
-         else throw LinuxSamplerException("Not a boolean value, must either be 0 or 1");
+         else throw Exception("Not a boolean value, must either be 0 or 1");
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();

 Legend:



Removed from v.778
 


changed lines


 
Added in v.1649
 Legend:



Removed from v.778
 


changed lines


 
Added in v.1649
-Removed from v.778
+Added in v.1649

	ViewVC Help
Powered by ViewVC