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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1007 by schoenebeck,
Tue Jan  2 15:37:01 2007 UTC
+revision 1774 by iliev,
Thu Sep 11 18:11:06 2008 UTC
 Line 3
   *   LinuxSampler - modular, streaming capable sampler                     *
   *                                                                         *
   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
-  *   Copyright (C) 2005, 2006 Christian Schoenebeck                        *
+  *   Copyright (C) 2005 - 2008 Christian Schoenebeck                       *
   *                                                                         *
   *   This library is free software; you can redistribute it and/or modify  *
   *   it under the terms of the GNU General Public License as published by  *
 Line 21
   *   MA  02111-1307  USA                                                   *
   ***************************************************************************/
+ #include <algorithm>
+ #include <string>
  #include "lscpserver.h"
  #include "lscpresultset.h"
  #include "lscpevent.h"
- #include "../common/global.h"
+ #if defined(WIN32)
+ #include <windows.h>
+ #else
  #include <fcntl.h>
+ #endif
- #if HAVE_SQLITE3
+ #if ! HAVE_SQLITE3
- # include "sqlite3.h"
+ #define DOESNT_HAVE_SQLITE3 "No database support. SQLITE3 was not installed when linuxsampler was built."
  #endif
  #include "../engines/EngineFactory.h"
-Line 37
+Line 43
  #include "../drivers/audio/AudioOutputDeviceFactory.h"
  #include "../drivers/midi/MidiInputDeviceFactory.h"
+ namespace LinuxSampler {
+ /**
+  * Returns a copy of the given string where all special characters are
+  * replaced by LSCP escape sequences ("\xHH"). This function shall be used
+  * to escape LSCP response fields in case the respective response field is
+  * actually defined as using escape sequences in the LSCP specs.
+  *
+  * @e Caution: DO NOT use this function for escaping path based responses,
+  * use the Path class (src/common/Path.h) for this instead!
+  */
+ static String _escapeLscpResponse(String txt) {
+     for (int i = 0; i < txt.length(); i++) {
+         const char c = txt.c_str()[i];
+         if (
+             !(c >= '0' && c <= '9') &&
+             !(c >= 'a' && c <= 'z') &&
+             !(c >= 'A' && c <= 'Z') &&
+             !(c == ' ') && !(c == '!') && !(c == '#') && !(c == '$') &&
+             !(c == '%') && !(c == '&') && !(c == '(') && !(c == ')') &&
+             !(c == '*') && !(c == '+') && !(c == ',') && !(c == '-') &&
+             !(c == '.') && !(c == '/') && !(c == ':') && !(c == ';') &&
+             !(c == '<') && !(c == '=') && !(c == '>') && !(c == '?') &&
+             !(c == '@') && !(c == '[') && !(c == ']') &&
+             !(c == '^') && !(c == '_') && !(c == '`') && !(c == '{') &&
+             !(c == '|') && !(c == '}') && !(c == '~')
+         ) {
+             // convert the "special" character into a "\xHH" LSCP escape sequence
+             char buf[5];
+             snprintf(buf, sizeof(buf), "\\x%02x", static_cast<unsigned char>(c));
+             txt.replace(i, 1, buf);
+             i += 3;
+         }
+     }
+     return txt;
+ }
  /**
   * Below are a few static members of the LSCPServer class.
   * The big assumption here is that LSCPServer is going to remain a singleton.
-Line 53
+Line 96
  fd_set LSCPServer::fdSet;
  int LSCPServer::currentSocket = -1;
  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();
+ std::vector<yyparse_param_t>::iterator itCurrentSession = std::vector<yyparse_param_t>::iterator();
  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();
  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();
  std::map< LSCPEvent::event_t, std::list<int> > LSCPServer::eventSubscriptions = std::map< LSCPEvent::event_t, std::list<int> >();
-Line 61 
 Mutex LSCPServer::NotifyBufferMutex = Mu
+Line 105 
 Mutex LSCPServer::NotifyBufferMutex = Mu
  Mutex LSCPServer::SubscriptionMutex = Mutex();
  Mutex LSCPServer::RTNotifyMutex = Mutex();
- LSCPServer::LSCPServer(Sampler* pSampler, long int addr, short int port) : Thread(true, false, 0, -4) {
+ LSCPServer::LSCPServer(Sampler* pSampler, long int addr, short int port) : Thread(true, false, 0, -4), eventHandler(this) {
      SocketAddress.sin_family      = AF_INET;
      SocketAddress.sin_addr.s_addr = addr;
      SocketAddress.sin_port        = port;
-Line 75 
 LSCPServer::LSCPServer(Sampler* pSampler
+Line 119 
 LSCPServer::LSCPServer(Sampler* pSampler
      LSCPEvent::RegisterEvent(LSCPEvent::event_stream_count, "STREAM_COUNT");
      LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL");
      LSCPEvent::RegisterEvent(LSCPEvent::event_channel_info, "CHANNEL_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_fx_send_count, "FX_SEND_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_fx_send_info, "FX_SEND_INFO");
      LSCPEvent::RegisterEvent(LSCPEvent::event_midi_instr_map_count, "MIDI_INSTRUMENT_MAP_COUNT");
      LSCPEvent::RegisterEvent(LSCPEvent::event_midi_instr_map_info, "MIDI_INSTRUMENT_MAP_INFO");
      LSCPEvent::RegisterEvent(LSCPEvent::event_midi_instr_count, "MIDI_INSTRUMENT_COUNT");
      LSCPEvent::RegisterEvent(LSCPEvent::event_midi_instr_info, "MIDI_INSTRUMENT_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_dir_count, "DB_INSTRUMENT_DIRECTORY_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_dir_info, "DB_INSTRUMENT_DIRECTORY_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_count, "DB_INSTRUMENT_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_db_instrs_job_info, "DB_INSTRUMENTS_JOB_INFO");
      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_total_stream_count, "TOTAL_STREAM_COUNT");
      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_channel_midi, "CHANNEL_MIDI");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_device_midi, "DEVICE_MIDI");
      hSocket = -1;
  }
  LSCPServer::~LSCPServer() {
+ #if defined(WIN32)
+     if (hSocket >= 0) closesocket(hSocket);
+ #else
      if (hSocket >= 0) close(hSocket);
+ #endif
+ }
+ LSCPServer::EventHandler::EventHandler(LSCPServer* pParent) {
+     this->pParent = pParent;
+ }
+ LSCPServer::EventHandler::~EventHandler() {
+     std::vector<midi_listener_entry> l = channelMidiListeners;
+     channelMidiListeners.clear();
+     for (int i = 0; i < l.size(); i++)
+         delete l[i].pMidiListener;
+ }
+ void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, NewCount));
+ }
+ void LSCPServer::EventHandler::ChannelAdded(SamplerChannel* pChannel) {
+     pChannel->AddEngineChangeListener(this);
+ }
+ void LSCPServer::EventHandler::ChannelToBeRemoved(SamplerChannel* pChannel) {
+     if (!pChannel->GetEngineChannel()) return;
+     EngineToBeChanged(pChannel->Index());
+ }
+ void LSCPServer::EventHandler::EngineToBeChanged(int ChannelId) {
+     SamplerChannel* pSamplerChannel =
+         pParent->pSampler->GetSamplerChannel(ChannelId);
+     if (!pSamplerChannel) return;
+     EngineChannel* pEngineChannel =
+         pSamplerChannel->GetEngineChannel();
+     if (!pEngineChannel) return;
+     for (std::vector<midi_listener_entry>::iterator iter = channelMidiListeners.begin(); iter != channelMidiListeners.end(); ++iter) {
+         if ((*iter).pEngineChannel == pEngineChannel) {
+             VirtualMidiDevice* pMidiListener = (*iter).pMidiListener;
+             pEngineChannel->Disconnect(pMidiListener);
+             channelMidiListeners.erase(iter);
+             delete pMidiListener;
+             return;
+         }
+     }
+ }
+ void LSCPServer::EventHandler::EngineChanged(int ChannelId) {
+     SamplerChannel* pSamplerChannel =
+         pParent->pSampler->GetSamplerChannel(ChannelId);
+     if (!pSamplerChannel) return;
+     EngineChannel* pEngineChannel =
+         pSamplerChannel->GetEngineChannel();
+     if (!pEngineChannel) return;
+     VirtualMidiDevice* pMidiListener = new VirtualMidiDevice;
+     pEngineChannel->Connect(pMidiListener);
+     midi_listener_entry entry = {
+         pSamplerChannel, pEngineChannel, pMidiListener
+     };
+     channelMidiListeners.push_back(entry);
+ }
+ void LSCPServer::EventHandler::AudioDeviceCountChanged(int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_audio_device_count, NewCount));
+ }
+ void LSCPServer::EventHandler::MidiDeviceCountChanged(int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_device_count, NewCount));
+ }
+ void LSCPServer::EventHandler::MidiDeviceToBeDestroyed(MidiInputDevice* pDevice) {
+     pDevice->RemoveMidiPortCountListener(this);
+     for (int i = 0; i < pDevice->PortCount(); ++i)
+         MidiPortToBeRemoved(pDevice->GetPort(i));
+ }
+ void LSCPServer::EventHandler::MidiDeviceCreated(MidiInputDevice* pDevice) {
+     pDevice->AddMidiPortCountListener(this);
+     for (int i = 0; i < pDevice->PortCount(); ++i)
+         MidiPortAdded(pDevice->GetPort(i));
+ }
+ void LSCPServer::EventHandler::MidiPortCountChanged(int NewCount) {
+     // yet unused
+ }
+ void LSCPServer::EventHandler::MidiPortToBeRemoved(MidiInputPort* pPort) {
+     for (std::vector<device_midi_listener_entry>::iterator iter = deviceMidiListeners.begin(); iter != deviceMidiListeners.end(); ++iter) {
+         if ((*iter).pPort == pPort) {
+             VirtualMidiDevice* pMidiListener = (*iter).pMidiListener;
+             pPort->Disconnect(pMidiListener);
+             deviceMidiListeners.erase(iter);
+             delete pMidiListener;
+             return;
+         }
+     }
+ }
+ void LSCPServer::EventHandler::MidiPortAdded(MidiInputPort* pPort) {
+     // find out the device ID
+     std::map<uint, MidiInputDevice*> devices =
+         pParent->pSampler->GetMidiInputDevices();
+     for (
+         std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
+         iter != devices.end(); ++iter
+     ) {
+         if (iter->second == pPort->GetDevice()) { // found
+             VirtualMidiDevice* pMidiListener = new VirtualMidiDevice;
+             pPort->Connect(pMidiListener);
+             device_midi_listener_entry entry = {
+                 pPort, pMidiListener, iter->first
+             };
+             deviceMidiListeners.push_back(entry);
+             return;
+         }
+     }
+ }
+ void LSCPServer::EventHandler::MidiInstrumentCountChanged(int MapId, int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_count, MapId, NewCount));
+ }
+ void LSCPServer::EventHandler::MidiInstrumentInfoChanged(int MapId, int Bank, int Program) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_info, MapId, Bank, Program));
+ }
+ void LSCPServer::EventHandler::MidiInstrumentMapCountChanged(int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_map_count, NewCount));
+ }
+ void LSCPServer::EventHandler::MidiInstrumentMapInfoChanged(int MapId) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_map_info, MapId));
+ }
+ void LSCPServer::EventHandler::FxSendCountChanged(int ChannelId, int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_count, ChannelId, NewCount));
+ }
+ void LSCPServer::EventHandler::VoiceCountChanged(int ChannelId, int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_voice_count, ChannelId, NewCount));
+ }
+ void LSCPServer::EventHandler::StreamCountChanged(int ChannelId, int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_stream_count, ChannelId, NewCount));
+ }
+ void LSCPServer::EventHandler::BufferFillChanged(int ChannelId, String FillData) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_buffer_fill, ChannelId, FillData));
+ }
+ void LSCPServer::EventHandler::TotalVoiceCountChanged(int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_voice_count, NewCount));
+ }
+ void LSCPServer::EventHandler::TotalStreamCountChanged(int NewCount) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_stream_count, NewCount));
+ }
+ #if HAVE_SQLITE3
+ void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, InstrumentsDb::toEscapedPath(Dir)));
+ }
+ void LSCPServer::DbInstrumentsEventHandler::DirectoryInfoChanged(String Dir) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, InstrumentsDb::toEscapedPath(Dir)));
+ }
+ void LSCPServer::DbInstrumentsEventHandler::DirectoryNameChanged(String Dir, String NewName) {
+     Dir = "'" + InstrumentsDb::toEscapedPath(Dir) + "'";
+     NewName = "'" + InstrumentsDb::toEscapedPath(NewName) + "'";
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, "NAME", Dir, NewName));
+ }
+ void LSCPServer::DbInstrumentsEventHandler::InstrumentCountChanged(String Dir) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_count, InstrumentsDb::toEscapedPath(Dir)));
  }
+ void LSCPServer::DbInstrumentsEventHandler::InstrumentInfoChanged(String Instr) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, InstrumentsDb::toEscapedPath(Instr)));
+ }
+ void LSCPServer::DbInstrumentsEventHandler::InstrumentNameChanged(String Instr, String NewName) {
+     Instr = "'" + InstrumentsDb::toEscapedPath(Instr) + "'";
+     NewName = "'" + InstrumentsDb::toEscapedPath(NewName) + "'";
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, "NAME", Instr, NewName));
+ }
+ void LSCPServer::DbInstrumentsEventHandler::JobStatusChanged(int JobId) {
+     LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instrs_job_info, JobId));
+ }
+ #endif // HAVE_SQLITE3
  /**
   * Blocks the calling thread until the LSCP Server is initialized and
   * accepting socket connections, if the server is already initialized then
-Line 103 
 int LSCPServer::WaitUntilInitialized(lon
+Line 350 
 int LSCPServer::WaitUntilInitialized(lon
  }
  int LSCPServer::Main() {
+         #if defined(WIN32)
+         WSADATA wsaData;
+         int iResult;
+         iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
+         if (iResult != 0) {
+                 std::cerr << "LSCPServer: WSAStartup failed: " << iResult << "\n";
+                 exit(EXIT_FAILURE);
+         }
+         #endif
      hSocket = socket(AF_INET, SOCK_STREAM, 0);
      if (hSocket < 0) {
          std::cerr << "LSCPServer: Could not create server socket." << std::endl;
-Line 116 
 int LSCPServer::Main() {
+Line 372 
 int LSCPServer::Main() {
              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {
                      std::cerr << "gave up!" << std::endl;
+                     #if defined(WIN32)
+                     closesocket(hSocket);
+                     #else
                      close(hSocket);
+                     #endif
                      //return -1;
                      exit(EXIT_FAILURE);
                  }
-Line 129 
 int LSCPServer::Main() {
+Line 389 
 int LSCPServer::Main() {
      listen(hSocket, 1);
      Initialized.Set(true);
+     // Registering event listeners
+     pSampler->AddChannelCountListener(&eventHandler);
+     pSampler->AddAudioDeviceCountListener(&eventHandler);
+     pSampler->AddMidiDeviceCountListener(&eventHandler);
+     pSampler->AddVoiceCountListener(&eventHandler);
+     pSampler->AddStreamCountListener(&eventHandler);
+     pSampler->AddBufferFillListener(&eventHandler);
+     pSampler->AddTotalStreamCountListener(&eventHandler);
+     pSampler->AddTotalVoiceCountListener(&eventHandler);
+     pSampler->AddFxSendCountListener(&eventHandler);
+     MidiInstrumentMapper::AddMidiInstrumentCountListener(&eventHandler);
+     MidiInstrumentMapper::AddMidiInstrumentInfoListener(&eventHandler);
+     MidiInstrumentMapper::AddMidiInstrumentMapCountListener(&eventHandler);
+     MidiInstrumentMapper::AddMidiInstrumentMapInfoListener(&eventHandler);
+ #if HAVE_SQLITE3
+     InstrumentsDb::GetInstrumentsDb()->AddInstrumentsDbListener(&dbInstrumentsEventHandler);
+ #endif
      // now wait for client connections and handle their requests
      sockaddr_in client;
      int length = sizeof(client);
-Line 139 
 int LSCPServer::Main() {
+Line 416 
 int LSCPServer::Main() {
      timeval timeout;
      while (true) {
+         #if CONFIG_PTHREAD_TESTCANCEL
+                 TestCancel();
+         #endif
          // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers
          {
              std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();
-Line 146 
 int LSCPServer::Main() {
+Line 426 
 int LSCPServer::Main() {
              std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();
              for (; itEngineChannel != itEnd; ++itEngineChannel) {
                  if ((*itEngineChannel)->StatusChanged()) {
-                     SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_info, (*itEngineChannel)->iSamplerChannelIndex));
+                     SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_info, (*itEngineChannel)->GetSamplerChannel()->Index()));
+                 }
+                 for (int i = 0; i < (*itEngineChannel)->GetFxSendCount(); i++) {
+                     FxSend* fxs = (*itEngineChannel)->GetFxSend(i);
+                     if(fxs != NULL && fxs->IsInfoChanged()) {
+                         int chn = (*itEngineChannel)->GetSamplerChannel()->Index();
+                         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, chn, fxs->Id()));
+                         fxs->SetInfoChanged(false);
+                     }
+                 }
+             }
+         }
+         // check if MIDI data arrived on some engine channel
+         for (int i = 0; i < eventHandler.channelMidiListeners.size(); ++i) {
+             const EventHandler::midi_listener_entry entry =
+                 eventHandler.channelMidiListeners[i];
+             VirtualMidiDevice* pMidiListener = entry.pMidiListener;
+             if (pMidiListener->NotesChanged()) {
+                 for (int iNote = 0; iNote < 128; iNote++) {
+                     if (pMidiListener->NoteChanged(iNote)) {
+                         const bool bActive = pMidiListener->NoteIsActive(iNote);
+                         LSCPServer::SendLSCPNotify(
+                             LSCPEvent(
+                                 LSCPEvent::event_channel_midi,
+                                 entry.pSamplerChannel->Index(),
+                                 std::string(bActive ? "NOTE_ON" : "NOTE_OFF"),
+                                 iNote,
+                                 bActive ? pMidiListener->NoteOnVelocity(iNote)
+                                         : pMidiListener->NoteOffVelocity(iNote)
+                             )
+                         );
+                     }
+                 }
+             }
+         }
+         // check if MIDI data arrived on some MIDI device
+         for (int i = 0; i < eventHandler.deviceMidiListeners.size(); ++i) {
+             const EventHandler::device_midi_listener_entry entry =
+                 eventHandler.deviceMidiListeners[i];
+             VirtualMidiDevice* pMidiListener = entry.pMidiListener;
+             if (pMidiListener->NotesChanged()) {
+                 for (int iNote = 0; iNote < 128; iNote++) {
+                     if (pMidiListener->NoteChanged(iNote)) {
+                         const bool bActive = pMidiListener->NoteIsActive(iNote);
+                         LSCPServer::SendLSCPNotify(
+                             LSCPEvent(
+                                 LSCPEvent::event_device_midi,
+                                 entry.uiDeviceID,
+                                 entry.pPort->GetPortNumber(),
+                                 std::string(bActive ? "NOTE_ON" : "NOTE_OFF"),
+                                 iNote,
+                                 bActive ? pMidiListener->NoteOnVelocity(iNote)
+                                         : pMidiListener->NoteOffVelocity(iNote)
+                             )
+                         );
+                     }
                  }
              }
          }
-Line 173 
 int LSCPServer::Main() {
+Line 511 
 int LSCPServer::Main() {
                  continue; //Nothing try again
          if (retval == -1) {
                  std::cerr << "LSCPServer: Socket select error." << std::endl;
+                 #if defined(WIN32)
+                 closesocket(hSocket);
+                 #else
                  close(hSocket);
+                 #endif
                  exit(EXIT_FAILURE);
          }
-Line 185 
 int LSCPServer::Main() {
+Line 527 
 int LSCPServer::Main() {
                          exit(EXIT_FAILURE);
                  }
+                 #if defined(WIN32)
+                 u_long nonblock_io = 1;
+                 if( ioctlsocket(socket, FIONBIO, &nonblock_io) ) {
+                   std::cerr << "LSCPServer: ioctlsocket: set FIONBIO failed. Error " << WSAGetLastError() << std::endl;
+                   exit(EXIT_FAILURE);
+                 }
+         #else
                  if (fcntl(socket, F_SETFL, O_NONBLOCK)) {
                          std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;
                          exit(EXIT_FAILURE);
                  }
+                 #endif
                  // Parser initialization
                  yyparse_param_t yyparse_param;
-Line 212 
 int LSCPServer::Main() {
+Line 562 
 int LSCPServer::Main() {
                                  int dummy; // just a temporary hack to fulfill the restart() function prototype
                                  restart(NULL, dummy); // restart the 'scanner'
                                  currentSocket = (*iter).hSession;  //a hack
+                                 itCurrentSession = iter; // another hack
                                  dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));
                                  if ((*iter).bVerbose) { // if echo mode enabled
                                      AnswerClient(bufferedCommands[currentSocket]);
                                  }
                                  int result = yyparse(&(*iter));
                                  currentSocket = -1;     //continuation of a hack
+                                 itCurrentSession = Sessions.end(); // hack as well
                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?
                                          CloseConnection(iter);
-Line 245 
 void LSCPServer::CloseConnection( std::v
+Line 597 
 void LSCPServer::CloseConnection( std::v
          NotifyMutex.Lock();
          bufferedCommands.erase(socket);
          bufferedNotifies.erase(socket);
+         #if defined(WIN32)
+         closesocket(socket);
+         #else
          close(socket);
+         #endif
          NotifyMutex.Unlock();
  }
+ void LSCPServer::LockRTNotify() {
+     RTNotifyMutex.Lock();
+ }
+ void LSCPServer::UnlockRTNotify() {
+     RTNotifyMutex.Unlock();
+ }
  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {
          int subs = 0;
          SubscriptionMutex.Lock();
-Line 310 
 extern int GetLSCPCommand( void *buf, in
+Line 674 
 extern int GetLSCPCommand( void *buf, in
          return command.size();
  }
+ extern yyparse_param_t* GetCurrentYaccSession() {
+     return &(*itCurrentSession);
+ }
  /**
   * Will be called to try to read the command from the socket
   * If command is read, it will return true. Otherwise false is returned.
-Line 320 
 bool LSCPServer::GetLSCPCommand( std::ve
+Line 688 
 bool LSCPServer::GetLSCPCommand( std::ve
          char c;
          int i = 0;
          while (true) {
+                 #if defined(WIN32)
+                 int result = recv(socket, (char *)&c, 1, 0); //Read one character at a time for now
+                 #else
                  int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now
+                 #endif
                  if (result == 0) { //socket was selected, so 0 here means client has closed the connection
                          CloseConnection(iter);
                          break;
-Line 335 
 bool LSCPServer::GetLSCPCommand( std::ve
+Line 707 
 bool LSCPServer::GetLSCPCommand( std::ve
                          }
                          bufferedCommands[socket] += c;
                  }
+                 #if defined(WIN32)
+                 if (result == SOCKET_ERROR) {
+                     int wsa_lasterror = WSAGetLastError();
+                         if (wsa_lasterror == WSAEWOULDBLOCK) //Would block, try again later.
+                                 return false;
+                         dmsg(2,("LSCPScanner: Socket error after recv() Error %d.\n", wsa_lasterror));
+                         CloseConnection(iter);
+                         break;
+                 }
+                 #else
                  if (result == -1) {
                          if (errno == EAGAIN) //Would block, try again later.
                                  return false;
-Line 373 
 bool LSCPServer::GetLSCPCommand( std::ve
+Line 755 
 bool LSCPServer::GetLSCPCommand( std::ve
                          CloseConnection(iter);
                          break;
                  }
+                 #endif
          }
          return false;
  }
-Line 490 
 String LSCPServer::DestroyMidiInputDevic
+Line 873 
 String LSCPServer::DestroyMidiInputDevic
      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 636 
 String LSCPServer::GetEngineInfo(String
+Line 1029 
 String LSCPServer::GetEngineInfo(String
      LockRTNotify();
      try {
          Engine* pEngine = EngineFactory::Create(EngineName);
-         result.Add("DESCRIPTION", pEngine->Description());
+         result.Add("DESCRIPTION", _escapeLscpResponse(pEngine->Description()));
          result.Add("VERSION",     pEngine->Version());
          EngineFactory::Destroy(pEngine);
      }
-Line 670 
 String LSCPServer::GetChannelInfo(uint u
+Line 1063 
 String LSCPServer::GetChannelInfo(uint u
          String AudioRouting;
          int Mute = 0;
          bool Solo = false;
-         String MidiInstrumentMap;
+         String MidiInstrumentMap = "NONE";
          if (pEngineChannel) {
              EngineName          = pEngineChannel->EngineName();
-Line 709 
 String LSCPServer::GetChannelInfo(uint u
+Line 1102 
 String LSCPServer::GetChannelInfo(uint u
          if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");
          else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
+         // convert the filename into the correct encoding as defined for LSCP
+         // (especially in terms of special characters -> escape sequences)
+         if (InstrumentFileName != "NONE" && InstrumentFileName != "") {
+ #if WIN32
+             InstrumentFileName = Path::fromWindows(InstrumentFileName).toLscp();
+ #else
+             // assuming POSIX
+             InstrumentFileName = Path::fromPosix(InstrumentFileName).toLscp();
+ #endif
+         }
          result.Add("INSTRUMENT_FILE", InstrumentFileName);
          result.Add("INSTRUMENT_NR", InstrumentIndex);
-         result.Add("INSTRUMENT_NAME", InstrumentName);
+         result.Add("INSTRUMENT_NAME", _escapeLscpResponse(InstrumentName));
          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
          result.Add("MUTE", Mute == -1 ? "MUTED_BY_SOLO" : (Mute ? "true" : "false"));
          result.Add("SOLO", Solo);
-Line 731 
 String LSCPServer::GetVoiceCount(uint ui
+Line 1135 
 String LSCPServer::GetVoiceCount(uint ui
      dmsg(2,("LSCPServer: GetVoiceCount(SamplerChannel=%d)\n", uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine loaded on sampler channel");
          if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
          result.Add(pEngineChannel->GetEngine()->VoiceCount());
      }
-Line 752 
 String LSCPServer::GetStreamCount(uint u
+Line 1153 
 String LSCPServer::GetStreamCount(uint u
      dmsg(2,("LSCPServer: GetStreamCount(SamplerChannel=%d)\n", uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
          result.Add(pEngineChannel->GetEngine()->DiskStreamCount());
      }
-Line 773 
 String LSCPServer::GetBufferFill(fill_re
+Line 1171 
 String LSCPServer::GetBufferFill(fill_re
      dmsg(2,("LSCPServer: GetBufferFill(ResponseType=%d, SamplerChannel=%d)\n", ResponseType, uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
          if (!pEngineChannel->GetEngine()->DiskStreamSupported()) result.Add("NA");
          else {
-Line 1454 
 String LSCPServer::SetVolume(double dVol
+Line 1849 
 String LSCPServer::SetVolume(double dVol
      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", dVolume, uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          pEngineChannel->Volume(dVolume);
      }
      catch (Exception e) {
-Line 1473 
 String LSCPServer::SetChannelMute(bool b
+Line 1865 
 String LSCPServer::SetChannelMute(bool b
      dmsg(2,("LSCPServer: SetChannelMute(bMute=%d,uiSamplerChannel=%d)\n",bMute,uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          if(!bMute) pEngineChannel->SetMute((HasSoloChannel() && !pEngineChannel->GetSolo()) ? -1 : 0);
          else pEngineChannel->SetMute(1);
-Line 1494 
 String LSCPServer::SetChannelSolo(bool b
+Line 1882 
 String LSCPServer::SetChannelSolo(bool b
      dmsg(2,("LSCPServer: SetChannelSolo(bSolo=%d,uiSamplerChannel=%d)\n",bSolo,uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          bool oldSolo = pEngineChannel->GetSolo();
          bool hadSoloChannel = HasSoloChannel();
          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);
-Line 1567 
 void  LSCPServer::UnmuteChannels() {
+Line 1951 
 void  LSCPServer::UnmuteChannels() {
      }
  }
- String LSCPServer::AddOrReplaceMIDIInstrumentMapping(uint MidiMapID, uint MidiBank, uint MidiProg, String EngineType, String InstrumentFile, uint InstrumentIndex, float Volume, MidiInstrumentMapper::mode_t LoadMode, String Name) {
+ 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;
-Line 1585 
 String LSCPServer::AddOrReplaceMIDIInstr
+Line 1969 
 String LSCPServer::AddOrReplaceMIDIInstr
      LSCPResultSet result;
      try {
-         // PERSISTENT mapping commands might bloock for a long time, so in
+         // PERSISTENT mapping commands might block for a long time, so in
-         // that case we add/replace the mapping in another thread
+         // that case we add/replace the mapping in another thread in case
-         bool bInBackground = (entry.LoadMode == MidiInstrumentMapper::PERSISTENT);
+         // 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);
-Line 1616 
 String LSCPServer::GetMidiInstrumentMapp
+Line 2002 
 String LSCPServer::GetMidiInstrumentMapp
      dmsg(2,("LSCPServer: GetMidiInstrumentMappings()\n"));
      LSCPResultSet result;
      try {
-         result.Add(MidiInstrumentMapper::Entries(MidiMapID).size());
+         result.Add(MidiInstrumentMapper::GetInstrumentCount(MidiMapID));
      } catch (Exception e) {
          result.Error(e);
      }
-Line 1627 
 String LSCPServer::GetMidiInstrumentMapp
+Line 2013 
 String LSCPServer::GetMidiInstrumentMapp
  String LSCPServer::GetAllMidiInstrumentMappings() {
      dmsg(2,("LSCPServer: GetAllMidiInstrumentMappings()\n"));
      LSCPResultSet result;
-     std::vector<int> maps = MidiInstrumentMapper::Maps();
+     try {
-     int totalMappings = 0;
+         result.Add(MidiInstrumentMapper::GetInstrumentCount());
-     for (int i = 0; i < maps.size(); i++) {
+     } catch (Exception e) {
-         try {
+         result.Error(e);
-             totalMappings += MidiInstrumentMapper::Entries(maps[i]).size();
-         } catch (Exception e) { /*NOOP*/ }
      }
-     result.Add(totalMappings);
      return result.Produce();
  }
-Line 1642 
 String LSCPServer::GetMidiInstrumentMapp
+Line 2025 
 String LSCPServer::GetMidiInstrumentMapp
      dmsg(2,("LSCPServer: GetMidiIstrumentMapping()\n"));
      LSCPResultSet result;
      try {
-         midi_prog_index_t idx;
+         MidiInstrumentMapper::entry_t entry = MidiInstrumentMapper::GetEntry(MidiMapID, MidiBank, MidiProg);
-         idx.midi_bank_msb = (MidiBank >> 7) & 0x7f;
+         // convert the filename into the correct encoding as defined for LSCP
-         idx.midi_bank_lsb = MidiBank & 0x7f;
+         // (especially in terms of special characters -> escape sequences)
-         idx.midi_prog     = MidiProg;
+ #if WIN32
+         const String instrumentFileName = Path::fromWindows(entry.InstrumentFile).toLscp();
+ #else
+         // assuming POSIX
+         const String instrumentFileName = Path::fromPosix(entry.InstrumentFile).toLscp();
+ #endif
-         std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t> mappings = MidiInstrumentMapper::Entries(MidiMapID);
+         result.Add("NAME", _escapeLscpResponse(entry.Name));
-         std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t>::iterator iter = mappings.find(idx);
+         result.Add("ENGINE_NAME", entry.EngineName);
-         if (iter == mappings.end()) result.Error("there is no map entry with that index");
+         result.Add("INSTRUMENT_FILE", instrumentFileName);
-         else { // found
+         result.Add("INSTRUMENT_NR", (int) entry.InstrumentIndex);
-             result.Add("NAME", iter->second.Name);
+         String instrumentName;
-             result.Add("ENGINE_NAME", iter->second.EngineName);
+         Engine* pEngine = EngineFactory::Create(entry.EngineName);
-             result.Add("INSTRUMENT_FILE", iter->second.InstrumentFile);
+         if (pEngine) {
-             result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);
+             if (pEngine->GetInstrumentManager()) {
-             String instrumentName;
+                 InstrumentManager::instrument_id_t instrID;
-             Engine* pEngine = EngineFactory::Create(iter->second.EngineName);
+                 instrID.FileName = entry.InstrumentFile;
-             if (pEngine) {
+                 instrID.Index    = entry.InstrumentIndex;
-                 if (pEngine->GetInstrumentManager()) {
+                 instrumentName = pEngine->GetInstrumentManager()->GetInstrumentName(instrID);
-                     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", instrumentName);
+             EngineFactory::Destroy(pEngine);
-             switch (iter->second.LoadMode) {
+         }
-                 case MidiInstrumentMapper::ON_DEMAND:
+         result.Add("INSTRUMENT_NAME", _escapeLscpResponse(instrumentName));
-                     result.Add("LOAD_MODE", "ON_DEMAND");
+         switch (entry.LoadMode) {
-                     break;
+             case MidiInstrumentMapper::ON_DEMAND:
-                 case MidiInstrumentMapper::ON_DEMAND_HOLD:
+                 result.Add("LOAD_MODE", "ON_DEMAND");
-                     result.Add("LOAD_MODE", "ON_DEMAND_HOLD");
+                 break;
-                     break;
+             case MidiInstrumentMapper::ON_DEMAND_HOLD:
-                 case MidiInstrumentMapper::PERSISTENT:
+                 result.Add("LOAD_MODE", "ON_DEMAND_HOLD");
-                     result.Add("LOAD_MODE", "PERSISTENT");
+                 break;
-                     break;
+             case MidiInstrumentMapper::PERSISTENT:
-                 default:
+                 result.Add("LOAD_MODE", "PERSISTENT");
-                     throw Exception("entry reflects invalid LOAD_MODE, consider this as a bug!");
+                 break;
-             }
+             default:
-             result.Add("VOLUME", iter->second.Volume);
+                 throw Exception("entry reflects invalid LOAD_MODE, consider this as a bug!");
          }
+         result.Add("VOLUME", entry.Volume);
      } catch (Exception e) {
          result.Error(e);
      }
-Line 1720 
 String LSCPServer::ListAllMidiInstrument
+Line 2103 
 String LSCPServer::ListAllMidiInstrument
              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_bank_msb) << 7) | int(iter->first.midi_bank_lsb)) + ","
                           + ToString(int(iter->first.midi_prog)) + "}";
              }
          }
-Line 1821 
 String LSCPServer::GetMidiInstrumentMap(
+Line 2204 
 String LSCPServer::GetMidiInstrumentMap(
      dmsg(2,("LSCPServer: GetMidiInstrumentMap()\n"));
      LSCPResultSet result;
      try {
-         result.Add("NAME", MidiInstrumentMapper::MapName(MidiMapID));
+         result.Add("NAME", _escapeLscpResponse(MidiInstrumentMapper::MapName(MidiMapID)));
+         result.Add("DEFAULT", MidiInstrumentMapper::GetDefaultMap() == MidiMapID);
      } catch (Exception e) {
          result.Error(e);
      }
-Line 1851 
 String LSCPServer::SetChannelMap(uint ui
+Line 2235 
 String LSCPServer::SetChannelMap(uint ui
      dmsg(2,("LSCPServer: SetChannelMap()\n"));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
          if      (MidiMapID == -1) pEngineChannel->SetMidiInstrumentMapToNone();
          else if (MidiMapID == -2) pEngineChannel->SetMidiInstrumentMapToDefault();
-Line 1870 
 String LSCPServer::CreateFxSend(uint uiS
+Line 2250 
 String LSCPServer::CreateFxSend(uint uiS
      dmsg(2,("LSCPServer: CreateFxSend()\n"));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
          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)");
-Line 1890 
 String LSCPServer::DestroyFxSend(uint ui
+Line 2266 
 String LSCPServer::DestroyFxSend(uint ui
      dmsg(2,("LSCPServer: DestroyFxSend()\n"));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
          FxSend* pFxSend = NULL;
          for (int i = 0; i < pEngineChannel->GetFxSendCount(); i++) {
-Line 1915 
 String LSCPServer::GetFxSends(uint uiSam
+Line 2287 
 String LSCPServer::GetFxSends(uint uiSam
      dmsg(2,("LSCPServer: GetFxSends()\n"));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
          result.Add(pEngineChannel->GetFxSendCount());
      } catch (Exception e) {
-Line 1933 
 String LSCPServer::ListFxSends(uint uiSa
+Line 2301 
 String LSCPServer::ListFxSends(uint uiSa
      LSCPResultSet result;
      String list;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
          for (int i = 0; i < pEngineChannel->GetFxSendCount(); i++) {
              FxSend* pFxSend = pEngineChannel->GetFxSend(i);
-Line 1951 
 String LSCPServer::ListFxSends(uint uiSa
+Line 2315 
 String LSCPServer::ListFxSends(uint uiSa
      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 {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
-         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");
          // gather audio routing informations
          String AudioRouting;
-Line 1978 
 String LSCPServer::GetFxSendInfo(uint ui
+Line 2344 
 String LSCPServer::GetFxSendInfo(uint ui
          }
          // success
-         result.Add("NAME", pFxSend->Name());
+         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);
-Line 1986 
 String LSCPServer::GetFxSendInfo(uint ui
+Line 2354 
 String LSCPServer::GetFxSendInfo(uint ui
      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 {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
+         pFxSend->SetDestinationChannel(FxSendChannel, DeviceChannel);
-         if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, uiSamplerChannel, FxSendID));
+     } catch (Exception e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
-         FxSend* pFxSend = NULL;
+ String LSCPServer::SetFxSendMidiController(uint uiSamplerChannel, uint FxSendID, uint MidiController) {
-         for (int i = 0; i < pEngineChannel->GetFxSendCount(); i++) {
+     dmsg(2,("LSCPServer: SetFxSendMidiController()\n"));
-             if (pEngineChannel->GetFxSend(i)->Id() == FxSendID) {
+     LSCPResultSet result;
-                 pFxSend = pEngineChannel->GetFxSend(i);
+     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 {
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
+         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();
+ }
+ String LSCPServer::SendChannelMidiData(String MidiMsg, uint uiSamplerChannel, uint Arg1, uint Arg2) {
+     dmsg(2,("LSCPServer: SendChannelMidiData(MidiMsg=%s,uiSamplerChannel=%d,Arg1=%d,Arg2=%d)\n", MidiMsg.c_str(), uiSamplerChannel, Arg1, Arg2));
+     LSCPResultSet result;
+     try {
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
+         if (Arg1 > 127 || Arg2 > 127) {
+             throw Exception("Invalid MIDI message");
+         }
+         VirtualMidiDevice* pMidiDevice = NULL;
+         std::vector<EventHandler::midi_listener_entry>::iterator iter = eventHandler.channelMidiListeners.begin();
+         for (; iter != eventHandler.channelMidiListeners.end(); ++iter) {
+             if ((*iter).pEngineChannel == pEngineChannel) {
+                 pMidiDevice = (*iter).pMidiListener;
                  break;
              }
          }
-         if (!pFxSend) throw Exception("There is no FxSend with that ID on the given sampler channel");
+         if(pMidiDevice == NULL) throw Exception("Couldn't find virtual MIDI device");
-         pFxSend->SetDestinationChannel(FxSendChannel, DeviceChannel);
+         if (MidiMsg == "NOTE_ON") {
+             pMidiDevice->SendNoteOnToDevice(Arg1, Arg2);
+             bool b = pMidiDevice->SendNoteOnToSampler(Arg1, Arg2);
+             if (!b) throw Exception("MIDI event failed: " + MidiMsg + " " + ToString(Arg1) + " " + ToString(Arg2));
+         } else if (MidiMsg == "NOTE_OFF") {
+             pMidiDevice->SendNoteOffToDevice(Arg1, Arg2);
+             bool b = pMidiDevice->SendNoteOffToSampler(Arg1, Arg2);
+             if (!b) throw Exception("MIDI event failed: " + MidiMsg + " " + ToString(Arg1) + " " + ToString(Arg2));
+         } else {
+             throw Exception("Unknown MIDI message type: " + MidiMsg);
+         }
      } catch (Exception e) {
          result.Error(e);
      }
-Line 2019 
 String LSCPServer::ResetChannel(uint uiS
+Line 2474 
 String LSCPServer::ResetChannel(uint uiS
      dmsg(2,("LSCPServer: ResetChannel(SamplerChannel=%d)\n", uiSamplerChannel));
      LSCPResultSet result;
      try {
-         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
-         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
          pEngineChannel->Reset();
      }
      catch (Exception e) {
-Line 2047 
 String LSCPServer::ResetSampler() {
+Line 2499 
 String LSCPServer::ResetSampler() {
   */
  String LSCPServer::GetServerInfo() {
      dmsg(2,("LSCPServer: GetServerInfo()\n"));
+     const std::string description =
+         _escapeLscpResponse("LinuxSampler - modular, streaming capable sampler");
      LSCPResultSet result;
-     result.Add("DESCRIPTION", "LinuxSampler - modular, streaming capable sampler");
+     result.Add("DESCRIPTION", description);
      result.Add("VERSION", VERSION);
      result.Add("PROTOCOL_VERSION", ToString(LSCP_RELEASE_MAJOR) + "." + ToString(LSCP_RELEASE_MINOR));
+ #if HAVE_SQLITE3
+     result.Add("INSTRUMENTS_DB_SUPPORT", "yes");
+ #else
+     result.Add("INSTRUMENTS_DB_SUPPORT", "no");
+ #endif
+     return result.Produce();
+ }
+ /**
+  * Will be called by the parser to return the current number of all active streams.
+  */
+ String LSCPServer::GetTotalStreamCount() {
+     dmsg(2,("LSCPServer: GetTotalStreamCount()\n"));
+     LSCPResultSet result;
+     result.Add(pSampler->GetDiskStreamCount());
      return result.Produce();
  }
-Line 2084 
 String LSCPServer::SetGlobalVolume(doubl
+Line 2554 
 String LSCPServer::SetGlobalVolume(doubl
      LSCPResultSet result;
      try {
          if (dVolume < 0) throw Exception("Volume may not be negative");
-         GLOBAL_VOLUME = dVolume; // see common/global.cpp
+         GLOBAL_VOLUME = dVolume; // see common/global_private.cpp
+         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "VOLUME", GLOBAL_VOLUME));
      } catch (Exception e) {
          result.Error(e);
      }
      return result.Produce();
  }
+ String LSCPServer::GetFileInstruments(String Filename) {
+     dmsg(2,("LSCPServer: GetFileInstruments(String Filename=%s)\n",Filename.c_str()));
+     LSCPResultSet result;
+     try {
+         VerifyFile(Filename);
+     } catch (Exception e) {
+         result.Error(e);
+         return result.Produce();
+     }
+     // try to find a sampler engine that can handle the file
+     bool bFound = false;
+     std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
+     for (int i = 0; !bFound && i < engineTypes.size(); i++) {
+         Engine* pEngine = NULL;
+         try {
+             pEngine = EngineFactory::Create(engineTypes[i]);
+             if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
+             InstrumentManager* pManager = pEngine->GetInstrumentManager();
+             if (pManager) {
+                 std::vector<InstrumentManager::instrument_id_t> IDs =
+                     pManager->GetInstrumentFileContent(Filename);
+                 // return the amount of instruments in the file
+                 result.Add(IDs.size());
+                 // no more need to ask other engine types
+                 bFound = true;
+             } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
+         } catch (Exception e) {
+             // NOOP, as exception is thrown if engine doesn't support file
+         }
+         if (pEngine) EngineFactory::Destroy(pEngine);
+     }
+     if (!bFound) result.Error("Unknown file format");
+     return result.Produce();
+ }
+ String LSCPServer::ListFileInstruments(String Filename) {
+     dmsg(2,("LSCPServer: ListFileInstruments(String Filename=%s)\n",Filename.c_str()));
+     LSCPResultSet result;
+     try {
+         VerifyFile(Filename);
+     } catch (Exception e) {
+         result.Error(e);
+         return result.Produce();
+     }
+     // try to find a sampler engine that can handle the file
+     bool bFound = false;
+     std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
+     for (int i = 0; !bFound && i < engineTypes.size(); i++) {
+         Engine* pEngine = NULL;
+         try {
+             pEngine = EngineFactory::Create(engineTypes[i]);
+             if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
+             InstrumentManager* pManager = pEngine->GetInstrumentManager();
+             if (pManager) {
+                 std::vector<InstrumentManager::instrument_id_t> IDs =
+                     pManager->GetInstrumentFileContent(Filename);
+                 // return a list of IDs of the instruments in the file
+                 String s;
+                 for (int j = 0; j < IDs.size(); j++) {
+                     if (s.size()) s += ",";
+                     s += ToString(IDs[j].Index);
+                 }
+                 result.Add(s);
+                 // no more need to ask other engine types
+                 bFound = true;
+             } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
+         } catch (Exception e) {
+             // NOOP, as exception is thrown if engine doesn't support file
+         }
+         if (pEngine) EngineFactory::Destroy(pEngine);
+     }
+     if (!bFound) result.Error("Unknown file format");
+     return result.Produce();
+ }
+ String LSCPServer::GetFileInstrumentInfo(String Filename, uint InstrumentID) {
+     dmsg(2,("LSCPServer: GetFileInstrumentInfo(String Filename=%s, InstrumentID=%d)\n",Filename.c_str(),InstrumentID));
+     LSCPResultSet result;
+     try {
+         VerifyFile(Filename);
+     } catch (Exception e) {
+         result.Error(e);
+         return result.Produce();
+     }
+     InstrumentManager::instrument_id_t id;
+     id.FileName = Filename;
+     id.Index    = InstrumentID;
+     // try to find a sampler engine that can handle the file
+     bool bFound = false;
+     bool bFatalErr = false;
+     std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
+     for (int i = 0; !bFound && !bFatalErr && i < engineTypes.size(); i++) {
+         Engine* pEngine = NULL;
+         try {
+             pEngine = EngineFactory::Create(engineTypes[i]);
+             if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
+             InstrumentManager* pManager = pEngine->GetInstrumentManager();
+             if (pManager) {
+                 // check if the instrument index is valid
+                 // FIXME: this won't work if an engine only supports parts of the instrument file
+                 std::vector<InstrumentManager::instrument_id_t> IDs =
+                     pManager->GetInstrumentFileContent(Filename);
+                 if (std::find(IDs.begin(), IDs.end(), id) == IDs.end()) {
+                     std::stringstream ss;
+                     ss << "Invalid instrument index " << InstrumentID << " for instrument file '" << Filename << "'";
+                     bFatalErr = true;
+                     throw Exception(ss.str());
+                 }
+                 // get the info of the requested instrument
+                 InstrumentManager::instrument_info_t info =
+                     pManager->GetInstrumentInfo(id);
+                 // return detailed informations about the file
+                 result.Add("NAME", info.InstrumentName);
+                 result.Add("FORMAT_FAMILY", engineTypes[i]);
+                 result.Add("FORMAT_VERSION", info.FormatVersion);
+                 result.Add("PRODUCT", info.Product);
+                 result.Add("ARTISTS", info.Artists);
+                 std::stringstream ss;
+                 bool b = false;
+                 for (int i = 0; i < 128; i++) {
+                     if (info.KeyBindings[i]) {
+                         if (b) ss << ',';
+                         ss << i; b = true;
+                     }
+                 }
+                 result.Add("KEY_BINDINGS", ss.str());
+                 b = false;
+                 std::stringstream ss2;
+                 for (int i = 0; i < 128; i++) {
+                     if (info.KeySwitchBindings[i]) {
+                         if (b) ss2 << ',';
+                         ss2 << i; b = true;
+                     }
+                 }
+                 result.Add("KEYSWITCH_BINDINGS", ss2.str());
+                 // no more need to ask other engine types
+                 bFound = true;
+             } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
+         } catch (Exception e) {
+             // usually NOOP, as exception is thrown if engine doesn't support file
+             if (bFatalErr) result.Error(e);
+         }
+         if (pEngine) EngineFactory::Destroy(pEngine);
+     }
+     if (!bFound && !bFatalErr) result.Error("Unknown file format");
+     return result.Produce();
+ }
+ void LSCPServer::VerifyFile(String Filename) {
+     #if WIN32
+     WIN32_FIND_DATA win32FileAttributeData;
+     BOOL res = GetFileAttributesEx( Filename.c_str(), GetFileExInfoStandard, &win32FileAttributeData );
+     if (!res) {
+         std::stringstream ss;
+         ss << "File does not exist, GetFileAttributesEx failed `" << Filename << "`: Error " << GetLastError();
+         throw Exception(ss.str());
+     }
+     if ( win32FileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) {
+         throw Exception("Directory is specified");
+     }
+     #else
+     struct stat statBuf;
+     int res = stat(Filename.c_str(), &statBuf);
+     if (res) {
+         std::stringstream ss;
+         ss << "Fail to stat `" << Filename << "`: " << strerror(errno);
+         throw Exception(ss.str());
+     }
+     if (S_ISDIR(statBuf.st_mode)) {
+         throw Exception("Directory is specified");
+     }
+     #endif
+ }
  /**
   * Will be called by the parser to subscribe a client (frontend) on the
   * server for receiving event messages.
-Line 2117 
 String LSCPServer::UnsubscribeNotificati
+Line 2768 
 String LSCPServer::UnsubscribeNotificati
      return result.Produce();
  }
- static int select_callback(void * lscpResultSet, int argc,
+ String LSCPServer::AddDbInstrumentDirectory(String Dir) {
-                         char **argv, char **azColName)
+     dmsg(2,("LSCPServer: AddDbInstrumentDirectory(Dir=%s)\n", Dir.c_str()));
- {
+     LSCPResultSet result;
-     LSCPResultSet* resultSet = (LSCPResultSet*) lscpResultSet;
+ #if HAVE_SQLITE3
-     resultSet->Add(argc, argv);
+     try {
-     return 0;
+         InstrumentsDb::GetInstrumentsDb()->AddDirectory(Dir);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::RemoveDbInstrumentDirectory(String Dir, bool Force) {
+     dmsg(2,("LSCPServer: RemoveDbInstrumentDirectory(Dir=%s,Force=%d)\n", Dir.c_str(), Force));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->RemoveDirectory(Dir, Force);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::GetDbInstrumentDirectoryCount(String Dir, bool Recursive) {
+     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::QueryDatabase(String query) {
+ 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
-     char* zErrMsg = NULL;
+     try {
-     sqlite3 *db;
+         InstrumentsDb::GetInstrumentsDb()->RenameInstrument(Instr, Name);
-     String selectStr = "SELECT " + query;
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
-     int rc = sqlite3_open("linuxsampler.db", &db);
+ String LSCPServer::MoveDbInstrument(String Instr, String Dst) {
-     if (rc == SQLITE_OK)
+     dmsg(2,("LSCPServer: MoveDbInstrument(Instr=%s,Dst=%s)\n", Instr.c_str(), Dst.c_str()));
-     {
+     LSCPResultSet result;
-             rc = sqlite3_exec(db, selectStr.c_str(), select_callback, &result, &zErrMsg);
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->MoveInstrument(Instr, Dst);
+     } catch (Exception e) {
+          result.Error(e);
      }
-     if ( rc != SQLITE_OK )
+ #else
-     {
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
-             result.Error(String(zErrMsg), rc);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::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);
      }
-     sqlite3_close(db);
  #else
-     result.Error(String("SQLITE3 was not installed when linuxsampler was built. SELECT statement is not available."), 0);
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
  #endif
      return result.Produce();
  }
+ String LSCPServer::SetDbInstrumentDescription(String Instr, String Desc) {
+     dmsg(2,("LSCPServer: SetDbInstrumentDescription(Instr=%s,Desc=%s)\n", Instr.c_str(), Desc.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->SetInstrumentDescription(Instr, Desc);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::SetDbInstrumentFilePath(String OldPath, String NewPath) {
+     dmsg(2,("LSCPServer: SetDbInstrumentFilePath(OldPath=%s,NewPath=%s)\n", OldPath.c_str(), NewPath.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->SetInstrumentFilePath(OldPath, NewPath);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::FindLostDbInstrumentFiles() {
+     dmsg(2,("LSCPServer: FindLostDbInstrumentFiles()\n"));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         String list;
+         StringListPtr pLostFiles = InstrumentsDb::GetInstrumentsDb()->FindLostInstrumentFiles();
+         for (int i = 0; i < pLostFiles->size(); i++) {
+             if (list != "") list += ",";
+             list += "'" + pLostFiles->at(i) + "'";
+         }
+         result.Add(list);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::FindDbInstrumentDirectories(String Dir, std::map<String,String> Parameters, bool Recursive) {
+     dmsg(2,("LSCPServer: FindDbInstrumentDirectories(Dir=%s)\n", Dir.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         SearchQuery Query;
+         std::map<String,String>::iterator iter;
+         for (iter = Parameters.begin(); iter != Parameters.end(); iter++) {
+             if (iter->first.compare("NAME") == 0) {
+                 Query.Name = iter->second;
+             } else if (iter->first.compare("CREATED") == 0) {
+                 Query.SetCreated(iter->second);
+             } else if (iter->first.compare("MODIFIED") == 0) {
+                 Query.SetModified(iter->second);
+             } else if (iter->first.compare("DESCRIPTION") == 0) {
+                 Query.Description = iter->second;
+             } else {
+                 throw Exception("Unknown search criteria: " + iter->first);
+             }
+         }
+         String list;
+         StringListPtr pDirectories =
+             InstrumentsDb::GetInstrumentsDb()->FindDirectories(Dir, &Query, Recursive);
+         for (int i = 0; i < pDirectories->size(); i++) {
+             if (list != "") list += ",";
+             list += "'" + InstrumentsDb::toEscapedPath(pDirectories->at(i)) + "'";
+         }
+         result.Add(list);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::FindDbInstruments(String Dir, std::map<String,String> Parameters, bool Recursive) {
+     dmsg(2,("LSCPServer: FindDbInstruments(Dir=%s)\n", Dir.c_str()));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         SearchQuery Query;
+         std::map<String,String>::iterator iter;
+         for (iter = Parameters.begin(); iter != Parameters.end(); iter++) {
+             if (iter->first.compare("NAME") == 0) {
+                 Query.Name = iter->second;
+             } else if (iter->first.compare("FORMAT_FAMILIES") == 0) {
+                 Query.SetFormatFamilies(iter->second);
+             } else if (iter->first.compare("SIZE") == 0) {
+                 Query.SetSize(iter->second);
+             } else if (iter->first.compare("CREATED") == 0) {
+                 Query.SetCreated(iter->second);
+             } else if (iter->first.compare("MODIFIED") == 0) {
+                 Query.SetModified(iter->second);
+             } else if (iter->first.compare("DESCRIPTION") == 0) {
+                 Query.Description = iter->second;
+             } else if (iter->first.compare("IS_DRUM") == 0) {
+                 if (!strcasecmp(iter->second.c_str(), "true")) {
+                     Query.InstrType = SearchQuery::DRUM;
+                 } else {
+                     Query.InstrType = SearchQuery::CHROMATIC;
+                 }
+             } else if (iter->first.compare("PRODUCT") == 0) {
+                  Query.Product = iter->second;
+             } else if (iter->first.compare("ARTISTS") == 0) {
+                  Query.Artists = iter->second;
+             } else if (iter->first.compare("KEYWORDS") == 0) {
+                  Query.Keywords = iter->second;
+             } else {
+                 throw Exception("Unknown search criteria: " + iter->first);
+             }
+         }
+         String list;
+         StringListPtr pInstruments =
+             InstrumentsDb::GetInstrumentsDb()->FindInstruments(Dir, &Query, Recursive);
+         for (int i = 0; i < pInstruments->size(); i++) {
+             if (list != "") list += ",";
+             list += "'" + InstrumentsDb::toEscapedPath(pInstruments->at(i)) + "'";
+         }
+         result.Add(list);
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
+ String LSCPServer::FormatInstrumentsDb() {
+     dmsg(2,("LSCPServer: FormatInstrumentsDb()\n"));
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     try {
+         InstrumentsDb::GetInstrumentsDb()->Format();
+     } catch (Exception e) {
+          result.Error(e);
+     }
+ #else
+     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+ #endif
+     return result.Produce();
+ }
  /**
   * Will be called by the parser to enable or disable echo mode; if echo
   * mode is enabled, all commands from the client will (immediately) be
-Line 2166 
 String LSCPServer::SetEcho(yyparse_param
+Line 3289 
 String LSCPServer::SetEcho(yyparse_param
      }
      return result.Produce();
  }
+ }

 Legend:



Removed from v.1007
 


changed lines


 
Added in v.1774
 Legend:



Removed from v.1007
 


changed lines


 
Added in v.1774
-Removed from v.1007
+Added in v.1774

	ViewVC Help
Powered by ViewVC