/[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 155 by senkov, Mon Jun 28 04:30:11 2004 UTC revision 221 by schoenebeck, Fri Aug 20 17:25:19 2004 UTC
# Line 22  Line 22 
22    
23  #include "lscpserver.h"  #include "lscpserver.h"
24  #include "lscpresultset.h"  #include "lscpresultset.h"
25    #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.
33     * The big assumption here is that LSCPServer is going to remain a singleton.
34     * These members are used to support client connections.
35     * Class handles multiple connections at the same time using select() and non-blocking recv()
36     * Commands are processed by a single LSCPServer thread.
37     * Notifications are delivered either by the thread that originated them
38     * or (if the resultset is currently in progress) by the LSCPServer thread
39     * after the resultset was sent out.
40     * This makes sure that resultsets can not be interrupted by notifications.
41     * This also makes sure that the thread sending notification is not blocked
42     * by the LSCPServer thread.
43     */
44    fd_set LSCPServer::fdSet;
45    int LSCPServer::currentSocket = -1;
46    std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();
47    std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();
48    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> >();
50    Mutex LSCPServer::NotifyMutex = Mutex();
51    Mutex LSCPServer::NotifyBufferMutex = Mutex();
52    Mutex LSCPServer::SubscriptionMutex = Mutex();
53    
54  LSCPServer::LSCPServer(Sampler* pSampler) : Thread(false, 0, -4) {  LSCPServer::LSCPServer(Sampler* pSampler) : Thread(false, 0, -4) {
55      this->pSampler = pSampler;      this->pSampler = pSampler;
56        LSCPEvent::RegisterEvent(LSCPEvent::event_channels, "CHANNELS");
57        LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT");
58        LSCPEvent::RegisterEvent(LSCPEvent::event_stream_count, "STREAM_COUNT");
59        LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL");
60        LSCPEvent::RegisterEvent(LSCPEvent::event_info, "INFO");
61        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      hSocket = socket(AF_INET, SOCK_STREAM, 0);      int hSocket = socket(AF_INET, SOCK_STREAM, 0);
80      if (hSocket < 0) {      if (hSocket < 0) {
81          std::cerr << "LSCPServer: Could not create server socket." << std::endl;          std::cerr << "LSCPServer: Could not create server socket." << std::endl;
82          //return -1;          //return -1;
# Line 51  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);
103        FD_ZERO(&fdSet);
104        FD_SET(hSocket, &fdSet);
105        int maxSessions = hSocket;
106    
107      while (true) {      while (true) {
108          hSession = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);          fd_set selectSet = fdSet;
109          if (hSession < 0) {          int retval = select(maxSessions+1, &selectSet, NULL, NULL, NULL);
110              std::cerr << "LSCPServer: Client connection failed." << std::endl;          if (retval == 0)
111              close(hSocket);                  continue; //Nothing try again
112              //return -1;          if (retval == -1) {
113              exit(EXIT_FAILURE);                  std::cerr << "LSCPServer: Socket select error." << std::endl;
114          }                  close(hSocket);
115                    exit(EXIT_FAILURE);
116          dmsg(1,("LSCPServer: Client connection established.\n"));          }
         //send(hSession, "Welcome!\r\n", 10, 0);  
   
         // Parser invocation  
         yyparse_param_t yyparse_param;  
         yyparse_param.pServer = this;  
         yylex_init(&yyparse_param.pScanner);  
         while (yyparse(&yyparse_param) == LSCP_SYNTAX_ERROR); // recall parser in case of syntax error  
         yylex_destroy(yyparse_param.pScanner);  
117    
118          close(hSession);          //Accept new connections now (if any)
119          dmsg(1,("LSCPServer: Client connection terminated.\n"));          if (FD_ISSET(hSocket, &selectSet)) {
120                    int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);
121                    if (socket < 0) {
122                            std::cerr << "LSCPServer: Client connection failed." << std::endl;
123                            exit(EXIT_FAILURE);
124                    }
125    
126                    if (fcntl(socket, F_SETFL, O_NONBLOCK)) {
127                            std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;
128                            exit(EXIT_FAILURE);
129                    }
130    
131                    // 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);
138                    if (socket > maxSessions)
139                            maxSessions = socket;
140                    dmsg(1,("LSCPServer: Client connection established on socket:%d.\n", socket));
141                    LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection established on socket", socket));
142                    continue; //Maybe this was the only selected socket, better select again
143            }
144    
145            //Something was selected and it was not the hSocket, so it must be some command(s) coming.
146            for (std::vector<yyparse_param_t>::iterator iter = Sessions.begin(); iter != Sessions.end(); iter++) {
147                    if (FD_ISSET((*iter).hSession, &selectSet)) {   //Was it this socket?
148                            if (GetLSCPCommand(iter)) {     //Have we read the entire command?
149                                    dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));
150                                    int dummy; // just a temporary hack to fulfill the restart() function prototype
151                                    restart(NULL, dummy); // restart the 'scanner'
152                                    currentSocket = (*iter).hSession;  //a hack
153                                    if ((*iter).bVerbose) { // if echo mode enabled
154                                        AnswerClient(bufferedCommands[currentSocket]);
155                                    }
156                                    int result = yyparse(&(*iter));
157                                    currentSocket = -1;     //continuation of a hack
158                                    dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
159                                    if (result == LSCP_QUIT) { //Was it a quit command by any chance?
160                                            CloseConnection(iter);
161                                    }
162                            }
163                            //socket may have been closed, iter may be invalid, get out of the loop for now.
164                            //we'll be back if there is data.
165                            break;
166                    }
167            }
168    
169            //Now let's deliver late notifies (if any)
170            NotifyBufferMutex.Lock();
171            for (std::map<int,String>::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) {
172                    send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), 0);
173                    bufferedNotifies.erase(iterNotify);
174            }
175            NotifyBufferMutex.Unlock();
176      }      }
177  }  }
178    
179    void LSCPServer::CloseConnection( std::vector<yyparse_param_t>::iterator iter ) {
180            int socket = (*iter).hSession;
181            dmsg(1,("LSCPServer: Client connection terminated on socket:%d.\n",socket));
182            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));
183            Sessions.erase(iter);
184            FD_CLR(socket,  &fdSet);
185            SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)
186            for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {
187                    iter->second.remove(socket);
188            }
189            SubscriptionMutex.Unlock();
190            NotifyMutex.Lock();
191            bufferedCommands.erase(socket);
192            bufferedNotifies.erase(socket);
193            close(socket);
194            NotifyMutex.Unlock();
195    }
196    
197    void LSCPServer::SendLSCPNotify( LSCPEvent event ) {
198            SubscriptionMutex.Lock();
199            if (eventSubscriptions.count(event.GetType()) == 0) {
200                    SubscriptionMutex.Unlock();     //Nobody is subscribed to this event
201                    return;
202            }
203            std::list<int>::iterator iter = eventSubscriptions[event.GetType()].begin();
204            std::list<int>::iterator end = eventSubscriptions[event.GetType()].end();
205            String notify = event.Produce();
206    
207            while (true) {
208                    if (NotifyMutex.Trylock()) {
209                            for(;iter != end; iter++)
210                                    send(*iter, notify.c_str(), notify.size(), 0);
211                            NotifyMutex.Unlock();
212                            break;
213                    } else {
214                            if (NotifyBufferMutex.Trylock()) {
215                                    for(;iter != end; iter++)
216                                            bufferedNotifies[*iter] += notify;
217                                    NotifyBufferMutex.Unlock();
218                                    break;
219                            }
220                    }
221            }
222            SubscriptionMutex.Unlock();
223    }
224    
225    extern int GetLSCPCommand( void *buf, int max_size ) {
226            String command = LSCPServer::bufferedCommands[LSCPServer::currentSocket];
227            if (command.size() == 0) {              //Parser wants input but we have nothing.
228                    strcpy((char*) buf, "\n");      //So give it an empty command
229                    return 1;                       //to keep it happy.
230            }
231    
232            if (max_size < command.size()) {
233                    std::cerr << "getLSCPCommand: Flex buffer too small, ignoring the command." << std::endl;
234                    return 0;       //This will never happen
235            }
236    
237            strcpy((char*) buf, command.c_str());
238            LSCPServer::bufferedCommands.erase(LSCPServer::currentSocket);
239            return command.size();
240    }
241    
242    /**
243     * Will be called to try to read the command from the socket
244     * If command is read, it will return true. Otherwise false is returned.
245     * In any case the received portion (complete or incomplete) is saved into bufferedCommand map.
246     */
247    bool LSCPServer::GetLSCPCommand( std::vector<yyparse_param_t>::iterator iter ) {
248            int socket = (*iter).hSession;
249            char c;
250            int i = 0;
251            while (true) {
252                    int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now
253                    if (result == 0) { //socket was selected, so 0 here means client has closed the connection
254                            CloseConnection(iter);
255                            break;
256                    }
257                    if (result == 1) {
258                            if (c == '\r')
259                                    continue; //Ignore CR
260                            if (c == '\n') {
261                                    LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));
262                                    bufferedCommands[socket] += "\n";
263                                    return true; //Complete command was read
264                            }
265                            bufferedCommands[socket] += c;
266                    }
267                    if (result == -1) {
268                            if (errno == EAGAIN) //Would block, try again later.
269                                    return false;
270                            switch(errno) {
271                                    case EBADF:
272                                            dmsg(2,("LSCPScanner: The argument s is an invalid descriptor.\n"));
273                                            break;
274                                    case ECONNREFUSED:
275                                            dmsg(2,("LSCPScanner: A remote host refused to allow the network connection (typically because it is not running the requested service).\n"));
276                                            break;
277                                    case ENOTCONN:
278                                            dmsg(2,("LSCPScanner: The socket is associated with a connection-oriented protocol and has not been connected (see connect(2) and accept(2)).\n"));
279                                            break;
280                                    case ENOTSOCK:
281                                            dmsg(2,("LSCPScanner: The argument s does not refer to a socket.\n"));
282                                            break;
283                                    case EAGAIN:
284                                            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"));
285                                            break;
286                                    case EINTR:
287                                            dmsg(2,("LSCPScanner: The receive was interrupted by delivery of a signal before any data were available.\n"));
288                                            break;
289                                    case EFAULT:
290                                            dmsg(2,("LSCPScanner: The receive buffer pointer(s) point outside the process's address space.\n"));
291                                            break;
292                                    case EINVAL:
293                                            dmsg(2,("LSCPScanner: Invalid argument passed.\n"));
294                                            break;
295                                    case ENOMEM:
296                                            dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));
297                                            break;
298                                    default:
299                                            dmsg(2,("LSCPScanner: Unknown recv() error.\n"));
300                                            break;
301                            }
302                            CloseConnection(iter);
303                            break;
304                    }
305            }
306            return false;
307    }
308    
309  /**  /**
310   * Will be called by the parser whenever it wants to send an answer to the   * Will be called by the parser whenever it wants to send an answer to the
311   * client / frontend.   * client / frontend.
# Line 88  int LSCPServer::Main() { Line 314  int LSCPServer::Main() {
314   */   */
315  void LSCPServer::AnswerClient(String ReturnMessage) {  void LSCPServer::AnswerClient(String ReturnMessage) {
316      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));
317      send(hSession, ReturnMessage.c_str(), ReturnMessage.size(), 0);      if (currentSocket != -1) {
318                NotifyMutex.Lock();
319                send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), 0);
320                NotifyMutex.Unlock();
321        }
322  }  }
323    
324  /**  /**
# Line 241  String LSCPServer::GetChannels() { Line 471  String LSCPServer::GetChannels() {
471  }  }
472    
473  /**  /**
474     * Will be called by the parser to get the list of sampler channels.
475     */
476    String LSCPServer::ListChannels() {
477        dmsg(2,("LSCPServer: ListChannels()\n"));
478        String list;
479        std::map<uint,SamplerChannel*> channels = pSampler->GetSamplerChannels();
480        std::map<uint,SamplerChannel*>::iterator iter = channels.begin();
481        for (; iter != channels.end(); iter++) {
482            if (list != "") list += ",";
483            list += ToString(iter->first);
484        }
485        LSCPResultSet result;
486        result.Add(list);
487        return result.Produce();
488    }
489    
490    /**
491   * Will be called by the parser to add a sampler channel.   * Will be called by the parser to add a sampler channel.
492   */   */
493  String LSCPServer::AddChannel() {  String LSCPServer::AddChannel() {
# Line 326  String LSCPServer::GetChannelInfo(uint u Line 573  String LSCPServer::GetChannelInfo(uint u
573          result.Add("AUDIO_OUTPUT_CHANNELS", "2");          result.Add("AUDIO_OUTPUT_CHANNELS", "2");
574          result.Add("AUDIO_OUTPUT_ROUTING", "0,1");          result.Add("AUDIO_OUTPUT_ROUTING", "0,1");
575    
576            result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice()));
577            result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());
578            result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
579    
580          result.Add("INSTRUMENT_FILE", InstrumentFileName);          result.Add("INSTRUMENT_FILE", InstrumentFileName);
581          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
582          result.Add("INSTRUMENT_STATUS", InstrumentStatus);          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
   
         MidiInputDevice *pDevice = pSamplerChannel->GetMidiInputDevice();  
         if (pDevice) {  
                 result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pDevice));  
                 MidiInputDevice::MidiInputPort *pPort = pSamplerChannel->GetMidiInputPort();  
                 if (pPort) {  
                         result.Add("MIDI_INPUT_PORT", (int)pPort->GetPortNumber());  
                         result.Add("MIDI_INPUT_CHANNEL", (int)pSamplerChannel->GetMidiInputChannel());  
                 }  
   
         }  
583      }      }
584      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
585           result.Error(e);           result.Error(e);
# Line 501  String LSCPServer::GetMidiInputDriverPar Line 741  String LSCPServer::GetMidiInputDriverPar
741          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);
742          result.Add("TYPE",         pParameter->Type());          result.Add("TYPE",         pParameter->Type());
743          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
744          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    (pParameter->Mandatory())    ? "true" : "false");
745          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          (pParameter->Fix())          ? "true" : "false");
746          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", (pParameter->Multiplicity()) ? "true" : "false");
747          if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());          if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());
748          if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());          if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());
749          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
750          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
751          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
752      }      }
753      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
754          result.Error(e);          result.Error(e);
# Line 523  String LSCPServer::GetAudioOutputDriverP Line 763  String LSCPServer::GetAudioOutputDriverP
763          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);
764          result.Add("TYPE",         pParameter->Type());          result.Add("TYPE",         pParameter->Type());
765          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
766          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    (pParameter->Mandatory())    ? "true" : "false");
767          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          (pParameter->Fix())          ? "true" : "false");
768          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", (pParameter->Multiplicity()) ? "true" : "false");
769          if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());          if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());
770          if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());          if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());
771          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
772          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
773          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
774      }      }
775      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
776          result.Error(e);          result.Error(e);
# Line 609  String LSCPServer::GetAudioOutputDeviceI Line 849  String LSCPServer::GetAudioOutputDeviceI
849          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
850          if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");          if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
851          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
852          result.Add("driver", pDevice->Driver());          result.Add("DRIVER", pDevice->Driver());
853          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
854          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
855          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 628  String LSCPServer::GetMidiInputDeviceInf Line 868  String LSCPServer::GetMidiInputDeviceInf
868      try {      try {
869          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
870          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
871          if (!pDevice) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceIndex) + ".");          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
872          result.Add("driver", pDevice->Driver());          result.Add("DRIVER", pDevice->Driver());
873          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
874          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
875          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 647  String LSCPServer::GetMidiInputPortInfo( Line 887  String LSCPServer::GetMidiInputPortInfo(
887      try {      try {
888          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
889          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
890          if (!pDevice) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceIndex) + ".");          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
891          MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);          MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
892          if (!pMidiInputPort) throw LinuxSamplerException("There is no midi input port with index " + ToString(PortIndex) + ".");          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
893          std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
894          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceRuntimeParameter*>::iterator iter = parameters.begin();
895          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
896              result.Add(iter->first, iter->second->Value());              result.Add(iter->first, iter->second->Value());
897          }          }
# Line 688  String LSCPServer::GetAudioOutputChannel Line 928  String LSCPServer::GetAudioOutputChannel
928      return result.Produce();      return result.Produce();
929  }  }
930    
931    String LSCPServer::GetMidiInputPortParameterInfo(uint DeviceId, uint PortId, String ParameterName) {
932        dmsg(2,("LSCPServer: GetMidiInputPortParameterInfo(DeviceId=%d,PortId=%d,ParameterName=%s)\n",DeviceId,PortId,ParameterName.c_str()));
933        LSCPResultSet result;
934        try {
935            // get audio output device
936            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
937            if (!devices[DeviceId]) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");
938            MidiInputDevice* pDevice = devices[DeviceId];
939    
940            // get midi port
941            MidiInputPort* pPort = pDevice->GetPort(PortId);
942            if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");
943    
944            // get desired port parameter
945            std::map<String,DeviceRuntimeParameter*> parameters = pPort->PortParameters();
946            if (!parameters[ParameterName]) throw LinuxSamplerException("Midi port does not provice a parameters '" + ParameterName + "'.");
947            DeviceRuntimeParameter* pParameter = parameters[ParameterName];
948    
949            // return all fields of this audio channel parameter
950            result.Add("TYPE",         pParameter->Type());
951            result.Add("DESCRIPTION",  pParameter->Description());
952            result.Add("FIX",          pParameter->Fix());
953            result.Add("MULTIPLICITY", pParameter->Multiplicity());
954            if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());
955            if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());
956            if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());
957        }
958        catch (LinuxSamplerException e) {
959            result.Error(e);
960        }
961        return result.Produce();
962    }
963    
964  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {
965      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()));
966      LSCPResultSet result;      LSCPResultSet result;
# Line 770  String LSCPServer::SetMidiInputDevicePar Line 1043  String LSCPServer::SetMidiInputDevicePar
1043      LSCPResultSet result;      LSCPResultSet result;
1044      try {      try {
1045          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1046          if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceIndex) + ".");          if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1047          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
1048          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1049          if (!parameters[ParamKey]) throw LinuxSamplerException("Midi input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");          if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
1050          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1051      }      }
1052      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 788  String LSCPServer::SetMidiInputPortParam Line 1061  String LSCPServer::SetMidiInputPortParam
1061      try {      try {
1062          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1063          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
1064          if (!pDevice) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceIndex) + ".");          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1065          MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);          MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
1066          if (!pMidiInputPort) throw LinuxSamplerException("There is no midi input port with index " + ToString(PortIndex) + ".");          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
1067          std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
1068          if (!parameters[ParamKey]) throw LinuxSamplerException("Midi input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");          if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
1069          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1070      }      }
1071      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 810  String LSCPServer::SetAudioOutputChannel Line 1083  String LSCPServer::SetAudioOutputChannel
1083      return "ERR:0:Not implemented yet.\r\n"; //FIXME: Add support for this in resultset class?      return "ERR:0:Not implemented yet.\r\n"; //FIXME: Add support for this in resultset class?
1084  }  }
1085    
1086    String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {
1087        dmsg(2,("LSCPServer: SetAudiotOutputDevice(AudioDeviceId=%d, SamplerChannel=%d)\n",AudioDeviceId,uiSamplerChannel));
1088        LSCPResultSet result;
1089        try {
1090            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1091            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1092            std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1093            AudioOutputDevice* pDevice = devices[AudioDeviceId];
1094            if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));
1095            pSamplerChannel->SetAudioOutputDevice(pDevice);
1096        }
1097        catch (LinuxSamplerException e) {
1098             result.Error(e);
1099        }
1100        return result.Produce();
1101    }
1102    
1103  String LSCPServer::SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel) {
1104      dmsg(2,("LSCPServer: SetAudioOutputType(String AudioOutputDriver=%s, SamplerChannel=%d)\n",AudioOutputDriver.c_str(),uiSamplerChannel));      dmsg(2,("LSCPServer: SetAudioOutputType(String AudioOutputDriver=%s, SamplerChannel=%d)\n",AudioOutputDriver.c_str(),uiSamplerChannel));
1105      LSCPResultSet result;      LSCPResultSet result;
# Line 818  String LSCPServer::SetAudioOutputType(St Line 1108  String LSCPServer::SetAudioOutputType(St
1108          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1109          // Driver type name aliasing...          // Driver type name aliasing...
1110          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";
1111          if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";                  if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";
1112          // Check if there's one audio output device already created          // Check if there's one audio output device already created
1113          // for the intended audio driver type (AudioOutputDriver)...          // for the intended audio driver type (AudioOutputDriver)...
1114          AudioOutputDevice *pDevice = NULL;          AudioOutputDevice *pDevice = NULL;
# Line 847  String LSCPServer::SetAudioOutputType(St Line 1137  String LSCPServer::SetAudioOutputType(St
1137      return result.Produce();      return result.Produce();
1138  }  }
1139    
1140  String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) {  String LSCPServer::SetMIDIInputPort(uint MIDIPort, uint uiSamplerChannel) {
1141      dmsg(2,("LSCPServer: SetMIDIInputType(String MidiInputDriver=%s, SamplerChannel=%d)\n",MidiInputDriver.c_str(),uiSamplerChannel));      dmsg(2,("LSCPServer: SetMIDIInputPort(MIDIPort=%d, SamplerChannel=%d)\n",MIDIPort,uiSamplerChannel));
1142      LSCPResultSet result;      LSCPResultSet result;
1143      try {      try {
 #if 1  
         throw LinuxSamplerException("Command deprecated");  
 #else  
1144          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1145          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1146          // FIXME: workaround until MIDI driver configuration is implemented (using a Factory class for the MIDI input drivers then, like its already done for audio output drivers)          pSamplerChannel->SetMidiInputPort(MIDIPort);
         if (MidiInputDriver == "ALSA") MidiInputDriver = "Alsa";  
         if (MidiInputDriver != "Alsa") throw LinuxSamplerException("Unknown MIDI input driver '" + MidiInputDriver + "'.");  
         MidiInputDevice::type_t MidiInputType = MidiInputDevice::type_alsa;  
         pSamplerChannel->SetMidiInputDevice(MidiInputType);  
 #endif  
1147      }      }
1148      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1149           result.Error(e);           result.Error(e);
# Line 869  String LSCPServer::SetMIDIInputType(Stri Line 1151  String LSCPServer::SetMIDIInputType(Stri
1151      return result.Produce();      return result.Produce();
1152  }  }
1153    
1154  /**  String LSCPServer::SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel) {
1155   * Will be called by the parser to change the MIDI input device, port and channel on which      dmsg(2,("LSCPServer: SetMIDIInputChannel(MIDIChannel=%d, SamplerChannel=%d)\n",MIDIChannel,uiSamplerChannel));
  * engine of a particular sampler channel should listen to.  
  */  
 String LSCPServer::SetMIDIInput(uint MIDIDevice, uint MIDIPort, uint MIDIChannel, uint uiSamplerChannel) {  
     dmsg(2,("LSCPServer: SetMIDIInput(MIDIDevice=%d, MIDIPort=%d, MIDIChannel=%d, SamplerChannel=%d)\n", MIDIDevice, MIDIPort, MIDIChannel, uiSamplerChannel));  
1156      LSCPResultSet result;      LSCPResultSet result;
1157      try {      try {
1158          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1159          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1160          std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();          pSamplerChannel->SetMidiInputChannel((MidiInputPort::midi_chan_t) MIDIChannel);
         MidiInputDevice* pDevice = devices[MIDIDevice];  
         if (!pDevice) throw LinuxSamplerException("There is no midi input device with index " + ToString(MIDIDevice));  
         pSamplerChannel->SetMidiInputPort(pDevice, MIDIPort, (MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);  
1161      }      }
1162      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1163           result.Error(e);           result.Error(e);
# Line 890  String LSCPServer::SetMIDIInput(uint MID Line 1165  String LSCPServer::SetMIDIInput(uint MID
1165      return result.Produce();      return result.Produce();
1166  }  }
1167    
1168  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {  String LSCPServer::SetMIDIInputDevice(uint MIDIDeviceId, uint uiSamplerChannel) {
1169        dmsg(2,("LSCPServer: SetMIDIInputDevice(MIDIDeviceId=%d, SamplerChannel=%d)\n",MIDIDeviceId,uiSamplerChannel));
1170      LSCPResultSet result;      LSCPResultSet result;
1171      try {      try {
1172          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1173          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1174          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1175          AudioOutputDevice* pDevice = devices[AudioDeviceId];          MidiInputDevice* pDevice = devices[MIDIDeviceId];
1176          if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1177          pSamplerChannel->SetAudioOutputDevice(pDevice);          pSamplerChannel->SetMidiInputDevice(pDevice);
1178        }
1179        catch (LinuxSamplerException e) {
1180             result.Error(e);
1181        }
1182        return result.Produce();
1183    }
1184    
1185    String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) {
1186        dmsg(2,("LSCPServer: SetMIDIInputType(String MidiInputDriver=%s, SamplerChannel=%d)\n",MidiInputDriver.c_str(),uiSamplerChannel));
1187        LSCPResultSet result;
1188        try {
1189            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1190            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1191            // Driver type name aliasing...
1192            if (MidiInputDriver == "ALSA") MidiInputDriver = "Alsa";
1193            // Check if there's one MIDI input device already created
1194            // for the intended MIDI driver type (MidiInputDriver)...
1195            MidiInputDevice *pDevice = NULL;
1196            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1197            std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
1198            for (; iter != devices.end(); iter++) {
1199                if ((iter->second)->Driver() == MidiInputDriver) {
1200                    pDevice = iter->second;
1201                    break;
1202                }
1203            }
1204            // If it doesn't exist, create a new one with default parameters...
1205            if (pDevice == NULL) {
1206                std::map<String,String> params;
1207                pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);
1208                // Make it with at least one initial port.
1209                std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1210                parameters["PORTS"]->SetValue("1");
1211            }
1212            // Must have a device...
1213            if (pDevice == NULL)
1214                throw LinuxSamplerException("Internal error: could not create MIDI input device.");
1215            // Set it as the current channel device...
1216            pSamplerChannel->SetMidiInputDevice(pDevice);
1217        }
1218        catch (LinuxSamplerException e) {
1219             result.Error(e);
1220        }
1221        return result.Produce();
1222    }
1223    
1224    /**
1225     * Will be called by the parser to change the MIDI input device, port and channel on which
1226     * engine of a particular sampler channel should listen to.
1227     */
1228    String LSCPServer::SetMIDIInput(uint MIDIDeviceId, uint MIDIPort, uint MIDIChannel, uint uiSamplerChannel) {
1229        dmsg(2,("LSCPServer: SetMIDIInput(MIDIDeviceId=%d, MIDIPort=%d, MIDIChannel=%d, SamplerChannel=%d)\n", MIDIDeviceId, MIDIPort, MIDIChannel, uiSamplerChannel));
1230        LSCPResultSet result;
1231        try {
1232            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1233            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1234            std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();
1235            MidiInputDevice* pDevice = devices[MIDIDeviceId];
1236            if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1237            pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputPort::midi_chan_t) MIDIChannel);
1238      }      }
1239      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1240           result.Error(e);           result.Error(e);
# Line 946  String LSCPServer::ResetChannel(uint uiS Line 1282  String LSCPServer::ResetChannel(uint uiS
1282  }  }
1283    
1284  /**  /**
1285     * Will be called by the parser to reset the whole sampler.
1286     */
1287    String LSCPServer::ResetSampler() {
1288        dmsg(2,("LSCPServer: ResetSampler()\n"));
1289        pSampler->Reset();
1290        LSCPResultSet result;
1291        return result.Produce();
1292    }
1293    
1294    /**
1295   * 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
1296   * server for receiving event messages.   * server for receiving event messages.
1297   */   */
1298  String LSCPServer::SubscribeNotification(event_t Event) {  String LSCPServer::SubscribeNotification(LSCPEvent::event_t type) {
1299      dmsg(2,("LSCPServer: SubscribeNotification(Event=%d)\n", Event));      dmsg(2,("LSCPServer: SubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
1300      return "ERR:0:Not implemented yet.\r\n";      LSCPResultSet result;
1301        SubscriptionMutex.Lock();
1302        eventSubscriptions[type].push_back(currentSocket);
1303        SubscriptionMutex.Unlock();
1304        return result.Produce();
1305  }  }
1306    
1307  /**  /**
1308   * Will be called by the parser to unsubscribe a client on the server   * Will be called by the parser to unsubscribe a client on the server
1309   * for not receiving further event messages.   * for not receiving further event messages.
1310   */   */
1311  String LSCPServer::UnsubscribeNotification(event_t Event) {  String LSCPServer::UnsubscribeNotification(LSCPEvent::event_t type) {
1312      dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%d)\n", Event));      dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
1313      return "ERR:0:Not implemented yet.\r\n";      LSCPResultSet result;
1314        SubscriptionMutex.Lock();
1315        eventSubscriptions[type].remove(currentSocket);
1316        SubscriptionMutex.Unlock();
1317        return result.Produce();
1318  }  }
1319    
1320    /**
1321     * Will be called by the parser to enable or disable echo mode; if echo
1322     * mode is enabled, all commands from the client will (immediately) be
1323     * echoed back to the client.
1324     */
1325    String LSCPServer::SetEcho(yyparse_param_t* pSession, double boolean_value) {
1326        dmsg(2,("LSCPServer: SetEcho(val=%f)\n", boolean_value));
1327        LSCPResultSet result;
1328        try {
1329            if      (boolean_value == 0) pSession->bVerbose = false;
1330            else if (boolean_value == 1) pSession->bVerbose = true;
1331            else throw LinuxSamplerException("Not a boolean value, must either be 0 or 1");
1332        }
1333        catch (LinuxSamplerException e) {
1334             result.Error(e);
1335        }
1336        return result.Produce();
1337    }
1338    
1339  // Instrument loader constructor.  // Instrument loader constructor.
1340  LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)  LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)
Legend:
Removed from v.155  
changed lines
  Added in v.221
  ViewVC Help
Powered by ViewVC