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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 170 by senkov, Sat Jul 3 20:08:07 2004 UTC revision 579 by schoenebeck, Tue May 24 19:20:20 2005 UTC
# Line 3  Line 3 
3   *   LinuxSampler - modular, streaming capable sampler                     *   *   LinuxSampler - modular, streaming capable sampler                     *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
6     *   Copyright (C) 2005 Christian Schoenebeck                              *
7   *                                                                         *   *                                                                         *
8   *   This program is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
9   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
10   *   the Free Software Foundation; either version 2 of the License, or     *   *   the Free Software Foundation; either version 2 of the License, or     *
11   *   (at your option) any later version.                                   *   *   (at your option) any later version.                                   *
12   *                                                                         *   *                                                                         *
13   *   This program is distributed in the hope that it will be useful,       *   *   This library is distributed in the hope that it will be useful,       *
14   *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *   *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
15   *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *   *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
16   *   GNU General Public License for more details.                          *   *   GNU General Public License for more details.                          *
17   *                                                                         *   *                                                                         *
18   *   You should have received a copy of the GNU General Public License     *   *   You should have received a copy of the GNU General Public License     *
19   *   along with this program; if not, write to the Free Software           *   *   along with this library; if not, write to the Free Software           *
20   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston,                 *   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston,                 *
21   *   MA  02111-1307  USA                                                   *   *   MA  02111-1307  USA                                                   *
22   ***************************************************************************/   ***************************************************************************/
# Line 23  Line 24 
24  #include "lscpserver.h"  #include "lscpserver.h"
25  #include "lscpresultset.h"  #include "lscpresultset.h"
26  #include "lscpevent.h"  #include "lscpevent.h"
27    //#include "../common/global.h"
28    
29  #include "../engines/gig/Engine.h"  #include <fcntl.h>
30  #include "../audiodriver/AudioOutputDeviceFactory.h"  
31  #include "../mididriver/MidiInputDeviceFactory.h"  #if HAVE_SQLITE3
32    # include "sqlite3.h"
33    #endif
34    
35    #include "../engines/EngineFactory.h"
36    #include "../drivers/audio/AudioOutputDeviceFactory.h"
37    #include "../drivers/midi/MidiInputDeviceFactory.h"
38    
39  /**  /**
40   * Below are a few static members of the LSCPServer class.   * Below are a few static members of the LSCPServer class.
# Line 43  Line 51 
51   */   */
52  fd_set LSCPServer::fdSet;  fd_set LSCPServer::fdSet;
53  int LSCPServer::currentSocket = -1;  int LSCPServer::currentSocket = -1;
54  std::vector<int> LSCPServer::hSessions = std::vector<int>();  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();
55  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();
56  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();
57  std::map< LSCPEvent::event_t, std::list<int> > LSCPServer::eventSubscriptions = std::map< LSCPEvent::event_t, std::list<int> >();  std::map< LSCPEvent::event_t, std::list<int> > LSCPServer::eventSubscriptions = std::map< LSCPEvent::event_t, std::list<int> >();
58  Mutex LSCPServer::NotifyMutex = Mutex();  Mutex LSCPServer::NotifyMutex = Mutex();
59  Mutex LSCPServer::NotifyBufferMutex = Mutex();  Mutex LSCPServer::NotifyBufferMutex = Mutex();
60  Mutex LSCPServer::SubscriptionMutex = Mutex();  Mutex LSCPServer::SubscriptionMutex = Mutex();
61    Mutex LSCPServer::RTNotifyMutex = Mutex();
62    
63  LSCPServer::LSCPServer(Sampler* pSampler) : Thread(false, 0, -4) {  LSCPServer::LSCPServer(Sampler* pSampler) : Thread(true, false, 0, -4) {
64      this->pSampler = pSampler;      this->pSampler = pSampler;
65      LSCPEvent::RegisterEvent(LSCPEvent::event_channels, "CHANNELS");      LSCPEvent::RegisterEvent(LSCPEvent::event_channel_count, "CHANNEL_COUNT");
66      LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT");
67      LSCPEvent::RegisterEvent(LSCPEvent::event_stream_count, "STREAM_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_stream_count, "STREAM_COUNT");
68      LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL");      LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL");
69      LSCPEvent::RegisterEvent(LSCPEvent::event_info, "INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_channel_info, "CHANNEL_INFO");
70      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
71        hSocket = -1;
72    }
73    
74    LSCPServer::~LSCPServer() {
75        if (hSocket >= 0) close(hSocket);
76    }
77    
78    /**
79     * Blocks the calling thread until the LSCP Server is initialized and
80     * accepting socket connections, if the server is already initialized then
81     * this method will return immediately.
82     * @param TimeoutSeconds     - optional: max. wait time in seconds
83     *                             (default: 0s)
84     * @param TimeoutNanoSeconds - optional: max wait time in nano seconds
85     *                             (default: 0ns)
86     * @returns  0 on success, a value less than 0 if timeout exceeded
87     */
88    int LSCPServer::WaitUntilInitialized(long TimeoutSeconds, long TimeoutNanoSeconds) {
89        return Initialized.WaitAndUnlockIf(false, TimeoutSeconds, TimeoutNanoSeconds);
90  }  }
91    
92  int LSCPServer::Main() {  int LSCPServer::Main() {
93      int hSocket = socket(AF_INET, SOCK_STREAM, 0);      hSocket = socket(AF_INET, SOCK_STREAM, 0);
94      if (hSocket < 0) {      if (hSocket < 0) {
95          std::cerr << "LSCPServer: Could not create server socket." << std::endl;          std::cerr << "LSCPServer: Could not create server socket." << std::endl;
96          //return -1;          //return -1;
# Line 74  int LSCPServer::Main() { Line 102  int LSCPServer::Main() {
102      SocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);      SocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);
103    
104      if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {      if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
105          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...";
106          close(hSocket);          for (int trial = 0; true; trial++) { // retry for LSCP_SERVER_BIND_TIMEOUT seconds
107          //return -1;              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
108          exit(EXIT_FAILURE);                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {
109                        std::cerr << "gave up!" << std::endl;
110                        close(hSocket);
111                        //return -1;
112                        exit(EXIT_FAILURE);
113                    }
114                    else sleep(1); // sleep 1s
115                }
116                else break; // success
117            }
118      }      }
119    
120      listen(hSocket, 1);      listen(hSocket, 1);
121      dmsg(1,("LSCPServer: Server running.\n")); // server running      Initialized.Set(true);
122    
123      // now wait for client connections and handle their requests      // now wait for client connections and handle their requests
124      sockaddr_in client;      sockaddr_in client;
125      int length = sizeof(client);      int length = sizeof(client);
     struct timeval tv;  
     tv.tv_sec = 30;  
     tv.tv_usec = 0;  
126      FD_ZERO(&fdSet);      FD_ZERO(&fdSet);
127      FD_SET(hSocket, &fdSet);      FD_SET(hSocket, &fdSet);
128      int maxSessions = hSocket;      int maxSessions = hSocket;
   
     // Parser initialization  
     yyparse_param_t yyparse_param;  
     yyparse_param.pServer = this;  
129    
130      while (true) {      while (true) {
131          fd_set selectSet = fdSet;          fd_set selectSet = fdSet;
132          int retval = select(maxSessions+1, &selectSet, NULL, NULL, &tv);          int retval = select(maxSessions+1, &selectSet, NULL, NULL, NULL);
133          if (retval == 0)          if (retval == 0)
134                  continue; //Nothing in 30 seconds, try again                  continue; //Nothing try again
135          if (retval == -1) {          if (retval == -1) {
136                  std::cerr << "LSCPServer: Socket select error." << std::endl;                  std::cerr << "LSCPServer: Socket select error." << std::endl;
137                  close(hSocket);                  close(hSocket);
138                  exit(EXIT_FAILURE);                  exit(EXIT_FAILURE);
139          }          }
140            
141          //Accept new connections now (if any)          //Accept new connections now (if any)
142          if (FD_ISSET(hSocket, &selectSet)) {          if (FD_ISSET(hSocket, &selectSet)) {
143                  int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);                  int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);
# Line 121  int LSCPServer::Main() { Line 151  int LSCPServer::Main() {
151                          exit(EXIT_FAILURE);                          exit(EXIT_FAILURE);
152                  }                  }
153    
154                  hSessions.push_back(socket);                  // Parser initialization
155                    yyparse_param_t yyparse_param;
156                    yyparse_param.pServer  = this;
157                    yyparse_param.hSession = socket;
158    
159                    Sessions.push_back(yyparse_param);
160                  FD_SET(socket, &fdSet);                  FD_SET(socket, &fdSet);
161                  if (socket > maxSessions)                  if (socket > maxSessions)
162                          maxSessions = socket;                          maxSessions = socket;
# Line 131  int LSCPServer::Main() { Line 166  int LSCPServer::Main() {
166          }          }
167    
168          //Something was selected and it was not the hSocket, so it must be some command(s) coming.          //Something was selected and it was not the hSocket, so it must be some command(s) coming.
169          for (std::vector<int>::iterator iter = hSessions.begin(); iter !=  hSessions.end(); iter++) {          for (std::vector<yyparse_param_t>::iterator iter = Sessions.begin(); iter != Sessions.end(); iter++) {
170                  if (FD_ISSET(*iter, &selectSet)) {      //Was it this socket?                  if (FD_ISSET((*iter).hSession, &selectSet)) {   //Was it this socket?
171                          if (GetLSCPCommand(iter)) {     //Have we read the entire command?                          if (GetLSCPCommand(iter)) {     //Have we read the entire command?
172                                  dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));                                  dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));
173                                  yylex_init(&yyparse_param.pScanner);                                  int dummy; // just a temporary hack to fulfill the restart() function prototype
174                                  currentSocket = *iter;  //a hack                                  restart(NULL, dummy); // restart the 'scanner'
175                                  int result = yyparse(&yyparse_param);                                  currentSocket = (*iter).hSession;  //a hack
176                                    dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));
177                                    if ((*iter).bVerbose) { // if echo mode enabled
178                                        AnswerClient(bufferedCommands[currentSocket]);
179                                    }
180                                    int result = yyparse(&(*iter));
181                                  currentSocket = -1;     //continuation of a hack                                  currentSocket = -1;     //continuation of a hack
182                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
183                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?
# Line 146  int LSCPServer::Main() { Line 186  int LSCPServer::Main() {
186                          }                          }
187                          //socket may have been closed, iter may be invalid, get out of the loop for now.                          //socket may have been closed, iter may be invalid, get out of the loop for now.
188                          //we'll be back if there is data.                          //we'll be back if there is data.
189                          break;                          break;
190                  }                  }
191          }          }
192    
# Line 158  int LSCPServer::Main() { Line 198  int LSCPServer::Main() {
198          }          }
199          NotifyBufferMutex.Unlock();          NotifyBufferMutex.Unlock();
200      }      }
     //It will never get here anyway  
     //yylex_destroy(yyparse_param.pScanner);  
201  }  }
202    
203  void LSCPServer::CloseConnection( std::vector<int>::iterator iter ) {  void LSCPServer::CloseConnection( std::vector<yyparse_param_t>::iterator iter ) {
204          int socket = *iter;          int socket = (*iter).hSession;
205          dmsg(1,("LSCPServer: Client connection terminated on socket:%d.\n",socket));          dmsg(1,("LSCPServer: Client connection terminated on socket:%d.\n",socket));
206          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));
207          hSessions.erase(iter);          Sessions.erase(iter);
208          FD_CLR(socket,  &fdSet);          FD_CLR(socket,  &fdSet);
209          SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)          SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)
210          for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {          for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {
# Line 180  void LSCPServer::CloseConnection( std::v Line 218  void LSCPServer::CloseConnection( std::v
218          NotifyMutex.Unlock();          NotifyMutex.Unlock();
219  }  }
220    
221    int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {
222            int subs = 0;
223            SubscriptionMutex.Lock();
224            for( std::list<LSCPEvent::event_t>::iterator iter = events.begin();
225                            iter != events.end(); iter++)
226            {
227                    subs += eventSubscriptions.count(*iter);
228            }
229            SubscriptionMutex.Unlock();
230            return subs;
231    }
232    
233  void LSCPServer::SendLSCPNotify( LSCPEvent event ) {  void LSCPServer::SendLSCPNotify( LSCPEvent event ) {
234          SubscriptionMutex.Lock();          SubscriptionMutex.Lock();
235          if (eventSubscriptions.count(event.GetType()) == 0) {          if (eventSubscriptions.count(event.GetType()) == 0) {
# Line 230  extern int GetLSCPCommand( void *buf, in Line 280  extern int GetLSCPCommand( void *buf, in
280   * If command is read, it will return true. Otherwise false is returned.   * If command is read, it will return true. Otherwise false is returned.
281   * In any case the received portion (complete or incomplete) is saved into bufferedCommand map.   * In any case the received portion (complete or incomplete) is saved into bufferedCommand map.
282   */   */
283  bool LSCPServer::GetLSCPCommand( std::vector<int>::iterator iter ) {  bool LSCPServer::GetLSCPCommand( std::vector<yyparse_param_t>::iterator iter ) {
284          int socket = *iter;          int socket = (*iter).hSession;
285          char c;          char c;
286          int i = 0;          int i = 0;
287          while (true) {          while (true) {
# Line 241  bool LSCPServer::GetLSCPCommand( std::ve Line 291  bool LSCPServer::GetLSCPCommand( std::ve
291                          break;                          break;
292                  }                  }
293                  if (result == 1) {                  if (result == 1) {
294                          if (c == '\r')                          if (c == '\r')
295                                  continue; //Ignore CR                                  continue; //Ignore CR
296                          if (c == '\n') {                          if (c == '\n') {
297                                    LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));
298                                  bufferedCommands[socket] += "\n";                                  bufferedCommands[socket] += "\n";
299                                  return true; //Complete command was read                                  return true; //Complete command was read
300                          }                          }
# Line 267  bool LSCPServer::GetLSCPCommand( std::ve Line 318  bool LSCPServer::GetLSCPCommand( std::ve
318                                          break;                                          break;
319                                  case EAGAIN:                                  case EAGAIN:
320                                          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"));                                          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"));
321                                          break;                                          break;
322                                  case EINTR:                                  case EINTR:
323                                          dmsg(2,("LSCPScanner: The receive was interrupted by delivery of a signal before any data were available.\n"));                                          dmsg(2,("LSCPScanner: The receive was interrupted by delivery of a signal before any data were available.\n"));
324                                          break;                                          break;
325                                  case EFAULT:                                  case EFAULT:
326                                          dmsg(2,("LSCPScanner: The receive buffer pointer(s) point outside the process's address space.\n"));                                          dmsg(2,("LSCPScanner: The receive buffer pointer(s) point outside the process's address space.\n"));
327                                          break;                                          break;
328                                  case EINVAL:                                  case EINVAL:
329                                          dmsg(2,("LSCPScanner: Invalid argument passed.\n"));                                          dmsg(2,("LSCPScanner: Invalid argument passed.\n"));
330                                          break;                                          break;
331                                  case ENOMEM:                                  case ENOMEM:
332                                          dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));                                          dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));
333                                          break;                                          break;
334                                  default:                                  default:
335                                          dmsg(2,("LSCPScanner: Unknown recv() error.\n"));                                          dmsg(2,("LSCPScanner: Unknown recv() error.\n"));
336                                          break;                                          break;
337                          }                          }
338                          CloseConnection(iter);                          CloseConnection(iter);
339                          break;                          break;
340                  }                  }
# Line 375  String LSCPServer::DestroyAudioOutputDev Line 426  String LSCPServer::DestroyAudioOutputDev
426      LSCPResultSet result;      LSCPResultSet result;
427      try {      try {
428          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
429          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) + ".");
430          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
431          pSampler->DestroyAudioOutputDevice(pDevice);          pSampler->DestroyAudioOutputDevice(pDevice);
432      }      }
# Line 390  String LSCPServer::DestroyMidiInputDevic Line 441  String LSCPServer::DestroyMidiInputDevic
441      LSCPResultSet result;      LSCPResultSet result;
442      try {      try {
443          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
444            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
445          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
         if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");  
446          pSampler->DestroyMidiInputDevice(pDevice);          pSampler->DestroyMidiInputDevice(pDevice);
447      }      }
448      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 408  String LSCPServer::LoadInstrument(String Line 459  String LSCPServer::LoadInstrument(String
459      LSCPResultSet result;      LSCPResultSet result;
460      try {      try {
461          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
462          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
463          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
464          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel yet");
465          if (pSamplerChannel->GetAudioOutputDevice() == NULL)          if (!pSamplerChannel->GetAudioOutputDevice())
466              throw LinuxSamplerException("No audio output device on channel");              throw LinuxSamplerException("No audio output device connected to sampler channel");
467          if (bBackground) {          if (bBackground) {
468              LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);              InstrumentLoader.StartNewLoad(Filename, uiInstrument, pEngineChannel);
469              pLoadInstrument->StartThread();          }
470            else {
471                // tell the engine channel which instrument to load
472                pEngineChannel->PrepareLoadInstrument(Filename.c_str(), uiInstrument);
473                // actually start to load the instrument (blocks until completed)
474                pEngineChannel->LoadInstrument();
475          }          }
         else pEngine->LoadInstrument(Filename.c_str(), uiInstrument);  
476      }      }
477      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
478           result.Error(e);           result.Error(e);
# Line 426  String LSCPServer::LoadInstrument(String Line 481  String LSCPServer::LoadInstrument(String
481  }  }
482    
483  /**  /**
484   * 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
485     * sampler channel.
486   */   */
487  String LSCPServer::LoadEngine(String EngineName, uint uiSamplerChannel) {  String LSCPServer::SetEngineType(String EngineName, uint uiSamplerChannel) {
488      dmsg(2,("LSCPServer: LoadEngine(EngineName=%s,SamplerChannel=%d)\n", EngineName.c_str(), uiSamplerChannel));      dmsg(2,("LSCPServer: LoadEngine(EngineName=%s,SamplerChannel=%d)\n", EngineName.c_str(), uiSamplerChannel));
489      LSCPResultSet result;      LSCPResultSet result;
490      try {      try {
         Engine::type_t type;  
         if ((EngineName == "GigEngine") || (EngineName == "gig")) type = Engine::type_gig;  
         else throw LinuxSamplerException("Unknown engine type");  
491          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
492          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
493          pSamplerChannel->LoadEngine(type);          LockRTNotify();
494            pSamplerChannel->SetEngineType(EngineName);
495            UnlockRTNotify();
496      }      }
497      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
498           result.Error(e);           result.Error(e);
# Line 456  String LSCPServer::GetChannels() { Line 511  String LSCPServer::GetChannels() {
511  }  }
512    
513  /**  /**
514     * Will be called by the parser to get the list of sampler channels.
515     */
516    String LSCPServer::ListChannels() {
517        dmsg(2,("LSCPServer: ListChannels()\n"));
518        String list;
519        std::map<uint,SamplerChannel*> channels = pSampler->GetSamplerChannels();
520        std::map<uint,SamplerChannel*>::iterator iter = channels.begin();
521        for (; iter != channels.end(); iter++) {
522            if (list != "") list += ",";
523            list += ToString(iter->first);
524        }
525        LSCPResultSet result;
526        result.Add(list);
527        return result.Produce();
528    }
529    
530    /**
531   * Will be called by the parser to add a sampler channel.   * Will be called by the parser to add a sampler channel.
532   */   */
533  String LSCPServer::AddChannel() {  String LSCPServer::AddChannel() {
# Line 471  String LSCPServer::AddChannel() { Line 543  String LSCPServer::AddChannel() {
543  String LSCPServer::RemoveChannel(uint uiSamplerChannel) {  String LSCPServer::RemoveChannel(uint uiSamplerChannel) {
544      dmsg(2,("LSCPServer: RemoveChannel(SamplerChannel=%d)\n", uiSamplerChannel));      dmsg(2,("LSCPServer: RemoveChannel(SamplerChannel=%d)\n", uiSamplerChannel));
545      LSCPResultSet result;      LSCPResultSet result;
546        LockRTNotify();
547      pSampler->RemoveSamplerChannel(uiSamplerChannel);      pSampler->RemoveSamplerChannel(uiSamplerChannel);
548        UnlockRTNotify();
549      return result.Produce();      return result.Produce();
550  }  }
551    
552  /**  /**
553   * 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.
554   */   */
555  String LSCPServer::GetAvailableEngines() {  String LSCPServer::GetAvailableEngines() {
556      dmsg(2,("LSCPServer: GetAvailableEngines()\n"));      dmsg(2,("LSCPServer: GetAvailableEngines()\n"));
557      LSCPResultSet result("GigEngine");      LSCPResultSet result("1");
558        return result.Produce();
559    }
560    
561    /**
562     * Will be called by the parser to get a list of all available engines.
563     */
564    String LSCPServer::ListAvailableEngines() {
565        dmsg(2,("LSCPServer: ListAvailableEngines()\n"));
566        LSCPResultSet result("\'GIG\'");
567      return result.Produce();      return result.Produce();
568  }  }
569    
570  /**  /**
571   * 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
572     * sampler engine.
573   */   */
574  String LSCPServer::GetEngineInfo(String EngineName) {  String LSCPServer::GetEngineInfo(String EngineName) {
575      dmsg(2,("LSCPServer: GetEngineInfo(EngineName=%s)\n", EngineName.c_str()));      dmsg(2,("LSCPServer: GetEngineInfo(EngineName=%s)\n", EngineName.c_str()));
576      LSCPResultSet result;      LSCPResultSet result;
577      try {      try {
578          if ((EngineName == "GigEngine") || (EngineName == "gig")) {          Engine* pEngine = EngineFactory::Create(EngineName);
579              Engine* pEngine = new LinuxSampler::gig::Engine;          result.Add("DESCRIPTION", pEngine->Description());
580              result.Add(pEngine->Description());          result.Add("VERSION",     pEngine->Version());
581              result.Add(pEngine->Version());          delete pEngine;
             delete pEngine;  
         }  
         else throw LinuxSamplerException("Unknown engine type");  
582      }      }
583      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
584           result.Error(e);           result.Error(e);
# Line 514  String LSCPServer::GetChannelInfo(uint u Line 595  String LSCPServer::GetChannelInfo(uint u
595      LSCPResultSet result;      LSCPResultSet result;
596      try {      try {
597          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
598          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
599          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
600    
601          //Defaults values          //Defaults values
602          String EngineName = "NONE";          String EngineName = "NONE";
603          float Volume = 0;          float Volume = 0.0f;
604          String InstrumentFileName = "NONE";          String InstrumentFileName = "NONE";
605            String InstrumentName = "NONE";
606          int InstrumentIndex = -1;          int InstrumentIndex = -1;
607          int InstrumentStatus = -1;          int InstrumentStatus = -1;
608            int AudioOutputChannels = 0;
609            String AudioRouting;
610    
611          if (pEngine) {          if (pEngineChannel) {
612              EngineName =  pEngine->EngineName();              EngineName          = pEngineChannel->EngineName();
613              Volume = pEngine->Volume();              AudioOutputChannels = pEngineChannel->Channels();
614              InstrumentStatus = pEngine->InstrumentStatus();              Volume              = pEngineChannel->Volume();
615              InstrumentIndex = pEngine->InstrumentIndex();              InstrumentStatus    = pEngineChannel->InstrumentStatus();
616              if (InstrumentIndex != -1)              InstrumentIndex     = pEngineChannel->InstrumentIndex();
617                  InstrumentFileName = pEngine->InstrumentFileName();              if (InstrumentIndex != -1) {
618                    InstrumentFileName = pEngineChannel->InstrumentFileName();
619                    InstrumentName     = pEngineChannel->InstrumentName();
620                }
621                for (int chan = 0; chan < pEngineChannel->Channels(); chan++) {
622                    if (AudioRouting != "") AudioRouting += ",";
623                    AudioRouting += ToString(pEngineChannel->OutputChannel(chan));
624                }
625          }          }
626    
627          result.Add("ENGINE_NAME", EngineName);          result.Add("ENGINE_NAME", EngineName);
# Line 538  String LSCPServer::GetChannelInfo(uint u Line 629  String LSCPServer::GetChannelInfo(uint u
629    
630          //Some not-so-hardcoded stuff to make GUI look good          //Some not-so-hardcoded stuff to make GUI look good
631          result.Add("AUDIO_OUTPUT_DEVICE", GetAudioOutputDeviceIndex(pSamplerChannel->GetAudioOutputDevice()));          result.Add("AUDIO_OUTPUT_DEVICE", GetAudioOutputDeviceIndex(pSamplerChannel->GetAudioOutputDevice()));
632          result.Add("AUDIO_OUTPUT_CHANNELS", "2");          result.Add("AUDIO_OUTPUT_CHANNELS", AudioOutputChannels);
633          result.Add("AUDIO_OUTPUT_ROUTING", "0,1");          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);
634    
635          result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice()));          result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice()));
636          result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());          result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());
637          result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());          if (pSamplerChannel->GetMidiInputChannel() == MidiInputPort::midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");
638            else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
639    
640          result.Add("INSTRUMENT_FILE", InstrumentFileName);          result.Add("INSTRUMENT_FILE", InstrumentFileName);
641          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
642            result.Add("INSTRUMENT_NAME", InstrumentName);
643          result.Add("INSTRUMENT_STATUS", InstrumentStatus);          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
644      }      }
645      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 564  String LSCPServer::GetVoiceCount(uint ui Line 657  String LSCPServer::GetVoiceCount(uint ui
657      LSCPResultSet result;      LSCPResultSet result;
658      try {      try {
659          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
660          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
661          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
662          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine loaded on sampler channel");
663          result.Add(pEngine->VoiceCount());          result.Add(pEngineChannel->GetEngine()->VoiceCount());
664      }      }
665      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
666           result.Error(e);           result.Error(e);
# Line 584  String LSCPServer::GetStreamCount(uint u Line 677  String LSCPServer::GetStreamCount(uint u
677      LSCPResultSet result;      LSCPResultSet result;
678      try {      try {
679          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
680          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
681          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
682          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
683          result.Add(pEngine->DiskStreamCount());          result.Add(pEngineChannel->GetEngine()->DiskStreamCount());
684      }      }
685      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
686           result.Error(e);           result.Error(e);
# Line 604  String LSCPServer::GetBufferFill(fill_re Line 697  String LSCPServer::GetBufferFill(fill_re
697      LSCPResultSet result;      LSCPResultSet result;
698      try {      try {
699          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
700          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
701          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
702          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
703          if (!pEngine->DiskStreamSupported())          if (!pEngineChannel->GetEngine()->DiskStreamSupported()) result.Add("NA");
             result.Add("NA");  
704          else {          else {
705              switch (ResponseType) {              switch (ResponseType) {
706                  case fill_response_bytes:                  case fill_response_bytes:
707                      result.Add(pEngine->DiskStreamBufferFillBytes());                      result.Add(pEngineChannel->GetEngine()->DiskStreamBufferFillBytes());
708                      break;                      break;
709                  case fill_response_percentage:                  case fill_response_percentage:
710                      result.Add(pEngine->DiskStreamBufferFillPercentage());                      result.Add(pEngineChannel->GetEngine()->DiskStreamBufferFillPercentage());
711                      break;                      break;
712                  default:                  default:
713                      throw LinuxSamplerException("Unknown fill response type");                      throw LinuxSamplerException("Unknown fill response type");
714              }              }
# Line 632  String LSCPServer::GetAvailableAudioOutp Line 724  String LSCPServer::GetAvailableAudioOutp
724      dmsg(2,("LSCPServer: GetAvailableAudioOutputDrivers()\n"));      dmsg(2,("LSCPServer: GetAvailableAudioOutputDrivers()\n"));
725      LSCPResultSet result;      LSCPResultSet result;
726      try {      try {
727            int n = AudioOutputDeviceFactory::AvailableDrivers().size();
728            result.Add(n);
729        }
730        catch (LinuxSamplerException e) {
731            result.Error(e);
732        }
733        return result.Produce();
734    }
735    
736    String LSCPServer::ListAvailableAudioOutputDrivers() {
737        dmsg(2,("LSCPServer: ListAvailableAudioOutputDrivers()\n"));
738        LSCPResultSet result;
739        try {
740          String s = AudioOutputDeviceFactory::AvailableDriversAsString();          String s = AudioOutputDeviceFactory::AvailableDriversAsString();
741          result.Add(s);          result.Add(s);
742      }      }
# Line 645  String LSCPServer::GetAvailableMidiInput Line 750  String LSCPServer::GetAvailableMidiInput
750      dmsg(2,("LSCPServer: GetAvailableMidiInputDrivers()\n"));      dmsg(2,("LSCPServer: GetAvailableMidiInputDrivers()\n"));
751      LSCPResultSet result;      LSCPResultSet result;
752      try {      try {
753            int n = MidiInputDeviceFactory::AvailableDrivers().size();
754            result.Add(n);
755        }
756        catch (LinuxSamplerException e) {
757            result.Error(e);
758        }
759        return result.Produce();
760    }
761    
762    String LSCPServer::ListAvailableMidiInputDrivers() {
763        dmsg(2,("LSCPServer: ListAvailableMidiInputDrivers()\n"));
764        LSCPResultSet result;
765        try {
766          String s = MidiInputDeviceFactory::AvailableDriversAsString();          String s = MidiInputDeviceFactory::AvailableDriversAsString();
767          result.Add(s);          result.Add(s);
768      }      }
# Line 703  String LSCPServer::GetAudioOutputDriverI Line 821  String LSCPServer::GetAudioOutputDriverI
821  }  }
822    
823  String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {  String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
824      dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str()));      dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s,DependencyListSize=%d)\n",Driver.c_str(),Parameter.c_str(),DependencyList.size()));
825      LSCPResultSet result;      LSCPResultSet result;
826      try {      try {
827          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);
# Line 712  String LSCPServer::GetMidiInputDriverPar Line 830  String LSCPServer::GetMidiInputDriverPar
830          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    pParameter->Mandatory());
831          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
832          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
833          if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());          optional<String> oDepends       = pParameter->Depends();
834          if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());          optional<String> oDefault       = pParameter->Default(DependencyList);
835          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
836          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
837          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
838            if (oDepends)       result.Add("DEPENDS",       *oDepends);
839            if (oDefault)       result.Add("DEFAULT",       *oDefault);
840            if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
841            if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
842            if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
843      }      }
844      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
845          result.Error(e);          result.Error(e);
# Line 725  String LSCPServer::GetMidiInputDriverPar Line 848  String LSCPServer::GetMidiInputDriverPar
848  }  }
849    
850  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
851      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()));
852      LSCPResultSet result;      LSCPResultSet result;
853      try {      try {
854          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);
# Line 734  String LSCPServer::GetAudioOutputDriverP Line 857  String LSCPServer::GetAudioOutputDriverP
857          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    pParameter->Mandatory());
858          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
859          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
860          if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());          optional<String> oDepends       = pParameter->Depends();
861          if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());          optional<String> oDefault       = pParameter->Default(DependencyList);
862          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
863          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
864          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
865            if (oDepends)       result.Add("DEPENDS",       *oDepends);
866            if (oDefault)       result.Add("DEFAULT",       *oDefault);
867            if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
868            if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
869            if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
870      }      }
871      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
872          result.Error(e);          result.Error(e);
# Line 815  String LSCPServer::GetAudioOutputDeviceI Line 943  String LSCPServer::GetAudioOutputDeviceI
943      LSCPResultSet result;      LSCPResultSet result;
944      try {      try {
945          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
946          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) + ".");
947          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
948          result.Add("driver", pDevice->Driver());          result.Add("DRIVER", pDevice->Driver());
949          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
950          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
951          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 835  String LSCPServer::GetMidiInputDeviceInf Line 963  String LSCPServer::GetMidiInputDeviceInf
963      LSCPResultSet result;      LSCPResultSet result;
964      try {      try {
965          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
966            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
967          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
968          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");          result.Add("DRIVER", pDevice->Driver());
         result.Add("driver", pDevice->Driver());  
969          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
970          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
971          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 853  String LSCPServer::GetMidiInputPortInfo( Line 981  String LSCPServer::GetMidiInputPortInfo(
981      dmsg(2,("LSCPServer: GetMidiInputPortInfo(DeviceIndex=%d, PortIndex=%d)\n",DeviceIndex, PortIndex));      dmsg(2,("LSCPServer: GetMidiInputPortInfo(DeviceIndex=%d, PortIndex=%d)\n",DeviceIndex, PortIndex));
982      LSCPResultSet result;      LSCPResultSet result;
983      try {      try {
984            // get MIDI input device
985          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
986            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
987          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
988          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");  
989          MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);          // get MIDI port
990          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");          MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
991          std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
992          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();  
993            // return the values of all MIDI port parameters
994            std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
995            std::map<String,DeviceRuntimeParameter*>::iterator iter = parameters.begin();
996          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
997              result.Add(iter->first, iter->second->Value());              result.Add(iter->first, iter->second->Value());
998          }          }
# Line 876  String LSCPServer::GetAudioOutputChannel Line 1009  String LSCPServer::GetAudioOutputChannel
1009      try {      try {
1010          // get audio output device          // get audio output device
1011          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1012          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) + ".");
1013          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
1014    
1015          // get audio channel          // get audio channel
1016          AudioChannel* pChannel = pDevice->Channel(ChannelId);          AudioChannel* pChannel = pDevice->Channel(ChannelId);
1017          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) + ".");
1018    
1019          // return the values of all audio channel parameters          // return the values of all audio channel parameters
1020          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
# Line 896  String LSCPServer::GetAudioOutputChannel Line 1029  String LSCPServer::GetAudioOutputChannel
1029      return result.Produce();      return result.Produce();
1030  }  }
1031    
1032    String LSCPServer::GetMidiInputPortParameterInfo(uint DeviceId, uint PortId, String ParameterName) {
1033        dmsg(2,("LSCPServer: GetMidiInputPortParameterInfo(DeviceId=%d,PortId=%d,ParameterName=%s)\n",DeviceId,PortId,ParameterName.c_str()));
1034        LSCPResultSet result;
1035        try {
1036            // get MIDI input device
1037            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1038            if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");
1039            MidiInputDevice* pDevice = devices[DeviceId];
1040    
1041            // get midi port
1042            MidiInputPort* pPort = pDevice->GetPort(PortId);
1043            if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");
1044    
1045            // get desired port parameter
1046            std::map<String,DeviceRuntimeParameter*> parameters = pPort->PortParameters();
1047            if (!parameters.count(ParameterName)) throw LinuxSamplerException("Midi port does not provide a parameter '" + ParameterName + "'.");
1048            DeviceRuntimeParameter* pParameter = parameters[ParameterName];
1049    
1050            // return all fields of this audio channel parameter
1051            result.Add("TYPE",         pParameter->Type());
1052            result.Add("DESCRIPTION",  pParameter->Description());
1053            result.Add("FIX",          pParameter->Fix());
1054            result.Add("MULTIPLICITY", pParameter->Multiplicity());
1055            if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
1056            if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
1057            if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
1058        }
1059        catch (LinuxSamplerException e) {
1060            result.Error(e);
1061        }
1062        return result.Produce();
1063    }
1064    
1065  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {
1066      dmsg(2,("LSCPServer: GetAudioOutputChannelParameterInfo(DeviceId=%d,ChannelId=%d,ParameterName=%s)\n",DeviceId,ChannelId,ParameterName.c_str()));      dmsg(2,("LSCPServer: GetAudioOutputChannelParameterInfo(DeviceId=%d,ChannelId=%d,ParameterName=%s)\n",DeviceId,ChannelId,ParameterName.c_str()));
1067      LSCPResultSet result;      LSCPResultSet result;
1068      try {      try {
1069          // get audio output device          // get audio output device
1070          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1071          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) + ".");
1072          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
1073    
1074          // get audio channel          // get audio channel
1075          AudioChannel* pChannel = pDevice->Channel(ChannelId);          AudioChannel* pChannel = pDevice->Channel(ChannelId);
1076          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) + ".");
1077    
1078          // get desired audio channel parameter          // get desired audio channel parameter
1079          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
1080          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 + "'.");
1081          DeviceRuntimeParameter* pParameter = parameters[ParameterName];          DeviceRuntimeParameter* pParameter = parameters[ParameterName];
1082    
1083          // return all fields of this audio channel parameter          // return all fields of this audio channel parameter
# Line 919  String LSCPServer::GetAudioOutputChannel Line 1085  String LSCPServer::GetAudioOutputChannel
1085          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
1086          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
1087          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
1088          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
1089          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
1090          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
1091      }      }
1092      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1093          result.Error(e);          result.Error(e);
# Line 935  String LSCPServer::SetAudioOutputChannel Line 1101  String LSCPServer::SetAudioOutputChannel
1101      try {      try {
1102          // get audio output device          // get audio output device
1103          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1104          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) + ".");
1105          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
1106    
1107          // get audio channel          // get audio channel
1108          AudioChannel* pChannel = pDevice->Channel(ChannelId);          AudioChannel* pChannel = pDevice->Channel(ChannelId);
1109          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) + ".");
1110    
1111          // get desired audio channel parameter          // get desired audio channel parameter
1112          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
1113          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 + "'.");
1114          DeviceRuntimeParameter* pParameter = parameters[ParamKey];          DeviceRuntimeParameter* pParameter = parameters[ParamKey];
1115    
1116          // set new channel parameter value          // set new channel parameter value
# Line 961  String LSCPServer::SetAudioOutputDeviceP Line 1127  String LSCPServer::SetAudioOutputDeviceP
1127      LSCPResultSet result;      LSCPResultSet result;
1128      try {      try {
1129          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1130          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) + ".");
1131          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
1132          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1133          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 + "'");
1134          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1135      }      }
1136      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 978  String LSCPServer::SetMidiInputDevicePar Line 1144  String LSCPServer::SetMidiInputDevicePar
1144      LSCPResultSet result;      LSCPResultSet result;
1145      try {      try {
1146          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1147          if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");          if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1148          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
1149          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1150          if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");          if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
1151          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1152      }      }
1153      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 994  String LSCPServer::SetMidiInputPortParam Line 1160  String LSCPServer::SetMidiInputPortParam
1160      dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));      dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
1161      LSCPResultSet result;      LSCPResultSet result;
1162      try {      try {
1163            // get MIDI input device
1164          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1165            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1166          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
1167          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");  
1168          MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);          // get MIDI port
1169          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");          MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
1170          std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
1171          if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");  
1172            // set port parameter value
1173            std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
1174            if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
1175          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1176      }      }
1177      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 1015  String LSCPServer::SetMidiInputPortParam Line 1186  String LSCPServer::SetMidiInputPortParam
1186   */   */
1187  String LSCPServer::SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel) {
1188      dmsg(2,("LSCPServer: SetAudioOutputChannel(ChannelAudioOutputChannel=%d, AudioOutputDeviceInputChannel=%d, SamplerChannel=%d)\n",ChannelAudioOutputChannel,AudioOutputDeviceInputChannel,uiSamplerChannel));      dmsg(2,("LSCPServer: SetAudioOutputChannel(ChannelAudioOutputChannel=%d, AudioOutputDeviceInputChannel=%d, SamplerChannel=%d)\n",ChannelAudioOutputChannel,AudioOutputDeviceInputChannel,uiSamplerChannel));
1189      return "ERR:0:Not implemented yet.\r\n"; //FIXME: Add support for this in resultset class?      LSCPResultSet result;
1190        try {
1191            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1192            if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1193            EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
1194            if (!pEngineChannel) throw LinuxSamplerException("No engine type yet assigned to sampler channel " + ToString(uiSamplerChannel));
1195            if (!pSamplerChannel->GetAudioOutputDevice()) throw LinuxSamplerException("No audio output device connected to sampler channel " + ToString(uiSamplerChannel));
1196            pEngineChannel->SetOutputChannel(ChannelAudioOutputChannel, AudioOutputDeviceInputChannel);
1197        }
1198        catch (LinuxSamplerException e) {
1199             result.Error(e);
1200        }
1201        return result.Produce();
1202  }  }
1203    
1204  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {
# Line 1023  String LSCPServer::SetAudioOutputDevice( Line 1206  String LSCPServer::SetAudioOutputDevice(
1206      LSCPResultSet result;      LSCPResultSet result;
1207      try {      try {
1208          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1209          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1210          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1211            if (!devices.count(AudioDeviceId)) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));
1212          AudioOutputDevice* pDevice = devices[AudioDeviceId];          AudioOutputDevice* pDevice = devices[AudioDeviceId];
         if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));  
1213          pSamplerChannel->SetAudioOutputDevice(pDevice);          pSamplerChannel->SetAudioOutputDevice(pDevice);
1214      }      }
1215      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 1040  String LSCPServer::SetAudioOutputType(St Line 1223  String LSCPServer::SetAudioOutputType(St
1223      LSCPResultSet result;      LSCPResultSet result;
1224      try {      try {
1225          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1226          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1227          // Driver type name aliasing...          // Driver type name aliasing...
1228          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";          if (AudioOutputDriver == "Alsa") AudioOutputDriver = "ALSA";
1229          if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";                  if (AudioOutputDriver == "Jack") AudioOutputDriver = "JACK";
1230          // Check if there's one audio output device already created          // Check if there's one audio output device already created
1231          // for the intended audio driver type (AudioOutputDriver)...          // for the intended audio driver type (AudioOutputDriver)...
1232          AudioOutputDevice *pDevice = NULL;          AudioOutputDevice *pDevice = NULL;
# Line 1077  String LSCPServer::SetMIDIInputPort(uint Line 1260  String LSCPServer::SetMIDIInputPort(uint
1260      LSCPResultSet result;      LSCPResultSet result;
1261      try {      try {
1262          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1263          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1264          pSamplerChannel->SetMidiInputPort(MIDIPort);          pSamplerChannel->SetMidiInputPort(MIDIPort);
1265      }      }
1266      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 1091  String LSCPServer::SetMIDIInputChannel(u Line 1274  String LSCPServer::SetMIDIInputChannel(u
1274      LSCPResultSet result;      LSCPResultSet result;
1275      try {      try {
1276          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1277          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1278          pSamplerChannel->SetMidiInputChannel((MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);          pSamplerChannel->SetMidiInputChannel((MidiInputPort::midi_chan_t) MIDIChannel);
1279      }      }
1280      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1281           result.Error(e);           result.Error(e);
# Line 1105  String LSCPServer::SetMIDIInputDevice(ui Line 1288  String LSCPServer::SetMIDIInputDevice(ui
1288      LSCPResultSet result;      LSCPResultSet result;
1289      try {      try {
1290          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1291          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1292          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1293            if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1294          MidiInputDevice* pDevice = devices[MIDIDeviceId];          MidiInputDevice* pDevice = devices[MIDIDeviceId];
         if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));  
1295          pSamplerChannel->SetMidiInputDevice(pDevice);          pSamplerChannel->SetMidiInputDevice(pDevice);
1296      }      }
1297      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 1122  String LSCPServer::SetMIDIInputType(Stri Line 1305  String LSCPServer::SetMIDIInputType(Stri
1305      LSCPResultSet result;      LSCPResultSet result;
1306      try {      try {
1307          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1308          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1309          // Driver type name aliasing...          // Driver type name aliasing...
1310          if (MidiInputDriver == "ALSA") MidiInputDriver = "Alsa";          if (MidiInputDriver == "Alsa") MidiInputDriver = "ALSA";
1311          // Check if there's one MIDI input device already created          // Check if there's one MIDI input device already created
1312          // for the intended MIDI driver type (MidiInputDriver)...          // for the intended MIDI driver type (MidiInputDriver)...
1313          MidiInputDevice *pDevice = NULL;          MidiInputDevice *pDevice = NULL;
# Line 1142  String LSCPServer::SetMIDIInputType(Stri Line 1325  String LSCPServer::SetMIDIInputType(Stri
1325              pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);              pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);
1326              // Make it with at least one initial port.              // Make it with at least one initial port.
1327              std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();              std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1328              parameters["ports"]->SetValue("1");              parameters["PORTS"]->SetValue("1");
1329          }          }
1330          // Must have a device...          // Must have a device...
1331          if (pDevice == NULL)          if (pDevice == NULL)
# Line 1165  String LSCPServer::SetMIDIInput(uint MID Line 1348  String LSCPServer::SetMIDIInput(uint MID
1348      LSCPResultSet result;      LSCPResultSet result;
1349      try {      try {
1350          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1351          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1352          std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();          std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();
1353            if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1354          MidiInputDevice* pDevice = devices[MIDIDeviceId];          MidiInputDevice* pDevice = devices[MIDIDeviceId];
1355          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));          pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputPort::midi_chan_t) MIDIChannel);
         pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);  
1356      }      }
1357      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1358           result.Error(e);           result.Error(e);
# Line 1181  String LSCPServer::SetMIDIInput(uint MID Line 1364  String LSCPServer::SetMIDIInput(uint MID
1364   * Will be called by the parser to change the global volume factor on a   * Will be called by the parser to change the global volume factor on a
1365   * particular sampler channel.   * particular sampler channel.
1366   */   */
1367  String LSCPServer::SetVolume(double Volume, uint uiSamplerChannel) {  String LSCPServer::SetVolume(double dVolume, uint uiSamplerChannel) {
1368      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", Volume, uiSamplerChannel));      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", dVolume, uiSamplerChannel));
1369      LSCPResultSet result;      LSCPResultSet result;
1370      try {      try {
1371          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1372          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1373          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
1374          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
1375          pEngine->Volume(Volume);          pEngineChannel->Volume(dVolume);
1376      }      }
1377      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1378           result.Error(e);           result.Error(e);
# Line 1205  String LSCPServer::ResetChannel(uint uiS Line 1388  String LSCPServer::ResetChannel(uint uiS
1388      LSCPResultSet result;      LSCPResultSet result;
1389      try {      try {
1390          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1391          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1392          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
1393          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
1394          pEngine->Reset();          if (!pEngineChannel->GetEngine()) throw LinuxSamplerException("No audio output device connected to sampler channel");
1395            pEngineChannel->GetEngine()->Reset();
1396      }      }
1397      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1398           result.Error(e);           result.Error(e);
# Line 1217  String LSCPServer::ResetChannel(uint uiS Line 1401  String LSCPServer::ResetChannel(uint uiS
1401  }  }
1402    
1403  /**  /**
1404     * Will be called by the parser to reset the whole sampler.
1405     */
1406    String LSCPServer::ResetSampler() {
1407        dmsg(2,("LSCPServer: ResetSampler()\n"));
1408        pSampler->Reset();
1409        LSCPResultSet result;
1410        return result.Produce();
1411    }
1412    
1413    /**
1414     * Will be called by the parser to return general informations about this
1415     * sampler.
1416     */
1417    String LSCPServer::GetServerInfo() {
1418        dmsg(2,("LSCPServer: GetServerInfo()\n"));
1419        LSCPResultSet result;
1420        result.Add("DESCRIPTION", "LinuxSampler - modular, streaming capable sampler");
1421        result.Add("VERSION", VERSION);
1422        result.Add("PROTOCOL_VERSION", "1.0");
1423        return result.Produce();
1424    }
1425    
1426    /**
1427   * Will be called by the parser to subscribe a client (frontend) on the   * Will be called by the parser to subscribe a client (frontend) on the
1428   * server for receiving event messages.   * server for receiving event messages.
1429   */   */
# Line 1242  String LSCPServer::UnsubscribeNotificati Line 1449  String LSCPServer::UnsubscribeNotificati
1449      return result.Produce();      return result.Produce();
1450  }  }
1451    
1452    static int select_callback(void * lscpResultSet, int argc,
1453  // Instrument loader constructor.                          char **argv, char **azColName)
 LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)  
     : Thread(false, 0, -4)  
1454  {  {
1455      this->pEngine = pEngine;      LSCPResultSet* resultSet = (LSCPResultSet*) lscpResultSet;
1456      this->Filename = Filename;      resultSet->Add(argc, argv);
1457      this->uiInstrument = uiInstrument;      return 0;
1458  }  }
1459    
1460  // Instrument loader process.  String LSCPServer::QueryDatabase(String query) {
1461  int LSCPLoadInstrument::Main()      LSCPResultSet result;
1462  {  #if HAVE_SQLITE3
1463      try {      char* zErrMsg = NULL;
1464          pEngine->LoadInstrument(Filename.c_str(), uiInstrument);      sqlite3 *db;
1465        String selectStr = "SELECT " + query;
1466    
1467        int rc = sqlite3_open("linuxsampler.db", &db);
1468        if (rc == SQLITE_OK)
1469        {
1470                rc = sqlite3_exec(db, selectStr.c_str(), select_callback, &result, &zErrMsg);
1471        }
1472        if ( rc != SQLITE_OK )
1473        {
1474                result.Error(String(zErrMsg), rc);
1475      }      }
1476        sqlite3_close(db);
1477    #else
1478        result.Error(String("SQLITE3 was not installed when linuxsampler was built. SELECT statement is not available."), 0);
1479    #endif
1480        return result.Produce();
1481    }
1482    
1483    /**
1484     * Will be called by the parser to enable or disable echo mode; if echo
1485     * mode is enabled, all commands from the client will (immediately) be
1486     * echoed back to the client.
1487     */
1488    String LSCPServer::SetEcho(yyparse_param_t* pSession, double boolean_value) {
1489        dmsg(2,("LSCPServer: SetEcho(val=%f)\n", boolean_value));
1490        LSCPResultSet result;
1491        try {
1492            if      (boolean_value == 0) pSession->bVerbose = false;
1493            else if (boolean_value == 1) pSession->bVerbose = true;
1494            else throw LinuxSamplerException("Not a boolean value, must either be 0 or 1");
1495        }
1496      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1497          e.PrintMessage();           result.Error(e);
1498      }      }
1499        return result.Produce();
     // Always re-enable the engine.  
     pEngine->Enable();  
   
     // FIXME: Shoot ourselves on the foot?  
     delete this;  
1500  }  }
Legend:
Removed from v.170  
changed lines
  Added in v.579
  ViewVC Help
Powered by ViewVC