/[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 212 by schoenebeck, Wed Jul 28 14:17:29 2004 UTC
# Line 25  Line 25 
25  #include "lscpevent.h"  #include "lscpevent.h"
26    
27  #include "../engines/gig/Engine.h"  #include "../engines/gig/Engine.h"
28  #include "../audiodriver/AudioOutputDeviceFactory.h"  #include "../drivers/audio/AudioOutputDeviceFactory.h"
29  #include "../mididriver/MidiInputDeviceFactory.h"  #include "../drivers/midi/MidiInputDeviceFactory.h"
30    
31  /**  /**
32   * Below are a few static members of the LSCPServer class.   * Below are a few static members of the LSCPServer class.
# Line 43  Line 43 
43   */   */
44  fd_set LSCPServer::fdSet;  fd_set LSCPServer::fdSet;
45  int LSCPServer::currentSocket = -1;  int LSCPServer::currentSocket = -1;
46  std::vector<int> LSCPServer::hSessions = std::vector<int>();  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();
47  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();
48  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();
49  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> >();
# Line 61  LSCPServer::LSCPServer(Sampler* pSampler Line 61  LSCPServer::LSCPServer(Sampler* pSampler
61      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
62  }  }
63    
64    /**
65     * Blocks the calling thread until the LSCP Server is initialized and
66     * accepting socket connections, if the server is already initialized then
67     * this method will return immediately.
68     * @param TimeoutSeconds     - optional: max. wait time in seconds
69     *                             (default: 0s)
70     * @param TimeoutNanoSeconds - optional: max wait time in nano seconds
71     *                             (default: 0ns)
72     * @returns  0 on success, a value less than 0 if timeout exceeded
73     */
74    int LSCPServer::WaitUntilInitialized(long TimeoutSeconds, long TimeoutNanoSeconds) {
75        return Initialized.WaitAndUnlockIf(false, TimeoutSeconds, TimeoutNanoSeconds);
76    }
77    
78  int LSCPServer::Main() {  int LSCPServer::Main() {
79      int hSocket = socket(AF_INET, SOCK_STREAM, 0);      int hSocket = socket(AF_INET, SOCK_STREAM, 0);
80      if (hSocket < 0) {      if (hSocket < 0) {
# Line 81  int LSCPServer::Main() { Line 95  int LSCPServer::Main() {
95      }      }
96    
97      listen(hSocket, 1);      listen(hSocket, 1);
98      dmsg(1,("LSCPServer: Server running.\n")); // server running      Initialized.Set(true);
99    
100      // now wait for client connections and handle their requests      // now wait for client connections and handle their requests
101      sockaddr_in client;      sockaddr_in client;
102      int length = sizeof(client);      int length = sizeof(client);
     struct timeval tv;  
     tv.tv_sec = 30;  
     tv.tv_usec = 0;  
103      FD_ZERO(&fdSet);      FD_ZERO(&fdSet);
104      FD_SET(hSocket, &fdSet);      FD_SET(hSocket, &fdSet);
105      int maxSessions = hSocket;      int maxSessions = hSocket;
   
     // Parser initialization  
     yyparse_param_t yyparse_param;  
     yyparse_param.pServer = this;  
106    
107      while (true) {      while (true) {
108          fd_set selectSet = fdSet;          fd_set selectSet = fdSet;
109          int retval = select(maxSessions+1, &selectSet, NULL, NULL, &tv);          int retval = select(maxSessions+1, &selectSet, NULL, NULL, NULL);
110          if (retval == 0)          if (retval == 0)
111                  continue; //Nothing in 30 seconds, try again                  continue; //Nothing try again
112          if (retval == -1) {          if (retval == -1) {
113                  std::cerr << "LSCPServer: Socket select error." << std::endl;                  std::cerr << "LSCPServer: Socket select error." << std::endl;
114                  close(hSocket);                  close(hSocket);
115                  exit(EXIT_FAILURE);                  exit(EXIT_FAILURE);
116          }          }
117            
118          //Accept new connections now (if any)          //Accept new connections now (if any)
119          if (FD_ISSET(hSocket, &selectSet)) {          if (FD_ISSET(hSocket, &selectSet)) {
120                  int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);                  int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);
# Line 121  int LSCPServer::Main() { Line 128  int LSCPServer::Main() {
128                          exit(EXIT_FAILURE);                          exit(EXIT_FAILURE);
129                  }                  }
130    
131                  hSessions.push_back(socket);                  // Parser initialization
132                    yyparse_param_t yyparse_param;
133                    yyparse_param.pServer  = this;
134                    yyparse_param.hSession = socket;
135    
136                    Sessions.push_back(yyparse_param);
137                  FD_SET(socket, &fdSet);                  FD_SET(socket, &fdSet);
138                  if (socket > maxSessions)                  if (socket > maxSessions)
139                          maxSessions = socket;                          maxSessions = socket;
# Line 131  int LSCPServer::Main() { Line 143  int LSCPServer::Main() {
143          }          }
144    
145          //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.
146          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++) {
147                  if (FD_ISSET(*iter, &selectSet)) {      //Was it this socket?                  if (FD_ISSET((*iter).hSession, &selectSet)) {   //Was it this socket?
148                          if (GetLSCPCommand(iter)) {     //Have we read the entire command?                          if (GetLSCPCommand(iter)) {     //Have we read the entire command?
149                                  dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));                                  dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));
150                                  yylex_init(&yyparse_param.pScanner);                                  yylex_init(&((*iter).pScanner)); //FIXME: should me moved out of this loop and initialized only when a new session is created
151                                  currentSocket = *iter;  //a hack                                  currentSocket = (*iter).hSession;  //a hack
152                                  int result = yyparse(&yyparse_param);                                  if ((*iter).bVerbose) { // if echo mode enabled
153                                        AnswerClient(bufferedCommands[currentSocket]);
154                                    }
155                                    int result = yyparse(&(*iter));
156                                  currentSocket = -1;     //continuation of a hack                                  currentSocket = -1;     //continuation of a hack
157                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
158                                  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 161  int LSCPServer::Main() {
161                          }                          }
162                          //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.
163                          //we'll be back if there is data.                          //we'll be back if there is data.
164                          break;                          break;
165                  }                  }
166          }          }
167    
# Line 162  int LSCPServer::Main() { Line 177  int LSCPServer::Main() {
177      //yylex_destroy(yyparse_param.pScanner);      //yylex_destroy(yyparse_param.pScanner);
178  }  }
179    
180  void LSCPServer::CloseConnection( std::vector<int>::iterator iter ) {  void LSCPServer::CloseConnection( std::vector<yyparse_param_t>::iterator iter ) {
181          int socket = *iter;          int socket = (*iter).hSession;
182          dmsg(1,("LSCPServer: Client connection terminated on socket:%d.\n",socket));          dmsg(1,("LSCPServer: Client connection terminated on socket:%d.\n",socket));
183          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));
184          hSessions.erase(iter);          Sessions.erase(iter);
185          FD_CLR(socket,  &fdSet);          FD_CLR(socket,  &fdSet);
186          SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)          SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)
187          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 178  void LSCPServer::CloseConnection( std::v Line 193  void LSCPServer::CloseConnection( std::v
193          bufferedNotifies.erase(socket);          bufferedNotifies.erase(socket);
194          close(socket);          close(socket);
195          NotifyMutex.Unlock();          NotifyMutex.Unlock();
196            //yylex_destroy((*iter).pScanner);
197  }  }
198    
199  void LSCPServer::SendLSCPNotify( LSCPEvent event ) {  void LSCPServer::SendLSCPNotify( LSCPEvent event ) {
# Line 230  extern int GetLSCPCommand( void *buf, in Line 246  extern int GetLSCPCommand( void *buf, in
246   * If command is read, it will return true. Otherwise false is returned.   * If command is read, it will return true. Otherwise false is returned.
247   * 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.
248   */   */
249  bool LSCPServer::GetLSCPCommand( std::vector<int>::iterator iter ) {  bool LSCPServer::GetLSCPCommand( std::vector<yyparse_param_t>::iterator iter ) {
250          int socket = *iter;          int socket = (*iter).hSession;
251          char c;          char c;
252          int i = 0;          int i = 0;
253          while (true) {          while (true) {
# Line 241  bool LSCPServer::GetLSCPCommand( std::ve Line 257  bool LSCPServer::GetLSCPCommand( std::ve
257                          break;                          break;
258                  }                  }
259                  if (result == 1) {                  if (result == 1) {
260                          if (c == '\r')                          if (c == '\r')
261                                  continue; //Ignore CR                                  continue; //Ignore CR
262                          if (c == '\n') {                          if (c == '\n') {
263                                    LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));
264                                  bufferedCommands[socket] += "\n";                                  bufferedCommands[socket] += "\n";
265                                  return true; //Complete command was read                                  return true; //Complete command was read
266                          }                          }
# Line 267  bool LSCPServer::GetLSCPCommand( std::ve Line 284  bool LSCPServer::GetLSCPCommand( std::ve
284                                          break;                                          break;
285                                  case EAGAIN:                                  case EAGAIN:
286                                          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"));
287                                          break;                                          break;
288                                  case EINTR:                                  case EINTR:
289                                          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"));
290                                          break;                                          break;
291                                  case EFAULT:                                  case EFAULT:
292                                          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"));
293                                          break;                                          break;
294                                  case EINVAL:                                  case EINVAL:
295                                          dmsg(2,("LSCPScanner: Invalid argument passed.\n"));                                          dmsg(2,("LSCPScanner: Invalid argument passed.\n"));
296                                          break;                                          break;
297                                  case ENOMEM:                                  case ENOMEM:
298                                          dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));                                          dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));
299                                          break;                                          break;
300                                  default:                                  default:
301                                          dmsg(2,("LSCPScanner: Unknown recv() error.\n"));                                          dmsg(2,("LSCPScanner: Unknown recv() error.\n"));
302                                          break;                                          break;
303                          }                          }
304                          CloseConnection(iter);                          CloseConnection(iter);
305                          break;                          break;
306                  }                  }
# Line 456  String LSCPServer::GetChannels() { Line 473  String LSCPServer::GetChannels() {
473  }  }
474    
475  /**  /**
476     * Will be called by the parser to get the list of sampler channels.
477     */
478    String LSCPServer::ListChannels() {
479        dmsg(2,("LSCPServer: ListChannels()\n"));
480        String list;
481        std::map<uint,SamplerChannel*> channels = pSampler->GetSamplerChannels();
482        std::map<uint,SamplerChannel*>::iterator iter = channels.begin();
483        for (; iter != channels.end(); iter++) {
484            if (list != "") list += ",";
485            list += ToString(iter->first);
486        }
487        LSCPResultSet result;
488        result.Add(list);
489        return result.Produce();
490    }
491    
492    /**
493   * Will be called by the parser to add a sampler channel.   * Will be called by the parser to add a sampler channel.
494   */   */
495  String LSCPServer::AddChannel() {  String LSCPServer::AddChannel() {
# Line 709  String LSCPServer::GetMidiInputDriverPar Line 743  String LSCPServer::GetMidiInputDriverPar
743          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);
744          result.Add("TYPE",         pParameter->Type());          result.Add("TYPE",         pParameter->Type());
745          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
746          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    (pParameter->Mandatory())    ? "true" : "false");
747          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          (pParameter->Fix())          ? "true" : "false");
748          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", (pParameter->Multiplicity()) ? "true" : "false");
749          if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());          if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());
750          if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());          if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());
751          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
752          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
753          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
754      }      }
755      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
756          result.Error(e);          result.Error(e);
# Line 731  String LSCPServer::GetAudioOutputDriverP Line 765  String LSCPServer::GetAudioOutputDriverP
765          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);
766          result.Add("TYPE",         pParameter->Type());          result.Add("TYPE",         pParameter->Type());
767          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
768          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    (pParameter->Mandatory())    ? "true" : "false");
769          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          (pParameter->Fix())          ? "true" : "false");
770          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", (pParameter->Multiplicity()) ? "true" : "false");
771          if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());          if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());
772          if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());          if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());
773          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
774          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
775          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
776      }      }
777      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
778          result.Error(e);          result.Error(e);
# Line 896  String LSCPServer::GetAudioOutputChannel Line 930  String LSCPServer::GetAudioOutputChannel
930      return result.Produce();      return result.Produce();
931  }  }
932    
933    String LSCPServer::GetMidiInputPortParameterInfo(uint DeviceId, uint PortId, String ParameterName) {
934        dmsg(2,("LSCPServer: GetMidiInputPortParameterInfo(DeviceId=%d,PortId=%d,ParameterName=%s)\n",DeviceId,PortId,ParameterName.c_str()));
935        LSCPResultSet result;
936        try {
937            // get audio output device
938            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
939            if (!devices[DeviceId]) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");
940            MidiInputDevice* pDevice = devices[DeviceId];
941    
942            // get midi port
943            MidiInputDevice::MidiInputPort* pPort = pDevice->GetPort(PortId);
944            if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");
945    
946            // get desired port parameter
947            std::map<String,DeviceCreationParameter*> parameters = pPort->DeviceParameters();
948            if (!parameters[ParameterName]) throw LinuxSamplerException("Midi port does not provice a parameters '" + ParameterName + "'.");
949            DeviceCreationParameter* pParameter = parameters[ParameterName];
950    
951            // return all fields of this audio channel parameter
952            result.Add("TYPE",         pParameter->Type());
953            result.Add("DESCRIPTION",  pParameter->Description());
954            result.Add("FIX",          pParameter->Fix());
955            result.Add("MULTIPLICITY", pParameter->Multiplicity());
956            if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());
957            if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());
958            if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());
959        }
960        catch (LinuxSamplerException e) {
961            result.Error(e);
962        }
963        return result.Produce();
964    }
965    
966  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {
967      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()));
968      LSCPResultSet result;      LSCPResultSet result;
# Line 1043  String LSCPServer::SetAudioOutputType(St Line 1110  String LSCPServer::SetAudioOutputType(St
1110          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1111          // Driver type name aliasing...          // Driver type name aliasing...
1112          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";
1113          if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";                  if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";
1114          // Check if there's one audio output device already created          // Check if there's one audio output device already created
1115          // for the intended audio driver type (AudioOutputDriver)...          // for the intended audio driver type (AudioOutputDriver)...
1116          AudioOutputDevice *pDevice = NULL;          AudioOutputDevice *pDevice = NULL;
# Line 1217  String LSCPServer::ResetChannel(uint uiS Line 1284  String LSCPServer::ResetChannel(uint uiS
1284  }  }
1285    
1286  /**  /**
1287     * Will be called by the parser to reset the whole sampler.
1288     */
1289    String LSCPServer::ResetSampler() {
1290        dmsg(2,("LSCPServer: ResetSampler()\n"));
1291        pSampler->Reset();
1292        LSCPResultSet result;
1293        return result.Produce();
1294    }
1295    
1296    /**
1297   * 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
1298   * server for receiving event messages.   * server for receiving event messages.
1299   */   */
# Line 1242  String LSCPServer::UnsubscribeNotificati Line 1319  String LSCPServer::UnsubscribeNotificati
1319      return result.Produce();      return result.Produce();
1320  }  }
1321    
1322    /**
1323     * Will be called by the parser to enable or disable echo mode; if echo
1324     * mode is enabled, all commands from the client will (immediately) be
1325     * echoed back to the client.
1326     */
1327    String LSCPServer::SetEcho(yyparse_param_t* pSession, double boolean_value) {
1328        dmsg(2,("LSCPServer: SetEcho(val=%f)\n", boolean_value));
1329        LSCPResultSet result;
1330        try {
1331            if      (boolean_value == 0) pSession->bVerbose = false;
1332            else if (boolean_value == 1) pSession->bVerbose = true;
1333            else throw LinuxSamplerException("Not a boolean value, must either be 0 or 1");
1334        }
1335        catch (LinuxSamplerException e) {
1336             result.Error(e);
1337        }
1338        return result.Produce();
1339    }
1340    
1341  // Instrument loader constructor.  // Instrument loader constructor.
1342  LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)  LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)
Legend:
Removed from v.170  
changed lines
  Added in v.212
  ViewVC Help
Powered by ViewVC