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

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

Parent Directory | Revision Log | View Patch Patch

-revision 185 by senkov,
Wed Jul  7 02:49:51 2004 UTC
+revision 1403 by iliev,
Fri Oct 12 09:12:22 2007 UTC
 Line 3
   *   LinuxSampler - modular, streaming capable sampler                     *
   *                                                                         *
   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
+  *   Copyright (C) 2005 - 2007 Christian Schoenebeck                       *
   *                                                                         *
-  *   This program is free software; you can redistribute it and/or modify  *
+  *   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  *
   *   the Free Software Foundation; either version 2 of the License, or     *
   *   (at your option) any later version.                                   *
   *                                                                         *
-  *   This program is distributed in the hope that it will be useful,       *
+  *   This library is distributed in the hope that it will be useful,       *
   *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
   *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
   *   GNU General Public License for more details.                          *
   *                                                                         *
   *   You should have received a copy of the GNU General Public License     *
-  *   along with this program; if not, write to the Free Software           *
+  *   along with this library; if not, write to the Free Software           *
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston,                 *
   *   MA  02111-1307  USA                                                   *
   ***************************************************************************/
-Line 24
+Line 25
  #include "lscpresultset.h"
  #include "lscpevent.h"
- #include "../engines/gig/Engine.h"
+ #include <fcntl.h>
- #include "../audiodriver/AudioOutputDeviceFactory.h"
- #include "../mididriver/MidiInputDeviceFactory.h"
+ #if ! HAVE_SQLITE3
+ #define DOESNT_HAVE_SQLITE3 "No database support. SQLITE3 was not installed when linuxsampler was built."
+ #endif
+ #include "../engines/EngineFactory.h"
+ #include "../engines/EngineChannelFactory.h"
+ #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.
-Line 43
+Line 87
   */
  fd_set LSCPServer::fdSet;
  int LSCPServer::currentSocket = -1;
- std::vector<int> LSCPServer::hSessions = std::vector<int>();
+ 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> >();
  Mutex LSCPServer::NotifyMutex = Mutex();
  Mutex LSCPServer::NotifyBufferMutex = Mutex();
  Mutex LSCPServer::SubscriptionMutex = Mutex();
+ Mutex LSCPServer::RTNotifyMutex = Mutex();
- LSCPServer::LSCPServer(Sampler* pSampler) : Thread(false, 0, -4) {
+ LSCPServer::LSCPServer(Sampler* pSampler, long int addr, short int port) : Thread(true, false, 0, -4) {
+     SocketAddress.sin_family      = AF_INET;
+     SocketAddress.sin_addr.s_addr = addr;
+     SocketAddress.sin_port        = port;
      this->pSampler = pSampler;
-     LSCPEvent::RegisterEvent(LSCPEvent::event_channels, "CHANNELS");
+     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_info, "INFO");
+     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_voice_count, "TOTAL_VOICE_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");
+     hSocket = -1;
+ }
+ LSCPServer::~LSCPServer() {
+     if (hSocket >= 0) close(hSocket);
+ }
+ 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));
+ }
+ #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
+  * this method will return immediately.
+  * @param TimeoutSeconds     - optional: max. wait time in seconds
+  *                             (default: 0s)
+  * @param TimeoutNanoSeconds - optional: max wait time in nano seconds
+  *                             (default: 0ns)
+  * @returns  0 on success, a value less than 0 if timeout exceeded
+  */
+ int LSCPServer::WaitUntilInitialized(long TimeoutSeconds, long TimeoutNanoSeconds) {
+     return Initialized.WaitAndUnlockIf(false, TimeoutSeconds, TimeoutNanoSeconds);
  }
  int LSCPServer::Main() {
-     int hSocket = socket(AF_INET, SOCK_STREAM, 0);
+     hSocket = socket(AF_INET, SOCK_STREAM, 0);
      if (hSocket < 0) {
          std::cerr << "LSCPServer: Could not create server socket." << std::endl;
          //return -1;
          exit(EXIT_FAILURE);
      }
-     SocketAddress.sin_family      = AF_INET;
-     SocketAddress.sin_port        = htons(LSCP_PORT);
-     SocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);
      if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
-         std::cerr << "LSCPServer: Could not bind server socket." << std::endl;
+         std::cerr << "LSCPServer: Could not bind server socket, retrying for " << ToString(LSCP_SERVER_BIND_TIMEOUT) << " seconds...";
-         close(hSocket);
+         for (int trial = 0; true; trial++) { // retry for LSCP_SERVER_BIND_TIMEOUT seconds
-         //return -1;
+             if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
-         exit(EXIT_FAILURE);
+                 if (trial > LSCP_SERVER_BIND_TIMEOUT) {
+                     std::cerr << "gave up!" << std::endl;
+                     close(hSocket);
+                     //return -1;
+                     exit(EXIT_FAILURE);
+                 }
+                 else sleep(1); // sleep 1s
+             }
+             else break; // success
+         }
      }
      listen(hSocket, 1);
-     dmsg(1,("LSCPServer: Server running.\n")); // server running
+     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->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);
-     struct timeval tv;
-     tv.tv_sec = 30;
-     tv.tv_usec = 0;
      FD_ZERO(&fdSet);
      FD_SET(hSocket, &fdSet);
      int maxSessions = hSocket;
-     // Parser initialization
+     timeval timeout;
-     yyparse_param_t yyparse_param;
-     yyparse_param.pServer = this;
      while (true) {
-         fd_set selectSet = fdSet;
+         // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers
-         int retval = select(maxSessions+1, &selectSet, NULL, NULL, &tv);
+         {
+             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 in 30 seconds, try again
+                 continue; //Nothing try again
          if (retval == -1) {
                  std::cerr << "LSCPServer: Socket select error." << std::endl;
                  close(hSocket);
                  exit(EXIT_FAILURE);
          }
          //Accept new connections now (if any)
          if (FD_ISSET(hSocket, &selectSet)) {
                  int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);
-Line 121 
 int LSCPServer::Main() {
+Line 342 
 int LSCPServer::Main() {
                          exit(EXIT_FAILURE);
                  }
-                 hSessions.push_back(socket);
+                 // Parser initialization
+                 yyparse_param_t yyparse_param;
+                 yyparse_param.pServer  = this;
+                 yyparse_param.hSession = socket;
+                 Sessions.push_back(yyparse_param);
                  FD_SET(socket, &fdSet);
                  if (socket > maxSessions)
                          maxSessions = socket;
-Line 131 
 int LSCPServer::Main() {
+Line 357 
 int LSCPServer::Main() {
          }
          //Something was selected and it was not the hSocket, so it must be some command(s) coming.
-         for (std::vector<int>::iterator iter = hSessions.begin(); iter !=  hSessions.end(); iter++) {
+         for (std::vector<yyparse_param_t>::iterator iter = Sessions.begin(); iter != Sessions.end(); iter++) {
-                 if (FD_ISSET(*iter, &selectSet)) {      //Was it this socket?
+                 if (FD_ISSET((*iter).hSession, &selectSet)) {   //Was it this socket?
                          if (GetLSCPCommand(iter)) {     //Have we read the entire command?
                                  dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));
-                                 yylex_init(&yyparse_param.pScanner);
+                                 int dummy; // just a temporary hack to fulfill the restart() function prototype
-                                 currentSocket = *iter;  //a hack
+                                 restart(NULL, dummy); // restart the 'scanner'
-                                 int result = yyparse(&yyparse_param);
+                                 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 146 
 int LSCPServer::Main() {
+Line 379 
 int LSCPServer::Main() {
                          }
                          //socket may have been closed, iter may be invalid, get out of the loop for now.
                          //we'll be back if there is data.
                          break;
                  }
          }
-         //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(), 0);
-                 bufferedNotifies.erase(iterNotify);
-         }
-         NotifyBufferMutex.Unlock();
      }
-     //It will never get here anyway
-     //yylex_destroy(yyparse_param.pScanner);
  }
- void LSCPServer::CloseConnection( std::vector<int>::iterator iter ) {
+ void LSCPServer::CloseConnection( std::vector<yyparse_param_t>::iterator iter ) {
-         int socket = *iter;
+         int socket = (*iter).hSession;
          dmsg(1,("LSCPServer: Client connection terminated on socket:%d.\n",socket));
          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));
-         hSessions.erase(iter);
+         Sessions.erase(iter);
          FD_CLR(socket,  &fdSet);
          SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)
          for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {
-Line 180 
 void LSCPServer::CloseConnection( std::v
+Line 403 
 void LSCPServer::CloseConnection( std::v
          NotifyMutex.Unlock();
  }
+ int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {
+         int subs = 0;
+         SubscriptionMutex.Lock();
+         for( std::list<LSCPEvent::event_t>::iterator iter = events.begin();
+                         iter != events.end(); iter++)
+         {
+                 subs += eventSubscriptions.count(*iter);
+         }
+         SubscriptionMutex.Unlock();
+         return subs;
+ }
  void LSCPServer::SendLSCPNotify( LSCPEvent event ) {
          SubscriptionMutex.Lock();
          if (eventSubscriptions.count(event.GetType()) == 0) {
-Line 193 
 void LSCPServer::SendLSCPNotify( LSCPEve
+Line 428 
 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 225 
 extern int GetLSCPCommand( void *buf, in
+Line 464 
 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.
   * In any case the received portion (complete or incomplete) is saved into bufferedCommand map.
   */
- bool LSCPServer::GetLSCPCommand( std::vector<int>::iterator iter ) {
+ bool LSCPServer::GetLSCPCommand( std::vector<yyparse_param_t>::iterator iter ) {
-         int socket = *iter;
+         int socket = (*iter).hSession;
          char c;
          int i = 0;
          while (true) {
-Line 241 
 bool LSCPServer::GetLSCPCommand( std::ve
+Line 484 
 bool LSCPServer::GetLSCPCommand( std::ve
                          break;
                  }
                  if (result == 1) {
                          if (c == '\r')
                                  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;
-Line 268 
 bool LSCPServer::GetLSCPCommand( std::ve
+Line 511 
 bool LSCPServer::GetLSCPCommand( std::ve
                                          break;
                                  case EAGAIN:
                                          dmsg(2,("LSCPScanner: The socket is marked non-blocking and the receive operation would block, or a receive timeout had been set and the timeout expired before data was received.\n"));
                                          break;
                                  case EINTR:
                                          dmsg(2,("LSCPScanner: The receive was interrupted by delivery of a signal before any data were available.\n"));
                                          break;
                                  case EFAULT:
                                          dmsg(2,("LSCPScanner: The receive buffer pointer(s) point outside the process's address space.\n"));
                                          break;
                                  case EINVAL:
                                          dmsg(2,("LSCPScanner: Invalid argument passed.\n"));
                                          break;
                                  case ENOMEM:
                                          dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));
                                          break;
                                  default:
                                          dmsg(2,("LSCPScanner: Unknown recv() error.\n"));
                                          break;
                          }
                          CloseConnection(iter);
                          break;
                  }
-Line 302 
 void LSCPServer::AnswerClient(String Ret
+Line 545 
 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 346 
 String LSCPServer::CreateAudioOutputDevi
+Line 593 
 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 362 
 String LSCPServer::CreateMidiInputDevice
+Line 609 
 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 376 
 String LSCPServer::DestroyAudioOutputDev
+Line 623 
 String LSCPServer::DestroyAudioOutputDev
      LSCPResultSet result;
      try {
          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices[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 391 
 String LSCPServer::DestroyMidiInputDevic
+Line 638 
 String LSCPServer::DestroyMidiInputDevic
      LSCPResultSet result;
      try {
          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+         if (!devices.count(DeviceIndex)) throw Exception("There is no audio output device with index " + ToString(DeviceIndex) + ".");
          MidiInputDevice* pDevice = devices[DeviceIndex];
-         if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(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 409 
 String LSCPServer::LoadInstrument(String
+Line 666 
 String LSCPServer::LoadInstrument(String
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         Engine* pEngine = pSamplerChannel->GetEngine();
+         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
+         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel yet");
-         if (pSamplerChannel->GetAudioOutputDevice() == NULL)
+         if (!pSamplerChannel->GetAudioOutputDevice())
-             throw LinuxSamplerException("No audio output device on channel");
+             throw Exception("No audio output device connected to sampler channel");
          if (bBackground) {
-             LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);
+             InstrumentManager::instrument_id_t id;
-             pLoadInstrument->StartThread();
+             id.FileName = Filename;
+             id.Index    = uiInstrument;
+             InstrumentManager::LoadInstrumentInBackground(id, pEngineChannel);
+         }
+         else {
+             // tell the engine channel which instrument to load
+             pEngineChannel->PrepareLoadInstrument(Filename.c_str(), uiInstrument);
+             // actually start to load the instrument (blocks until completed)
+             pEngineChannel->LoadInstrument();
          }
-         else pEngine->LoadInstrument(Filename.c_str(), uiInstrument);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
  }
  /**
-  * Will be called by the parser to load and deploy an engine.
+  * Will be called by the parser to assign a sampler engine type to a
+  * sampler channel.
   */
- String LSCPServer::LoadEngine(String EngineName, uint uiSamplerChannel) {
+ String LSCPServer::SetEngineType(String EngineName, uint uiSamplerChannel) {
-     dmsg(2,("LSCPServer: LoadEngine(EngineName=%s,SamplerChannel=%d)\n", EngineName.c_str(), uiSamplerChannel));
+     dmsg(2,("LSCPServer: SetEngineType(EngineName=%s,uiSamplerChannel=%d)\n", EngineName.c_str(), uiSamplerChannel));
      LSCPResultSet result;
      try {
-         Engine::type_t type;
-         if ((EngineName == "GigEngine") || (EngineName == "gig")) type = Engine::type_gig;
-         else throw LinuxSamplerException("Unknown engine type");
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         pSamplerChannel->LoadEngine(type);
+         LockRTNotify();
+         pSamplerChannel->SetEngineType(EngineName);
+         if(HasSoloChannel()) pSamplerChannel->GetEngineChannel()->SetMute(-1);
+         UnlockRTNotify();
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 457 
 String LSCPServer::GetChannels() {
+Line 722 
 String LSCPServer::GetChannels() {
  }
  /**
+  * Will be called by the parser to get the list of sampler channels.
+  */
+ String LSCPServer::ListChannels() {
+     dmsg(2,("LSCPServer: ListChannels()\n"));
+     String list;
+     std::map<uint,SamplerChannel*> channels = pSampler->GetSamplerChannels();
+     std::map<uint,SamplerChannel*>::iterator iter = channels.begin();
+     for (; iter != channels.end(); iter++) {
+         if (list != "") list += ",";
+         list += ToString(iter->first);
+     }
+     LSCPResultSet result;
+     result.Add(list);
+     return result.Produce();
+ }
+ /**
   * Will be called by the parser to add a sampler channel.
   */
  String LSCPServer::AddChannel() {
      dmsg(2,("LSCPServer: AddChannel()\n"));
+     LockRTNotify();
      SamplerChannel* pSamplerChannel = pSampler->AddSamplerChannel();
+     UnlockRTNotify();
      LSCPResultSet result(pSamplerChannel->Index());
      return result.Produce();
  }
-Line 472 
 String LSCPServer::AddChannel() {
+Line 756 
 String LSCPServer::AddChannel() {
  String LSCPServer::RemoveChannel(uint uiSamplerChannel) {
      dmsg(2,("LSCPServer: RemoveChannel(SamplerChannel=%d)\n", uiSamplerChannel));
      LSCPResultSet result;
+     LockRTNotify();
      pSampler->RemoveSamplerChannel(uiSamplerChannel);
+     UnlockRTNotify();
      return result.Produce();
  }
  /**
-  * Will be called by the parser to get all available engines.
+  * Will be called by the parser to get the amount of all available engines.
   */
  String LSCPServer::GetAvailableEngines() {
      dmsg(2,("LSCPServer: GetAvailableEngines()\n"));
-     LSCPResultSet result("GigEngine");
+     LSCPResultSet result;
+     try {
+         int n = EngineFactory::AvailableEngineTypes().size();
+         result.Add(n);
+     }
+     catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ /**
+  * Will be called by the parser to get a list of all available engines.
+  */
+ String LSCPServer::ListAvailableEngines() {
+     dmsg(2,("LSCPServer: ListAvailableEngines()\n"));
+     LSCPResultSet result;
+     try {
+         String s = EngineFactory::AvailableEngineTypesAsString();
+         result.Add(s);
+     }
+     catch (Exception e) {
+         result.Error(e);
+     }
      return result.Produce();
  }
  /**
-  * Will be called by the parser to get descriptions for a particular engine.
+  * Will be called by the parser to get descriptions for a particular
+  * sampler engine.
   */
  String LSCPServer::GetEngineInfo(String EngineName) {
      dmsg(2,("LSCPServer: GetEngineInfo(EngineName=%s)\n", EngineName.c_str()));
      LSCPResultSet result;
+     LockRTNotify();
      try {
-         if ((EngineName == "GigEngine") || (EngineName == "gig")) {
+         Engine* pEngine = EngineFactory::Create(EngineName);
-             Engine* pEngine = new LinuxSampler::gig::Engine;
+         result.Add("DESCRIPTION", _escapeLscpResponse(pEngine->Description()));
-             result.Add(pEngine->Description());
+         result.Add("VERSION",     pEngine->Version());
-             result.Add(pEngine->Version());
+         EngineFactory::Destroy(pEngine);
-             delete pEngine;
-         }
-         else throw LinuxSamplerException("Unknown engine type");
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
+     UnlockRTNotify();
      return result.Produce();
  }
-Line 515 
 String LSCPServer::GetChannelInfo(uint u
+Line 824 
 String LSCPServer::GetChannelInfo(uint u
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         Engine* pEngine = pSamplerChannel->GetEngine();
+         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
          //Defaults values
          String EngineName = "NONE";
-         float Volume = 0;
+         float Volume = 0.0f;
          String InstrumentFileName = "NONE";
+         String InstrumentName = "NONE";
          int InstrumentIndex = -1;
          int InstrumentStatus = -1;
+         int AudioOutputChannels = 0;
-         if (pEngine) {
+         String AudioRouting;
-             EngineName =  pEngine->EngineName();
+         int Mute = 0;
-             Volume = pEngine->Volume();
+         bool Solo = false;
-             InstrumentStatus = pEngine->InstrumentStatus();
+         String MidiInstrumentMap = "NONE";
-             InstrumentIndex = pEngine->InstrumentIndex();
-             if (InstrumentIndex != -1)
+         if (pEngineChannel) {
-                 InstrumentFileName = pEngine->InstrumentFileName();
+             EngineName          = pEngineChannel->EngineName();
+             AudioOutputChannels = pEngineChannel->Channels();
+             Volume              = pEngineChannel->Volume();
+             InstrumentStatus    = pEngineChannel->InstrumentStatus();
+             InstrumentIndex     = pEngineChannel->InstrumentIndex();
+             if (InstrumentIndex != -1) {
+                 InstrumentFileName = pEngineChannel->InstrumentFileName();
+                 InstrumentName     = pEngineChannel->InstrumentName();
+             }
+             for (int chan = 0; chan < pEngineChannel->Channels(); chan++) {
+                 if (AudioRouting != "") AudioRouting += ",";
+                 AudioRouting += ToString(pEngineChannel->OutputChannel(chan));
+             }
+             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 539 
 String LSCPServer::GetChannelInfo(uint u
+Line 869 
 String LSCPServer::GetChannelInfo(uint u
          //Some not-so-hardcoded stuff to make GUI look good
          result.Add("AUDIO_OUTPUT_DEVICE", GetAudioOutputDeviceIndex(pSamplerChannel->GetAudioOutputDevice()));
-         result.Add("AUDIO_OUTPUT_CHANNELS", "2");
+         result.Add("AUDIO_OUTPUT_CHANNELS", AudioOutputChannels);
-         result.Add("AUDIO_OUTPUT_ROUTING", "0,1");
+         result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);
          result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice()));
          result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());
-         result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
+         if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");
+         else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
-         result.Add("INSTRUMENT_FILE", InstrumentFileName);
+         result.Add("INSTRUMENT_FILE",
+                    (InstrumentFileName != "NONE" && InstrumentFileName != "") ?
+                         Path::fromPosix(InstrumentFileName).toLscp() : // TODO: assuming POSIX
+                         InstrumentFileName
+         );
          result.Add("INSTRUMENT_NR", InstrumentIndex);
+         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 565 
 String LSCPServer::GetVoiceCount(uint ui
+Line 904 
 String LSCPServer::GetVoiceCount(uint ui
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         Engine* pEngine = pSamplerChannel->GetEngine();
+         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
+         if (!pEngineChannel) throw Exception("No engine loaded on sampler channel");
-         result.Add(pEngine->VoiceCount());
+         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 585 
 String LSCPServer::GetStreamCount(uint u
+Line 925 
 String LSCPServer::GetStreamCount(uint u
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         Engine* pEngine = pSamplerChannel->GetEngine();
+         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
+         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
-         result.Add(pEngine->DiskStreamCount());
+         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 605 
 String LSCPServer::GetBufferFill(fill_re
+Line 946 
 String LSCPServer::GetBufferFill(fill_re
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         Engine* pEngine = pSamplerChannel->GetEngine();
+         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
+         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
-         if (!pEngine->DiskStreamSupported())
+         if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
-             result.Add("NA");
+         if (!pEngineChannel->GetEngine()->DiskStreamSupported()) result.Add("NA");
          else {
              switch (ResponseType) {
                  case fill_response_bytes:
-                     result.Add(pEngine->DiskStreamBufferFillBytes());
+                     result.Add(pEngineChannel->GetEngine()->DiskStreamBufferFillBytes());
                      break;
                  case fill_response_percentage:
-                     result.Add(pEngine->DiskStreamBufferFillPercentage());
+                     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 633 
 String LSCPServer::GetAvailableAudioOutp
+Line 974 
 String LSCPServer::GetAvailableAudioOutp
      dmsg(2,("LSCPServer: GetAvailableAudioOutputDrivers()\n"));
      LSCPResultSet result;
      try {
+         int n = AudioOutputDeviceFactory::AvailableDrivers().size();
+         result.Add(n);
+     }
+     catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::ListAvailableAudioOutputDrivers() {
+     dmsg(2,("LSCPServer: ListAvailableAudioOutputDrivers()\n"));
+     LSCPResultSet result;
+     try {
          String s = AudioOutputDeviceFactory::AvailableDriversAsString();
          result.Add(s);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 646 
 String LSCPServer::GetAvailableMidiInput
+Line 1000 
 String LSCPServer::GetAvailableMidiInput
      dmsg(2,("LSCPServer: GetAvailableMidiInputDrivers()\n"));
      LSCPResultSet result;
      try {
+         int n = MidiInputDeviceFactory::AvailableDrivers().size();
+         result.Add(n);
+     }
+     catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::ListAvailableMidiInputDrivers() {
+     dmsg(2,("LSCPServer: ListAvailableMidiInputDrivers()\n"));
+     LSCPResultSet result;
+     try {
          String s = MidiInputDeviceFactory::AvailableDriversAsString();
          result.Add(s);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 673 
 String LSCPServer::GetMidiInputDriverInf
+Line 1040 
 String LSCPServer::GetMidiInputDriverInf
              result.Add("PARAMETERS", s);
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 697 
 String LSCPServer::GetAudioOutputDriverI
+Line 1064 
 String LSCPServer::GetAudioOutputDriverI
              result.Add("PARAMETERS", s);
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
  }
  String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
-     dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str()));
+     dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s,DependencyListSize=%d)\n",Driver.c_str(),Parameter.c_str(),DependencyList.size()));
      LSCPResultSet result;
      try {
          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);
-Line 713 
 String LSCPServer::GetMidiInputDriverPar
+Line 1080 
 String LSCPServer::GetMidiInputDriverPar
          result.Add("MANDATORY",    pParameter->Mandatory());
          result.Add("FIX",          pParameter->Fix());
          result.Add("MULTIPLICITY", pParameter->Multiplicity());
-         if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());
+         optional<String> oDepends       = pParameter->Depends();
-         if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());
+         optional<String> oDefault       = pParameter->Default(DependencyList);
-         if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());
+         optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
-         if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());
+         optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
-         if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());
+         optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
+         if (oDepends)       result.Add("DEPENDS",       *oDepends);
+         if (oDefault)       result.Add("DEFAULT",       *oDefault);
+         if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
+         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();
  }
  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
-     dmsg(2,("LSCPServer: GetAudioOutputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str()));
+     dmsg(2,("LSCPServer: GetAudioOutputDriverParameterInfo(Driver=%s,Parameter=%s,DependencyListSize=%d)\n",Driver.c_str(),Parameter.c_str(),DependencyList.size()));
      LSCPResultSet result;
      try {
          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);
-Line 735 
 String LSCPServer::GetAudioOutputDriverP
+Line 1107 
 String LSCPServer::GetAudioOutputDriverP
          result.Add("MANDATORY",    pParameter->Mandatory());
          result.Add("FIX",          pParameter->Fix());
          result.Add("MULTIPLICITY", pParameter->Multiplicity());
-         if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());
+         optional<String> oDepends       = pParameter->Depends();
-         if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());
+         optional<String> oDefault       = pParameter->Default(DependencyList);
-         if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());
+         optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
-         if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());
+         optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
-         if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());
+         optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
+         if (oDepends)       result.Add("DEPENDS",       *oDepends);
+         if (oDefault)       result.Add("DEFAULT",       *oDefault);
+         if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
+         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 754 
 String LSCPServer::GetAudioOutputDeviceC
+Line 1131 
 String LSCPServer::GetAudioOutputDeviceC
          uint count = pSampler->AudioOutputDevices();
          result.Add(count); // success
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 767 
 String LSCPServer::GetMidiInputDeviceCou
+Line 1144 
 String LSCPServer::GetMidiInputDeviceCou
          uint count = pSampler->MidiInputDevices();
          result.Add(count); // success
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 786 
 String LSCPServer::GetAudioOutputDevices
+Line 1163 
 String LSCPServer::GetAudioOutputDevices
          }
          result.Add(s);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 805 
 String LSCPServer::GetMidiInputDevices()
+Line 1182 
 String LSCPServer::GetMidiInputDevices()
          }
          result.Add(s);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 816 
 String LSCPServer::GetAudioOutputDeviceI
+Line 1193 
 String LSCPServer::GetAudioOutputDeviceI
      LSCPResultSet result;
      try {
          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices[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());
+         result.Add("DRIVER", pDevice->Driver());
          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
          for (; iter != parameters.end(); iter++) {
              result.Add(iter->first, iter->second->Value());
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 836 
 String LSCPServer::GetMidiInputDeviceInf
+Line 1213 
 String LSCPServer::GetMidiInputDeviceInf
      LSCPResultSet result;
      try {
          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+         if (!devices.count(DeviceIndex)) throw Exception("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
          MidiInputDevice* pDevice = devices[DeviceIndex];
-         if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
+         result.Add("DRIVER", pDevice->Driver());
-         result.Add("driver", pDevice->Driver());
          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
          for (; iter != parameters.end(); iter++) {
              result.Add(iter->first, iter->second->Value());
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 854 
 String LSCPServer::GetMidiInputPortInfo(
+Line 1231 
 String LSCPServer::GetMidiInputPortInfo(
      dmsg(2,("LSCPServer: GetMidiInputPortInfo(DeviceIndex=%d, PortIndex=%d)\n",DeviceIndex, PortIndex));
      LSCPResultSet result;
      try {
+         // get MIDI input device
          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+         if (!devices.count(DeviceIndex)) throw Exception("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
          MidiInputDevice* pDevice = devices[DeviceIndex];
-         if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
-         MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
+         // get MIDI port
-         if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
+         MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
-         std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();
+         if (!pMidiInputPort) throw Exception("There is no MIDI input port with index " + ToString(PortIndex) + ".");
-         std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
+         // return the values of all MIDI port parameters
+         std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
+         std::map<String,DeviceRuntimeParameter*>::iterator iter = parameters.begin();
          for (; iter != parameters.end(); iter++) {
              result.Add(iter->first, iter->second->Value());
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 877 
 String LSCPServer::GetAudioOutputChannel
+Line 1259 
 String LSCPServer::GetAudioOutputChannel
      try {
          // get audio output device
          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices[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 ouotput device does not have 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 891 
 String LSCPServer::GetAudioOutputChannel
+Line 1273 
 String LSCPServer::GetAudioOutputChannel
              result.Add(iter->first, iter->second->Value());
          }
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 901 
 String LSCPServer::GetMidiInputPortParam
+Line 1283 
 String LSCPServer::GetMidiInputPortParam
      dmsg(2,("LSCPServer: GetMidiInputPortParameterInfo(DeviceId=%d,PortId=%d,ParameterName=%s)\n",DeviceId,PortId,ParameterName.c_str()));
      LSCPResultSet result;
      try {
-         // get audio output device
+         // get MIDI input device
          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
-         if (!devices[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
-         MidiInputDevice::MidiInputPort* pPort = pDevice->GetPort(PortId);
+         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,DeviceCreationParameter*> parameters = pPort->DeviceParameters();
+         std::map<String,DeviceRuntimeParameter*> parameters = pPort->PortParameters();
-         if (!parameters[ParameterName]) throw LinuxSamplerException("Midi port does not provice a parameters '" + ParameterName + "'.");
+         if (!parameters.count(ParameterName)) throw Exception("Midi port does not provide a parameter '" + ParameterName + "'.");
-         DeviceCreationParameter* pParameter = parameters[ParameterName];
+         DeviceRuntimeParameter* pParameter = parameters[ParameterName];
          // return all fields of this audio channel parameter
          result.Add("TYPE",         pParameter->Type());
          result.Add("DESCRIPTION",  pParameter->Description());
          result.Add("FIX",          pParameter->Fix());
          result.Add("MULTIPLICITY", pParameter->Multiplicity());
-         if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());
+         if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
-         if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());
+         if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
-         if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());
+         if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 936 
 String LSCPServer::GetAudioOutputChannel
+Line 1318 
 String LSCPServer::GetAudioOutputChannel
      try {
          // get audio output device
          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices[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 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[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 953 
 String LSCPServer::GetAudioOutputChannel
+Line 1335 
 String LSCPServer::GetAudioOutputChannel
          result.Add("DESCRIPTION",  pParameter->Description());
          result.Add("FIX",          pParameter->Fix());
          result.Add("MULTIPLICITY", pParameter->Multiplicity());
-         if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());
+         if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
-         if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());
+         if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
-         if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());
+         if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
-Line 969 
 String LSCPServer::SetAudioOutputChannel
+Line 1351 
 String LSCPServer::SetAudioOutputChannel
      try {
          // get audio output device
          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices[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 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[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 995 
 String LSCPServer::SetAudioOutputDeviceP
+Line 1378 
 String LSCPServer::SetAudioOutputDeviceP
      LSCPResultSet result;
      try {
          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (!devices[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[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 1012 
 String LSCPServer::SetMidiInputDevicePar
+Line 1396 
 String LSCPServer::SetMidiInputDevicePar
      LSCPResultSet result;
      try {
          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
-         if (!devices[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[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 1028 
 String LSCPServer::SetMidiInputPortParam
+Line 1413 
 String LSCPServer::SetMidiInputPortParam
      dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
      LSCPResultSet result;
      try {
+         // get MIDI input device
          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+         if (!devices.count(DeviceIndex)) throw Exception("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
          MidiInputDevice* pDevice = devices[DeviceIndex];
-         if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
-         MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
+         // get MIDI port
-         if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
+         MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
-         std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();
+         if (!pMidiInputPort) throw Exception("There is no MIDI input port with index " + ToString(PortIndex) + ".");
-         if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
+         // set port parameter value
+         std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
+         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 1049 
 String LSCPServer::SetMidiInputPortParam
+Line 1440 
 String LSCPServer::SetMidiInputPortParam
   */
  String LSCPServer::SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel) {
      dmsg(2,("LSCPServer: SetAudioOutputChannel(ChannelAudioOutputChannel=%d, AudioOutputDeviceInputChannel=%d, SamplerChannel=%d)\n",ChannelAudioOutputChannel,AudioOutputDeviceInputChannel,uiSamplerChannel));
-     return "ERR:0:Not implemented yet.\r\n"; //FIXME: Add support for this in resultset class?
+     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 yet assigned 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 (Exception e) {
+          result.Error(e);
+     }
+     return result.Produce();
  }
  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 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 Exception("There is no audio output device with index " + ToString(AudioDeviceId));
          AudioOutputDevice* pDevice = devices[AudioDeviceId];
-         if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(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 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 == "Alsa") AudioOutputDriver = "ALSA";
-         if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";
+         if (AudioOutputDriver == "Jack") AudioOutputDriver = "JACK";
          // Check if there's one audio output device already created
          // for the intended audio driver type (AudioOutputDriver)...
          AudioOutputDevice *pDevice = NULL;
-Line 1096 
 String LSCPServer::SetAudioOutputType(St
+Line 1502 
 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 1111 
 String LSCPServer::SetMIDIInputPort(uint
+Line 1518 
 String LSCPServer::SetMIDIInputPort(uint
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid 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 1125 
 String LSCPServer::SetMIDIInputChannel(u
+Line 1532 
 String LSCPServer::SetMIDIInputChannel(u
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         pSamplerChannel->SetMidiInputChannel((MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);
+         pSamplerChannel->SetMidiInputChannel((midi_chan_t) MIDIChannel);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 1139 
 String LSCPServer::SetMIDIInputDevice(ui
+Line 1546 
 String LSCPServer::SetMIDIInputDevice(ui
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid 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 Exception("There is no MIDI input device with index " + ToString(MIDIDeviceId));
          MidiInputDevice* pDevice = devices[MIDIDeviceId];
-         if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
          pSamplerChannel->SetMidiInputDevice(pDevice);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 1156 
 String LSCPServer::SetMIDIInputType(Stri
+Line 1563 
 String LSCPServer::SetMIDIInputType(Stri
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
          // Driver type name aliasing...
-         if (MidiInputDriver == "ALSA") MidiInputDriver = "Alsa";
+         if (MidiInputDriver == "Alsa") MidiInputDriver = "ALSA";
          // Check if there's one MIDI input device already created
          // for the intended MIDI driver type (MidiInputDriver)...
          MidiInputDevice *pDevice = NULL;
-Line 1176 
 String LSCPServer::SetMIDIInputType(Stri
+Line 1583 
 String LSCPServer::SetMIDIInputType(Stri
              pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);
              // Make it with at least one initial port.
              std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
-             parameters["ports"]->SetValue("1");
+             parameters["PORTS"]->SetValue("1");
          }
          // 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 1199 
 String LSCPServer::SetMIDIInput(uint MID
+Line 1606 
 String LSCPServer::SetMIDIInput(uint MID
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Invalid 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 Exception("There is no MIDI input device with index " + ToString(MIDIDeviceId));
          MidiInputDevice* pDevice = devices[MIDIDeviceId];
-         if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
+         pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (midi_chan_t) MIDIChannel);
-         pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
-Line 1215 
 String LSCPServer::SetMIDIInput(uint MID
+Line 1622 
 String LSCPServer::SetMIDIInput(uint MID
   * Will be called by the parser to change the global volume factor on a
   * particular sampler channel.
   */
- String LSCPServer::SetVolume(double Volume, uint uiSamplerChannel) {
+ String LSCPServer::SetVolume(double dVolume, uint uiSamplerChannel) {
-     dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", Volume, uiSamplerChannel));
+     dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", dVolume, uiSamplerChannel));
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         Engine* pEngine = pSamplerChannel->GetEngine();
+         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
+         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
-         pEngine->Volume(Volume);
+         pEngineChannel->Volume(dVolume);
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
  }
  /**
+  * Will be called by the parser to mute/unmute particular sampler channel.
+  */
+ String LSCPServer::SetChannelMute(bool bMute, uint uiSamplerChannel) {
+     dmsg(2,("LSCPServer: SetChannelMute(bMute=%d,uiSamplerChannel=%d)\n",bMute,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(!bMute) pEngineChannel->SetMute((HasSoloChannel() && !pEngineChannel->GetSolo()) ? -1 : 0);
+         else pEngineChannel->SetMute(1);
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ /**
+  * Will be called by the parser to solo particular sampler channel.
+  */
+ String LSCPServer::SetChannelSolo(bool bSolo, uint uiSamplerChannel) {
+     dmsg(2,("LSCPServer: SetChannelSolo(bSolo=%d,uiSamplerChannel=%d)\n",bSolo,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");
+         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 (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ /**
+  * Determines whether there is at least one solo channel in the channel list.
+  *
+  * @returns true if there is at least one solo channel in the channel list,
+  * false otherwise.
+  */
+ bool LSCPServer::HasSoloChannel() {
+     std::map<uint,SamplerChannel*> channels = pSampler->GetSamplerChannels();
+     std::map<uint,SamplerChannel*>::iterator iter = channels.begin();
+     for (; iter != channels.end(); iter++) {
+         EngineChannel* c = iter->second->GetEngineChannel();
+         if(c && c->GetSolo()) return true;
+     }
+     return false;
+ }
+ /**
+  * Mutes all unmuted non-solo channels. Notice that the channels are muted
+  * with -1 which indicates that they are muted because of the presence
+  * of a solo channel(s). Channels muted with -1 will be automatically unmuted
+  * when there are no solo channels left.
+  */
+ void LSCPServer::MuteNonSoloChannels() {
+     dmsg(2,("LSCPServer: MuteNonSoloChannels()\n"));
+     std::map<uint,SamplerChannel*> channels = pSampler->GetSamplerChannels();
+     std::map<uint,SamplerChannel*>::iterator iter = channels.begin();
+     for (; iter != channels.end(); iter++) {
+         EngineChannel* c = iter->second->GetEngineChannel();
+         if(c && !c->GetSolo() && !c->GetMute()) c->SetMute(-1);
+     }
+ }
+ /**
+  * Unmutes all channels that are muted because of the presence
+  * of a solo channel(s).
+  */
+ void  LSCPServer::UnmuteChannels() {
+     dmsg(2,("LSCPServer: UnmuteChannels()\n"));
+     std::map<uint,SamplerChannel*> channels = pSampler->GetSamplerChannels();
+     std::map<uint,SamplerChannel*>::iterator iter = channels.begin();
+     for (; iter != channels.end(); iter++) {
+         EngineChannel* c = iter->second->GetEngineChannel();
+         if(c && c->GetMute() == -1) c->SetMute(0);
+     }
+ }
+ 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
+             result.Add("NAME", _escapeLscpResponse(iter->second.Name));
+             result.Add("ENGINE_NAME", iter->second.EngineName);
+             result.Add("INSTRUMENT_FILE", Path::fromPosix(iter->second.InstrumentFile).toLscp()); //TODO: assuming POSIX
+             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.
   */
  String LSCPServer::ResetChannel(uint uiSamplerChannel) {
-Line 1239 
 String LSCPServer::ResetChannel(uint uiS
+Line 2235 
 String LSCPServer::ResetChannel(uint uiS
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         Engine* pEngine = pSamplerChannel->GetEngine();
+         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
+         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
-         pEngine->Reset();
+         pEngineChannel->Reset();
      }
-     catch (LinuxSamplerException e) {
+     catch (Exception e) {
           result.Error(e);
      }
      return result.Produce();
  }
  /**
+  * Will be called by the parser to reset the whole sampler.
+  */
+ String LSCPServer::ResetSampler() {
+     dmsg(2,("LSCPServer: ResetSampler()\n"));
+     pSampler->Reset();
+     LSCPResultSet result;
+     return result.Produce();
+ }
+ /**
+  * Will be called by the parser to return general informations about this
+  * sampler.
+  */
+ String LSCPServer::GetServerInfo() {
+     dmsg(2,("LSCPServer: GetServerInfo()\n"));
+     const std::string description =
+         _escapeLscpResponse("LinuxSampler - modular, streaming capable sampler");
+     LSCPResultSet result;
+     result.Add("DESCRIPTION", description);
+     result.Add("VERSION", VERSION);
+     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 voices.
+  */
+ String LSCPServer::GetTotalVoiceCount() {
+     dmsg(2,("LSCPServer: GetTotalVoiceCount()\n"));
+     LSCPResultSet result;
+     result.Add(pSampler->GetVoiceCount());
+     return result.Produce();
+ }
+ /**
+  * Will be called by the parser to return the maximum number of voices.
+  */
+ String LSCPServer::GetTotalVoiceCountMax() {
+     dmsg(2,("LSCPServer: GetTotalVoiceCountMax()\n"));
+     LSCPResultSet result;
+     result.Add(EngineFactory::EngineInstances().size() * CONFIG_MAX_VOICES);
+     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();
+ }
+ /**
   * Will be called by the parser to subscribe a client (frontend) on the
   * server for receiving event messages.
   */
-Line 1276 
 String LSCPServer::UnsubscribeNotificati
+Line 2341 
 String LSCPServer::UnsubscribeNotificati
      return result.Produce();
  }
+ String LSCPServer::AddDbInstrumentDirectory(String Dir) {
+     dmsg(2,("LSCPServer: AddDbInstrumentDirectory(Dir=%s)\n", Dir.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->AddDirectory(Dir);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
- // Instrument loader constructor.
+ String LSCPServer::RemoveDbInstrumentDirectory(String Dir, bool Force) {
- LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)
+     dmsg(2,("LSCPServer: RemoveDbInstrumentDirectory(Dir=%s,Force=%d)\n", Dir.c_str(), Force));
-     : Thread(false, 0, -4)
+     LSCPResultSet result;
- {
+ #if HAVE_SQLITE3
-     this->pEngine = pEngine;
+     try {
-     this->Filename = Filename;
+         InstrumentsDb::GetInstrumentsDb()->RemoveDirectory(Dir, Force);
-     this->uiInstrument = uiInstrument;
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
  }
- // Instrument loader process.
+ String LSCPServer::GetDbInstrumentDirectoryCount(String Dir, bool Recursive) {
- int LSCPLoadInstrument::Main()
+     dmsg(2,("LSCPServer: GetDbInstrumentDirectoryCount(Dir=%s,Recursive=%d)\n", Dir.c_str(), Recursive));
- {
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         result.Add(InstrumentsDb::GetInstrumentsDb()->GetDirectoryCount(Dir, Recursive));
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #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);
+     }
+ #else
+     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 {
-         pEngine->LoadInstrument(Filename.c_str(), uiInstrument);
+         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);
+             }
+         }
-     catch (LinuxSamplerException e) {
+         String list;
-         e.PrintMessage();
+         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();
+ }
-     // Always re-enable the engine.
+ String LSCPServer::FindDbInstruments(String Dir, std::map<String,String> Parameters, bool Recursive) {
-     pEngine->Enable();
+     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);
+             }
+         }
-     // FIXME: Shoot ourselves on the foot?
+         String list;
-     delete this;
+         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
+  * echoed back to the client.
+  */
+ String LSCPServer::SetEcho(yyparse_param_t* pSession, double boolean_value) {
+     dmsg(2,("LSCPServer: SetEcho(val=%f)\n", boolean_value));
+     LSCPResultSet result;
+     try {
+         if      (boolean_value == 0) pSession->bVerbose = false;
+         else if (boolean_value == 1) pSession->bVerbose = true;
+         else throw Exception("Not a boolean value, must either be 0 or 1");
+     }
+     catch (Exception e) {
+          result.Error(e);
+     }
+     return result.Produce();
  }

 Legend:



Removed from v.185
 


changed lines


 
Added in v.1403
 Legend:



Removed from v.185
 


changed lines


 
Added in v.1403
-Removed from v.185
+Added in v.1403

	ViewVC Help
Powered by ViewVC