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

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

Parent Directory | Revision Log | View Patch Patch

-revision 135 by senkov,
Sun Jun 20 16:01:50 2004 UTC
+revision 667 by senkov,
Sun Jun 19 21:22:34 2005 UTC
 Line 3
   *   LinuxSampler - modular, streaming capable sampler                     *
   *                                                                         *
   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
+  *   Copyright (C) 2005 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                                                   *
   ***************************************************************************/
  #include "lscpserver.h"
  #include "lscpresultset.h"
+ #include "lscpevent.h"
+ //#include "../common/global.h"
- #include "../engines/gig/Engine.h"
+ #include <fcntl.h>
- #include "../audiodriver/AudioOutputDeviceFactory.h"
- LSCPServer::LSCPServer(Sampler* pSampler) : Thread(false, 0, -4) {
+ #if HAVE_SQLITE3
+ # include "sqlite3.h"
+ #endif
+ #include "../engines/EngineFactory.h"
+ #include "../engines/EngineChannelFactory.h"
+ #include "../drivers/audio/AudioOutputDeviceFactory.h"
+ #include "../drivers/midi/MidiInputDeviceFactory.h"
+ /**
+  * Below are a few static members of the LSCPServer class.
+  * The big assumption here is that LSCPServer is going to remain a singleton.
+  * These members are used to support client connections.
+  * Class handles multiple connections at the same time using select() and non-blocking recv()
+  * Commands are processed by a single LSCPServer thread.
+  * Notifications are delivered either by the thread that originated them
+  * or (if the resultset is currently in progress) by the LSCPServer thread
+  * after the resultset was sent out.
+  * This makes sure that resultsets can not be interrupted by notifications.
+  * This also makes sure that the thread sending notification is not blocked
+  * by the LSCPServer thread.
+  */
+ fd_set LSCPServer::fdSet;
+ int LSCPServer::currentSocket = -1;
+ std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();
+ 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, 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_channel_count, "CHANNEL_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_stream_count, "STREAM_COUNT");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_channel_info, "CHANNEL_INFO");
+     LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
+     hSocket = -1;
+ }
+ LSCPServer::~LSCPServer() {
+     if (hSocket >= 0) close(hSocket);
+ }
+ /**
+  * 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() {
-Line 38 
 int LSCPServer::Main() {
+Line 101 
 int LSCPServer::Main() {
          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);
      // now wait for client connections and handle their requests
      sockaddr_in client;
      int length = sizeof(client);
+     FD_ZERO(&fdSet);
+     FD_SET(hSocket, &fdSet);
+     int maxSessions = hSocket;
      while (true) {
-         hSession = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);
+         fd_set selectSet = fdSet;
-         if (hSession < 0) {
+         int retval = select(maxSessions+1, &selectSet, NULL, NULL, NULL);
-             std::cerr << "LSCPServer: Client connection failed." << std::endl;
+         if (retval == 0)
-             close(hSocket);
+                 continue; //Nothing try again
-             //return -1;
+         if (retval == -1) {
-             exit(EXIT_FAILURE);
+                 std::cerr << "LSCPServer: Socket select error." << std::endl;
-         }
+                 close(hSocket);
+                 exit(EXIT_FAILURE);
-         dmsg(1,("LSCPServer: Client connection established.\n"));
+         }
-         //send(hSession, "Welcome!\r\n", 10, 0);
+         //Accept new connections now (if any)
-         // Parser invocation
+         if (FD_ISSET(hSocket, &selectSet)) {
-         yyparse_param_t yyparse_param;
+                 int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);
-         yyparse_param.pServer = this;
+                 if (socket < 0) {
-         yylex_init(&yyparse_param.pScanner);
+                         std::cerr << "LSCPServer: Client connection failed." << std::endl;
-         while (yyparse(&yyparse_param) == LSCP_SYNTAX_ERROR); // recall parser in case of syntax error
+                         exit(EXIT_FAILURE);
-         yylex_destroy(yyparse_param.pScanner);
+                 }
+                 if (fcntl(socket, F_SETFL, O_NONBLOCK)) {
+                         std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;
+                         exit(EXIT_FAILURE);
+                 }
+                 // 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;
+                 dmsg(1,("LSCPServer: Client connection established on socket:%d.\n", socket));
+                 LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection established on socket", socket));
+                 continue; //Maybe this was the only selected socket, better select again
+         }
+         //Something was selected and it was not the hSocket, so it must be some command(s) coming.
+         for (std::vector<yyparse_param_t>::iterator iter = Sessions.begin(); iter != Sessions.end(); iter++) {
+                 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));
+                                 int dummy; // just a temporary hack to fulfill the restart() function prototype
+                                 restart(NULL, dummy); // restart the 'scanner'
+                                 currentSocket = (*iter).hSession;  //a 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
+                                 dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
+                                 if (result == LSCP_QUIT) { //Was it a quit command by any chance?
+                                         CloseConnection(iter);
+                                 }
+                         }
+                         //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;
+                 }
+         }
+         // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers
+         {
+             std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();
+             std::set<EngineChannel*>::iterator itEngineChannel = engineChannels.begin();
+             std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();
+             for (; itEngineChannel != itEnd; ++itEngineChannel) {
+                 if ((*itEngineChannel)->StatusChanged()) {
+                     SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_info, (*itEngineChannel)->iSamplerChannelIndex));
+                 }
+             }
+         }
-         close(hSession);
+         //Now let's deliver late notifies (if any)
-         dmsg(1,("LSCPServer: Client connection terminated.\n"));
+         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();
      }
  }
+ void LSCPServer::CloseConnection( std::vector<yyparse_param_t>::iterator 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));
+         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++) {
+                 iter->second.remove(socket);
+         }
+         SubscriptionMutex.Unlock();
+         NotifyMutex.Lock();
+         bufferedCommands.erase(socket);
+         bufferedNotifies.erase(socket);
+         close(socket);
+         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) {
+                 SubscriptionMutex.Unlock();     //Nobody is subscribed to this event
+                 return;
+         }
+         std::list<int>::iterator iter = eventSubscriptions[event.GetType()].begin();
+         std::list<int>::iterator end = eventSubscriptions[event.GetType()].end();
+         String notify = event.Produce();
+         while (true) {
+                 if (NotifyMutex.Trylock()) {
+                         for(;iter != end; iter++)
+                                 send(*iter, notify.c_str(), notify.size(), 0);
+                         NotifyMutex.Unlock();
+                         break;
+                 } else {
+                         if (NotifyBufferMutex.Trylock()) {
+                                 for(;iter != end; iter++)
+                                         bufferedNotifies[*iter] += notify;
+                                 NotifyBufferMutex.Unlock();
+                                 break;
+                         }
+                 }
+         }
+         SubscriptionMutex.Unlock();
+ }
+ extern int GetLSCPCommand( void *buf, int max_size ) {
+         String command = LSCPServer::bufferedCommands[LSCPServer::currentSocket];
+         if (command.size() == 0) {              //Parser wants input but we have nothing.
+                 strcpy((char*) buf, "\n");      //So give it an empty command
+                 return 1;                       //to keep it happy.
+         }
+         if (max_size < command.size()) {
+                 std::cerr << "getLSCPCommand: Flex buffer too small, ignoring the command." << std::endl;
+                 return 0;       //This will never happen
+         }
+         strcpy((char*) buf, command.c_str());
+         LSCPServer::bufferedCommands.erase(LSCPServer::currentSocket);
+         return command.size();
+ }
+ /**
+  * 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<yyparse_param_t>::iterator iter ) {
+         int socket = (*iter).hSession;
+         char c;
+         int i = 0;
+         while (true) {
+                 int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now
+                 if (result == 0) { //socket was selected, so 0 here means client has closed the connection
+                         CloseConnection(iter);
+                         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";
+                                 return true; //Complete command was read
+                         }
+                         bufferedCommands[socket] += c;
+                 }
+                 if (result == -1) {
+                         if (errno == EAGAIN) //Would block, try again later.
+                                 return false;
+                         switch(errno) {
+                                 case EBADF:
+                                         dmsg(2,("LSCPScanner: The argument s is an invalid descriptor.\n"));
+                                         break;
+                                 case ECONNREFUSED:
+                                         dmsg(2,("LSCPScanner: A remote host refused to allow the network connection (typically because it is not running the requested service).\n"));
+                                         break;
+                                 case ENOTCONN:
+                                         dmsg(2,("LSCPScanner: The socket is associated with a connection-oriented protocol and has not been connected (see connect(2) and accept(2)).\n"));
+                                         break;
+                                 case ENOTSOCK:
+                                         dmsg(2,("LSCPScanner: The argument s does not refer to a socket.\n"));
+                                         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;
+                 }
+         }
+         return false;
+ }
  /**
   * Will be called by the parser whenever it wants to send an answer to the
   * client / frontend.
-Line 87 
 int LSCPServer::Main() {
+Line 362 
 int LSCPServer::Main() {
   */
  void LSCPServer::AnswerClient(String ReturnMessage) {
      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));
-     send(hSession, ReturnMessage.c_str(), ReturnMessage.size(), 0);
+     if (currentSocket != -1) {
+             NotifyMutex.Lock();
+             send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), 0);
+             NotifyMutex.Unlock();
+     }
+ }
+ /**
+  * Find a created audio output device index.
+  */
+ int LSCPServer::GetAudioOutputDeviceIndex ( AudioOutputDevice *pDevice )
+ {
+     // Search for the created device to get its index
+     std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
+     std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
+     for (; iter != devices.end(); iter++) {
+         if (iter->second == pDevice)
+             return iter->first;
+     }
+     // Not found.
+     return -1;
+ }
+ /**
+  * Find a created midi input device index.
+  */
+ int LSCPServer::GetMidiInputDeviceIndex ( MidiInputDevice *pDevice )
+ {
+     // Search for the created device to get its index
+     std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+     std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
+     for (; iter != devices.end(); iter++) {
+         if (iter->second == pDevice)
+             return iter->first;
+     }
+     // Not found.
+     return -1;
  }
  String LSCPServer::CreateAudioOutputDevice(String Driver, std::map<String,String> Parameters) {
-Line 95 
 String LSCPServer::CreateAudioOutputDevi
+Line 406 
 String LSCPServer::CreateAudioOutputDevi
      LSCPResultSet result;
      try {
          AudioOutputDevice* pDevice = pSampler->CreateAudioOutputDevice(Driver, Parameters);
-         std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
          // search for the created device to get its index
-         int index = -1;
+         int index = GetAudioOutputDeviceIndex(pDevice);
-         std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
-         for (; iter != devices.end(); iter++) {
-             if (iter->second == pDevice) {
-                 index = iter->first;
-                 break;
-             }
-         }
          if (index == -1) throw LinuxSamplerException("Internal error: could not find created audio output device.");
          result = index; // success
      }
-Line 114 
 String LSCPServer::CreateAudioOutputDevi
+Line 417 
 String LSCPServer::CreateAudioOutputDevi
      return result.Produce();
  }
+ String LSCPServer::CreateMidiInputDevice(String Driver, std::map<String,String> Parameters) {
+     dmsg(2,("LSCPServer: CreateMidiInputDevice(Driver=%s)\n", Driver.c_str()));
+     LSCPResultSet result;
+     try {
+         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.");
+         result = index; // success
+     }
+     catch (LinuxSamplerException e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
  String LSCPServer::DestroyAudioOutputDevice(uint DeviceIndex) {
      dmsg(2,("LSCPServer: DestroyAudioOutputDevice(DeviceIndex=%d)\n", DeviceIndex));
      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 LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
          AudioOutputDevice* pDevice = devices[DeviceIndex];
          pSampler->DestroyAudioOutputDevice(pDevice);
      }
-Line 129 
 String LSCPServer::DestroyAudioOutputDev
+Line 448 
 String LSCPServer::DestroyAudioOutputDev
      return result.Produce();
  }
+ String LSCPServer::DestroyMidiInputDevice(uint DeviceIndex) {
+     dmsg(2,("LSCPServer: DestroyMidiInputDevice(DeviceIndex=%d)\n", DeviceIndex));
+     LSCPResultSet result;
+     try {
+         std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+         if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
+         MidiInputDevice* pDevice = devices[DeviceIndex];
+         pSampler->DestroyMidiInputDevice(pDevice);
+     }
+     catch (LinuxSamplerException e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
  /**
   * Will be called by the parser to load an instrument.
   */
- String LSCPServer::LoadInstrument(String Filename, uint uiInstrument, uint uiSamplerChannel) {
+ String LSCPServer::LoadInstrument(String Filename, uint uiInstrument, uint uiSamplerChannel, bool bBackground) {
      dmsg(2,("LSCPServer: LoadInstrument(Filename=%s,Instrument=%d,SamplerChannel=%d)\n", Filename.c_str(), uiInstrument, uiSamplerChannel));
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw LinuxSamplerException("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 LinuxSamplerException("No engine type assigned to sampler channel yet");
-         LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);
+         if (!pSamplerChannel->GetAudioOutputDevice())
-         pLoadInstrument->StartThread();
+             throw LinuxSamplerException("No audio output device connected to sampler channel");
+         if (bBackground) {
+             InstrumentLoader.StartNewLoad(Filename, uiInstrument, 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();
+         }
      }
      catch (LinuxSamplerException e) {
           result.Error(e);
-Line 150 
 String LSCPServer::LoadInstrument(String
+Line 493 
 String LSCPServer::LoadInstrument(String
  }
  /**
-  * 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));
      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 LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         pSamplerChannel->LoadEngine(type);
+         LockRTNotify();
+         pSamplerChannel->SetEngineType(EngineName);
+         UnlockRTNotify();
      }
      catch (LinuxSamplerException e) {
           result.Error(e);
-Line 180 
 String LSCPServer::GetChannels() {
+Line 523 
 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() {
-Line 195 
 String LSCPServer::AddChannel() {
+Line 555 
 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("1");
+     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("\'GIG\'");
      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;
      try {
-         if ((EngineName == "GigEngine") || (EngineName == "gig")) {
+         Engine* pEngine = EngineFactory::Create(EngineName);
-             Engine* pEngine = new LinuxSampler::gig::Engine;
+         result.Add("DESCRIPTION", 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) {
           result.Error(e);
-Line 238 
 String LSCPServer::GetChannelInfo(uint u
+Line 607 
 String LSCPServer::GetChannelInfo(uint u
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw LinuxSamplerException("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;
+         String AudioRouting;
-         if (pEngine) {
+         if (pEngineChannel) {
-             EngineName =  pEngine->EngineName();
+             EngineName          = pEngineChannel->EngineName();
-             Volume = pEngine->Volume();
+             AudioOutputChannels = pEngineChannel->Channels();
-             InstrumentStatus = pEngine->InstrumentStatus();
+             Volume              = pEngineChannel->Volume();
-             InstrumentIndex = pEngine->InstrumentIndex();
+             InstrumentStatus    = pEngineChannel->InstrumentStatus();
-             if (InstrumentIndex != -1)
+             InstrumentIndex     = pEngineChannel->InstrumentIndex();
-                 InstrumentFileName = pEngine->InstrumentFileName();
+             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));
+             }
          }
          result.Add("ENGINE_NAME", EngineName);
          result.Add("VOLUME", Volume);
-         //Some hardcoded stuff for now to make GUI look good
+         //Some not-so-hardcoded stuff to make GUI look good
-         result.Add("AUDIO_OUTPUT_DEVICE", "0");
+         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());
+         if (pSamplerChannel->GetMidiInputChannel() == MidiInputPort::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_NR", InstrumentIndex);
+         result.Add("INSTRUMENT_NAME", InstrumentName);
          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
-         //Some more hardcoded stuff for now to make GUI look good
-         result.Add("MIDI_INPUT_DEVICE", "0");
-         result.Add("MIDI_INPUT_PORT", "0");
-         result.Add("MIDI_INPUT_CHANNEL", "1");
      }
      catch (LinuxSamplerException e) {
           result.Error(e);
-Line 289 
 String LSCPServer::GetVoiceCount(uint ui
+Line 669 
 String LSCPServer::GetVoiceCount(uint ui
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw LinuxSamplerException("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 LinuxSamplerException("No engine loaded on sampler channel");
-         result.Add(pEngine->VoiceCount());
+         if (!pEngineChannel->GetEngine()) throw LinuxSamplerException("No audio output device connected to sampler channel");
+         result.Add(pEngineChannel->GetEngine()->VoiceCount());
      }
      catch (LinuxSamplerException e) {
           result.Error(e);
-Line 309 
 String LSCPServer::GetStreamCount(uint u
+Line 690 
 String LSCPServer::GetStreamCount(uint u
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw LinuxSamplerException("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 LinuxSamplerException("No engine type assigned to sampler channel");
-         result.Add(pEngine->DiskStreamCount());
+         if (!pEngineChannel->GetEngine()) throw LinuxSamplerException("No audio output device connected to sampler channel");
+         result.Add(pEngineChannel->GetEngine()->DiskStreamCount());
      }
      catch (LinuxSamplerException e) {
           result.Error(e);
-Line 329 
 String LSCPServer::GetBufferFill(fill_re
+Line 711 
 String LSCPServer::GetBufferFill(fill_re
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw LinuxSamplerException("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 LinuxSamplerException("No engine type assigned to sampler channel");
-         if (!pEngine->DiskStreamSupported())
+         if (!pEngineChannel->GetEngine()) throw LinuxSamplerException("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");
              }
-Line 357 
 String LSCPServer::GetAvailableAudioOutp
+Line 739 
 String LSCPServer::GetAvailableAudioOutp
      dmsg(2,("LSCPServer: GetAvailableAudioOutputDrivers()\n"));
      LSCPResultSet result;
      try {
+         int n = AudioOutputDeviceFactory::AvailableDrivers().size();
+         result.Add(n);
+     }
+     catch (LinuxSamplerException 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);
      }
-Line 366 
 String LSCPServer::GetAvailableAudioOutp
+Line 761 
 String LSCPServer::GetAvailableAudioOutp
      return result.Produce();
  }
+ String LSCPServer::GetAvailableMidiInputDrivers() {
+     dmsg(2,("LSCPServer: GetAvailableMidiInputDrivers()\n"));
+     LSCPResultSet result;
+     try {
+         int n = MidiInputDeviceFactory::AvailableDrivers().size();
+         result.Add(n);
+     }
+     catch (LinuxSamplerException 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) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::GetMidiInputDriverInfo(String Driver) {
+     dmsg(2,("LSCPServer: GetMidiInputDriverInfo(Driver=%s)\n",Driver.c_str()));
+     LSCPResultSet result;
+     try {
+         result.Add("DESCRIPTION", MidiInputDeviceFactory::GetDriverDescription(Driver));
+         result.Add("VERSION",     MidiInputDeviceFactory::GetDriverVersion(Driver));
+         std::map<String,DeviceCreationParameter*> parameters = MidiInputDeviceFactory::GetAvailableDriverParameters(Driver);
+         if (parameters.size()) { // if there are parameters defined for this driver
+             String s;
+             std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
+             for (;iter != parameters.end(); iter++) {
+                 if (s != "") s += ",";
+                 s += iter->first;
+             }
+             result.Add("PARAMETERS", s);
+         }
+     }
+     catch (LinuxSamplerException e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
  String LSCPServer::GetAudioOutputDriverInfo(String Driver) {
      dmsg(2,("LSCPServer: GetAudioOutputDriverInfo(Driver=%s)\n",Driver.c_str()));
      LSCPResultSet result;
-Line 390 
 String LSCPServer::GetAudioOutputDriverI
+Line 835 
 String LSCPServer::GetAudioOutputDriverI
      return result.Produce();
  }
+ String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
+     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);
+         result.Add("TYPE",         pParameter->Type());
+         result.Add("DESCRIPTION",  pParameter->Description());
+         result.Add("MANDATORY",    pParameter->Mandatory());
+         result.Add("FIX",          pParameter->Fix());
+         result.Add("MULTIPLICITY", pParameter->Multiplicity());
+         optional<String> oDepends       = pParameter->Depends();
+         optional<String> oDefault       = pParameter->Default(DependencyList);
+         optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
+         optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
+         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) {
+         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 400 
 String LSCPServer::GetAudioOutputDriverP
+Line 872 
 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) {
          result.Error(e);
-Line 417 
 String LSCPServer::GetAudioOutputDeviceC
+Line 894 
 String LSCPServer::GetAudioOutputDeviceC
      LSCPResultSet result;
      try {
          uint count = pSampler->AudioOutputDevices();
-         result = count; // success
+         result.Add(count); // success
+     }
+     catch (LinuxSamplerException e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::GetMidiInputDeviceCount() {
+     dmsg(2,("LSCPServer: GetMidiInputDeviceCount()\n"));
+     LSCPResultSet result;
+     try {
+         uint count = pSampler->MidiInputDevices();
+         result.Add(count); // success
      }
      catch (LinuxSamplerException e) {
          result.Error(e);
-Line 444 
 String LSCPServer::GetAudioOutputDevices
+Line 934 
 String LSCPServer::GetAudioOutputDevices
      return result.Produce();
  }
+ String LSCPServer::GetMidiInputDevices() {
+     dmsg(2,("LSCPServer: GetMidiInputDevices()\n"));
+     LSCPResultSet result;
+     try {
+         String s;
+         std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+         std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
+         for (; iter != devices.end(); iter++) {
+             if (s != "") s += ",";
+             s += ToString(iter->first);
+         }
+         result.Add(s);
+     }
+     catch (LinuxSamplerException e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
  String LSCPServer::GetAudioOutputDeviceInfo(uint DeviceIndex) {
      dmsg(2,("LSCPServer: GetAudioOutputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));
      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 LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
          AudioOutputDevice* pDevice = devices[DeviceIndex];
+         result.Add("DRIVER", pDevice->Driver());
+         std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
+         std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
+         for (; iter != parameters.end(); iter++) {
+             result.Add(iter->first, iter->second->Value());
+         }
+     }
+     catch (LinuxSamplerException e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::GetMidiInputDeviceInfo(uint DeviceIndex) {
+     dmsg(2,("LSCPServer: GetMidiInputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));
+     LSCPResultSet result;
+     try {
+         std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+         if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
+         MidiInputDevice* pDevice = devices[DeviceIndex];
+         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++) {
-Line 462 
 String LSCPServer::GetAudioOutputDeviceI
+Line 992 
 String LSCPServer::GetAudioOutputDeviceI
      }
      return result.Produce();
  }
+ String LSCPServer::GetMidiInputPortInfo(uint DeviceIndex, uint PortIndex) {
+     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 LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
+         MidiInputDevice* pDevice = devices[DeviceIndex];
+         // get MIDI port
+         MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
+         if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
+         // 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) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
  String LSCPServer::GetAudioOutputChannelInfo(uint DeviceId, uint ChannelId) {
      dmsg(2,("LSCPServer: GetAudioOutputChannelInfo(DeviceId=%d,ChannelId)\n",DeviceId,ChannelId));
-Line 469 
 String LSCPServer::GetAudioOutputChannel
+Line 1024 
 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 LinuxSamplerException("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 LinuxSamplerException("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 489 
 String LSCPServer::GetAudioOutputChannel
+Line 1044 
 String LSCPServer::GetAudioOutputChannel
      return result.Produce();
  }
+ String LSCPServer::GetMidiInputPortParameterInfo(uint DeviceId, uint PortId, String ParameterName) {
+     dmsg(2,("LSCPServer: GetMidiInputPortParameterInfo(DeviceId=%d,PortId=%d,ParameterName=%s)\n",DeviceId,PortId,ParameterName.c_str()));
+     LSCPResultSet result;
+     try {
+         // get MIDI input device
+         std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+         if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");
+         MidiInputDevice* pDevice = devices[DeviceId];
+         // get midi port
+         MidiInputPort* pPort = pDevice->GetPort(PortId);
+         if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");
+         // get desired port parameter
+         std::map<String,DeviceRuntimeParameter*> parameters = pPort->PortParameters();
+         if (!parameters.count(ParameterName)) throw LinuxSamplerException("Midi port does not provide a parameter '" + ParameterName + "'.");
+         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->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
+         if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
+     }
+     catch (LinuxSamplerException e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {
      dmsg(2,("LSCPServer: GetAudioOutputChannelParameterInfo(DeviceId=%d,ChannelId=%d,ParameterName=%s)\n",DeviceId,ChannelId,ParameterName.c_str()));
      LSCPResultSet result;
      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 LinuxSamplerException("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 LinuxSamplerException("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 LinuxSamplerException("Audio channel does not provide a parameter '" + ParameterName + "'.");
          DeviceRuntimeParameter* pParameter = parameters[ParameterName];
          // return all fields of this audio channel parameter
-Line 512 
 String LSCPServer::GetAudioOutputChannel
+Line 1100 
 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) {
          result.Error(e);
-Line 528 
 String LSCPServer::SetAudioOutputChannel
+Line 1116 
 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 LinuxSamplerException("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 LinuxSamplerException("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 LinuxSamplerException("Audio channel does not provide a parameter '" + ParamKey + "'.");
          DeviceRuntimeParameter* pParameter = parameters[ParamKey];
          // set new channel parameter value
-Line 554 
 String LSCPServer::SetAudioOutputDeviceP
+Line 1142 
 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 LinuxSamplerException("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 LinuxSamplerException("Audio output device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
+         parameters[ParamKey]->SetValue(ParamVal);
+     }
+     catch (LinuxSamplerException e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::SetMidiInputDeviceParameter(uint DeviceIndex, String ParamKey, String ParamVal) {
+     dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
+     LSCPResultSet result;
+     try {
+         std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+         if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
+         MidiInputDevice* pDevice = devices[DeviceIndex];
+         std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
+         if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
+         parameters[ParamKey]->SetValue(ParamVal);
+     }
+     catch (LinuxSamplerException e) {
+         result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::SetMidiInputPortParameter(uint DeviceIndex, uint PortIndex, String ParamKey, String ParamVal) {
+     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 LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
+         MidiInputDevice* pDevice = devices[DeviceIndex];
+         // get MIDI port
+         MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
+         if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
+         // set port parameter value
+         std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
+         if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
          parameters[ParamKey]->SetValue(ParamVal);
      }
      catch (LinuxSamplerException e) {
-Line 572 
 String LSCPServer::SetAudioOutputDeviceP
+Line 1201 
 String LSCPServer::SetAudioOutputDeviceP
   */
  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 LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
+         if (!pEngineChannel) throw LinuxSamplerException("No engine type yet assigned to sampler channel " + ToString(uiSamplerChannel));
+         if (!pSamplerChannel->GetAudioOutputDevice()) throw LinuxSamplerException("No audio output device connected to sampler channel " + ToString(uiSamplerChannel));
+         pEngineChannel->SetOutputChannel(ChannelAudioOutputChannel, AudioOutputDeviceInputChannel);
+     }
+     catch (LinuxSamplerException e) {
+          result.Error(e);
+     }
+     return result.Produce();
  }
- String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) {
+ String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {
-     dmsg(2,("LSCPServer: SetMIDIInputType(String MidiInputDriver=%s, SamplerChannel=%d)\n",MidiInputDriver.c_str(),uiSamplerChannel));
+     dmsg(2,("LSCPServer: SetAudiotOutputDevice(AudioDeviceId=%d, SamplerChannel=%d)\n",AudioDeviceId,uiSamplerChannel));
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         // FIXME: workaround until MIDI driver configuration is implemented (using a Factory class for the MIDI input drivers then, like its already done for audio output drivers)
+         std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
-         if (MidiInputDriver != "Alsa") throw LinuxSamplerException("Unknown MIDI input driver '" + MidiInputDriver + "'.");
+         if (!devices.count(AudioDeviceId)) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));
-         MidiInputDevice::type_t MidiInputType = MidiInputDevice::type_alsa;
+         AudioOutputDevice* pDevice = devices[AudioDeviceId];
-         pSamplerChannel->SetMidiInputDevice(MidiInputType);
+         pSamplerChannel->SetAudioOutputDevice(pDevice);
      }
      catch (LinuxSamplerException e) {
           result.Error(e);
-Line 592 
 String LSCPServer::SetMIDIInputType(Stri
+Line 1233 
 String LSCPServer::SetMIDIInputType(Stri
      return result.Produce();
  }
- /**
+ String LSCPServer::SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel) {
-  * Will be called by the parser to change the MIDI input port on which the
+     dmsg(2,("LSCPServer: SetAudioOutputType(String AudioOutputDriver=%s, SamplerChannel=%d)\n",AudioOutputDriver.c_str(),uiSamplerChannel));
-  * engine of a particular sampler channel should listen to.
-  */
- String LSCPServer::SetMIDIInputPort(String MIDIInputPort, uint uiSamplerChannel) {
-     dmsg(2,("LSCPServer: SetMIDIInputPort(MIDIInputPort=%s, Samplerchannel=%d)\n", MIDIInputPort.c_str(), uiSamplerChannel));
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         if (!pSamplerChannel->GetMidiInputDevice()) throw LinuxSamplerException("No MIDI input device connected yet");
+         // Driver type name aliasing...
-         pSamplerChannel->GetMidiInputDevice()->SetInputPort(MIDIInputPort.c_str());
+         if (AudioOutputDriver == "Alsa") AudioOutputDriver = "ALSA";
+         if (AudioOutputDriver == "Jack") AudioOutputDriver = "JACK";
+         // Check if there's one audio output device already created
+         // for the intended audio driver type (AudioOutputDriver)...
+         AudioOutputDevice *pDevice = NULL;
+         std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
+         std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
+         for (; iter != devices.end(); iter++) {
+             if ((iter->second)->Driver() == AudioOutputDriver) {
+                 pDevice = iter->second;
+                 break;
+             }
+         }
+         // If it doesn't exist, create a new one with default parameters...
+         if (pDevice == NULL) {
+             std::map<String,String> params;
+             pDevice = pSampler->CreateAudioOutputDevice(AudioOutputDriver, params);
+         }
+         // Must have a device...
+         if (pDevice == NULL)
+             throw LinuxSamplerException("Internal error: could not create audio output device.");
+         // Set it as the current channel device...
+         pSamplerChannel->SetAudioOutputDevice(pDevice);
+     }
+     catch (LinuxSamplerException e) {
+          result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::SetMIDIInputPort(uint MIDIPort, uint uiSamplerChannel) {
+     dmsg(2,("LSCPServer: SetMIDIInputPort(MIDIPort=%d, SamplerChannel=%d)\n",MIDIPort,uiSamplerChannel));
+     LSCPResultSet result;
+     try {
+         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         pSamplerChannel->SetMidiInputPort(MIDIPort);
      }
      catch (LinuxSamplerException e) {
           result.Error(e);
-Line 611 
 String LSCPServer::SetMIDIInputPort(Stri
+Line 1284 
 String LSCPServer::SetMIDIInputPort(Stri
      return result.Produce();
  }
- /**
-  * Will be called by the parser to change the MIDI input channel on which the
-  * engine of a particular sampler channel should listen to.
-  */
  String LSCPServer::SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel) {
-     dmsg(2,("LSCPServer: SetMIDIInputChannel(MIDIChannel=%d, SamplerChannel=%d)\n", MIDIChannel, uiSamplerChannel));
+     dmsg(2,("LSCPServer: SetMIDIInputChannel(MIDIChannel=%d, SamplerChannel=%d)\n",MIDIChannel,uiSamplerChannel));
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
-         if (!pSamplerChannel->GetMidiInputDevice()) throw LinuxSamplerException("No MIDI input device connected yet");
+         pSamplerChannel->SetMidiInputChannel((MidiInputPort::midi_chan_t) MIDIChannel);
-         MidiInputDevice::type_t oldtype = pSamplerChannel->GetMidiInputDevice()->Type();
-         pSamplerChannel->SetMidiInputDevice(oldtype, (MidiInputDevice::midi_chan_t) MIDIChannel);
      }
      catch (LinuxSamplerException e) {
           result.Error(e);
-Line 631 
 String LSCPServer::SetMIDIInputChannel(u
+Line 1298 
 String LSCPServer::SetMIDIInputChannel(u
      return result.Produce();
  }
- String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint SamplerChannel) {
+ String LSCPServer::SetMIDIInputDevice(uint MIDIDeviceId, uint uiSamplerChannel) {
+     dmsg(2,("LSCPServer: SetMIDIInputDevice(MIDIDeviceId=%d, SamplerChannel=%d)\n",MIDIDeviceId,uiSamplerChannel));
      LSCPResultSet result;
      try {
-         throw LinuxSamplerException("Command not yet implemented");
+         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+         if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
+         MidiInputDevice* pDevice = devices[MIDIDeviceId];
+         pSamplerChannel->SetMidiInputDevice(pDevice);
+     }
+     catch (LinuxSamplerException e) {
+          result.Error(e);
+     }
+     return result.Produce();
+ }
+ String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) {
+     dmsg(2,("LSCPServer: SetMIDIInputType(String MidiInputDriver=%s, SamplerChannel=%d)\n",MidiInputDriver.c_str(),uiSamplerChannel));
+     LSCPResultSet result;
+     try {
+         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         // Driver type name aliasing...
+         if (MidiInputDriver == "Alsa") MidiInputDriver = "ALSA";
+         // Check if there's one MIDI input device already created
+         // for the intended MIDI driver type (MidiInputDriver)...
+         MidiInputDevice *pDevice = NULL;
+         std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
+         std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
+         for (; iter != devices.end(); iter++) {
+             if ((iter->second)->Driver() == MidiInputDriver) {
+                 pDevice = iter->second;
+                 break;
+             }
+         }
+         // If it doesn't exist, create a new one with default parameters...
+         if (pDevice == NULL) {
+             std::map<String,String> params;
+             pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);
+             // Make it with at least one initial port.
+             std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
+             parameters["PORTS"]->SetValue("1");
+         }
+         // Must have a device...
+         if (pDevice == NULL)
+             throw LinuxSamplerException("Internal error: could not create MIDI input device.");
+         // Set it as the current channel device...
+         pSamplerChannel->SetMidiInputDevice(pDevice);
+     }
+     catch (LinuxSamplerException e) {
+          result.Error(e);
+     }
+     return result.Produce();
+ }
+ /**
+  * Will be called by the parser to change the MIDI input device, port and channel on which
+  * engine of a particular sampler channel should listen to.
+  */
+ String LSCPServer::SetMIDIInput(uint MIDIDeviceId, uint MIDIPort, uint MIDIChannel, uint uiSamplerChannel) {
+     dmsg(2,("LSCPServer: SetMIDIInput(MIDIDeviceId=%d, MIDIPort=%d, MIDIChannel=%d, SamplerChannel=%d)\n", MIDIDeviceId, MIDIPort, MIDIChannel, uiSamplerChannel));
+     LSCPResultSet result;
+     try {
+         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
+         if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
+         std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();
+         if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
+         MidiInputDevice* pDevice = devices[MIDIDeviceId];
+         pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputPort::midi_chan_t) MIDIChannel);
      }
      catch (LinuxSamplerException e) {
           result.Error(e);
-Line 646 
 String LSCPServer::SetAudioOutputDevice(
+Line 1379 
 String LSCPServer::SetAudioOutputDevice(
   * 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 LinuxSamplerException("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 LinuxSamplerException("No engine type assigned to sampler channel");
-         pEngine->Volume(Volume);
+         pEngineChannel->Volume(dVolume);
      }
      catch (LinuxSamplerException e) {
           result.Error(e);
-Line 670 
 String LSCPServer::ResetChannel(uint uiS
+Line 1403 
 String LSCPServer::ResetChannel(uint uiS
      LSCPResultSet result;
      try {
          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
-         if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
+         if (!pSamplerChannel) throw LinuxSamplerException("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 LinuxSamplerException("No engine type assigned to sampler channel");
-         pEngine->Reset();
+         if (!pEngineChannel->GetEngine()) throw LinuxSamplerException("No audio output device connected to sampler channel");
+         pEngineChannel->GetEngine()->Reset();
      }
      catch (LinuxSamplerException e) {
           result.Error(e);
-Line 682 
 String LSCPServer::ResetChannel(uint uiS
+Line 1416 
 String LSCPServer::ResetChannel(uint uiS
  }
  /**
+  * 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"));
+     LSCPResultSet result;
+     result.Add("DESCRIPTION", "LinuxSampler - modular, streaming capable sampler");
+     result.Add("VERSION", VERSION);
+     result.Add("PROTOCOL_VERSION", "1.0");
+     return result.Produce();
+ }
+ /**
   * Will be called by the parser to subscribe a client (frontend) on the
   * server for receiving event messages.
   */
- String LSCPServer::SubscribeNotification(event_t Event) {
+ String LSCPServer::SubscribeNotification(LSCPEvent::event_t type) {
-     dmsg(2,("LSCPServer: SubscribeNotification(Event=%d)\n", Event));
+     dmsg(2,("LSCPServer: SubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
-     return "ERR:0:Not implemented yet.\r\n";
+     LSCPResultSet result;
+     SubscriptionMutex.Lock();
+     eventSubscriptions[type].push_back(currentSocket);
+     SubscriptionMutex.Unlock();
+     return result.Produce();
  }
  /**
   * Will be called by the parser to unsubscribe a client on the server
   * for not receiving further event messages.
   */
- String LSCPServer::UnsubscribeNotification(event_t Event) {
+ String LSCPServer::UnsubscribeNotification(LSCPEvent::event_t type) {
-     dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%d)\n", Event));
+     dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
-     return "ERR:0:Not implemented yet.\r\n";
+     LSCPResultSet result;
+     SubscriptionMutex.Lock();
+     eventSubscriptions[type].remove(currentSocket);
+     SubscriptionMutex.Unlock();
+     return result.Produce();
  }
+ static int select_callback(void * lscpResultSet, int argc,
- // Instrument loader constructor.
+                         char **argv, char **azColName)
- LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)
-     : Thread(false, 0, -4)
  {
-     this->pEngine = pEngine;
+     LSCPResultSet* resultSet = (LSCPResultSet*) lscpResultSet;
-     this->Filename = Filename;
+     resultSet->Add(argc, argv);
-     this->uiInstrument = uiInstrument;
+     return 0;
+ }
+ String LSCPServer::QueryDatabase(String query) {
+     LSCPResultSet result;
+ #if HAVE_SQLITE3
+     char* zErrMsg = NULL;
+     sqlite3 *db;
+     String selectStr = "SELECT " + query;
+     int rc = sqlite3_open("linuxsampler.db", &db);
+     if (rc == SQLITE_OK)
+     {
+             rc = sqlite3_exec(db, selectStr.c_str(), select_callback, &result, &zErrMsg);
+     }
+     if ( rc != SQLITE_OK )
+     {
+             result.Error(String(zErrMsg), rc);
+     }
+     sqlite3_close(db);
+ #else
+     result.Error(String("SQLITE3 was not installed when linuxsampler was built. SELECT statement is not available."), 0);
+ #endif
+     return result.Produce();
  }
- // Instrument loader process.
+ /**
- int LSCPLoadInstrument::Main()
+  * 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 {
-         pEngine->LoadInstrument(Filename.c_str(), uiInstrument);
+         if      (boolean_value == 0) pSession->bVerbose = false;
+         else if (boolean_value == 1) pSession->bVerbose = true;
+         else throw LinuxSamplerException("Not a boolean value, must either be 0 or 1");
      }
      catch (LinuxSamplerException e) {
-         e.PrintMessage();
+          result.Error(e);
      }
+     return result.Produce();
-     // Always re-enable the engine.
-     pEngine->Enable();
-     // FIXME: Shoot ourselves on the foot?
-     delete this;
  }

 Legend:



Removed from v.135
 


changed lines


 
Added in v.667
 Legend:



Removed from v.135
 


changed lines


 
Added in v.667
-Removed from v.135
+Added in v.667

	ViewVC Help
Powered by ViewVC