/[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 133 by capela, Fri Jun 18 14:29:02 2004 UTC revision 226 by schoenebeck, Wed Aug 25 22:00:33 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 "../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 50  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 87  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    /**
325     * Find a created audio output device index.
326     */
327    int LSCPServer::GetAudioOutputDeviceIndex ( AudioOutputDevice *pDevice )
328    {
329        // Search for the created device to get its index
330        std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
331        std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
332        for (; iter != devices.end(); iter++) {
333            if (iter->second == pDevice)
334                return iter->first;
335        }
336        // Not found.
337        return -1;
338    }
339    
340    /**
341     * Find a created midi input device index.
342     */
343    int LSCPServer::GetMidiInputDeviceIndex ( MidiInputDevice *pDevice )
344    {
345        // Search for the created device to get its index
346        std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
347        std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
348        for (; iter != devices.end(); iter++) {
349            if (iter->second == pDevice)
350                return iter->first;
351        }
352        // Not found.
353        return -1;
354  }  }
355    
356  String LSCPServer::CreateAudioOutputDevice(String Driver, std::map<String,String> Parameters) {  String LSCPServer::CreateAudioOutputDevice(String Driver, std::map<String,String> Parameters) {
# Line 95  String LSCPServer::CreateAudioOutputDevi Line 358  String LSCPServer::CreateAudioOutputDevi
358      LSCPResultSet result;      LSCPResultSet result;
359      try {      try {
360          AudioOutputDevice* pDevice = pSampler->CreateAudioOutputDevice(Driver, Parameters);          AudioOutputDevice* pDevice = pSampler->CreateAudioOutputDevice(Driver, Parameters);
         std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();  
361          // search for the created device to get its index          // search for the created device to get its index
362          int index = -1;          int index = GetAudioOutputDeviceIndex(pDevice);
         std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();  
         for (; iter != devices.end(); iter++) {  
             if (iter->second == pDevice) {  
                 index = iter->first;  
                 break;  
             }  
         }  
363          if (index == -1) throw LinuxSamplerException("Internal error: could not find created audio output device.");          if (index == -1) throw LinuxSamplerException("Internal error: could not find created audio output device.");
364          result = index; // success          result = index; // success
365      }      }
# Line 114  String LSCPServer::CreateAudioOutputDevi Line 369  String LSCPServer::CreateAudioOutputDevi
369      return result.Produce();      return result.Produce();
370  }  }
371    
372    String LSCPServer::CreateMidiInputDevice(String Driver, std::map<String,String> Parameters) {
373        dmsg(2,("LSCPServer: CreateMidiInputDevice(Driver=%s)\n", Driver.c_str()));
374        LSCPResultSet result;
375        try {
376            MidiInputDevice* pDevice = pSampler->CreateMidiInputDevice(Driver, Parameters);
377            // search for the created device to get its index
378            int index = GetMidiInputDeviceIndex(pDevice);
379            if (index == -1) throw LinuxSamplerException("Internal error: could not find created midi input device.");
380            result = index; // success
381        }
382        catch (LinuxSamplerException e) {
383            result.Error(e);
384        }
385        return result.Produce();
386    }
387    
388  String LSCPServer::DestroyAudioOutputDevice(uint DeviceIndex) {  String LSCPServer::DestroyAudioOutputDevice(uint DeviceIndex) {
389      dmsg(2,("LSCPServer: DestroyAudioOutputDevice(DeviceIndex=%d)\n", DeviceIndex));      dmsg(2,("LSCPServer: DestroyAudioOutputDevice(DeviceIndex=%d)\n", DeviceIndex));
390      LSCPResultSet result;      LSCPResultSet result;
391      try {      try {
392          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
393          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) + ".");
394          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
395          pSampler->DestroyAudioOutputDevice(pDevice);          pSampler->DestroyAudioOutputDevice(pDevice);
396      }      }
# Line 129  String LSCPServer::DestroyAudioOutputDev Line 400  String LSCPServer::DestroyAudioOutputDev
400      return result.Produce();      return result.Produce();
401  }  }
402    
403    String LSCPServer::DestroyMidiInputDevice(uint DeviceIndex) {
404        dmsg(2,("LSCPServer: DestroyMidiInputDevice(DeviceIndex=%d)\n", DeviceIndex));
405        LSCPResultSet result;
406        try {
407            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
408            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
409            MidiInputDevice* pDevice = devices[DeviceIndex];
410            pSampler->DestroyMidiInputDevice(pDevice);
411        }
412        catch (LinuxSamplerException e) {
413            result.Error(e);
414        }
415        return result.Produce();
416    }
417    
418  /**  /**
419   * Will be called by the parser to load an instrument.   * Will be called by the parser to load an instrument.
420   */   */
421  String LSCPServer::LoadInstrument(String Filename, uint uiInstrument, uint uiSamplerChannel) {  String LSCPServer::LoadInstrument(String Filename, uint uiInstrument, uint uiSamplerChannel, bool bBackground) {
422      dmsg(2,("LSCPServer: LoadInstrument(Filename=%s,Instrument=%d,SamplerChannel=%d)\n", Filename.c_str(), uiInstrument, uiSamplerChannel));      dmsg(2,("LSCPServer: LoadInstrument(Filename=%s,Instrument=%d,SamplerChannel=%d)\n", Filename.c_str(), uiInstrument, uiSamplerChannel));
423      LSCPResultSet result;      LSCPResultSet result;
424      try {      try {
# Line 140  String LSCPServer::LoadInstrument(String Line 426  String LSCPServer::LoadInstrument(String
426          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
427          Engine* pEngine = pSamplerChannel->GetEngine();          Engine* pEngine = pSamplerChannel->GetEngine();
428          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
429          LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);          if (!pSamplerChannel->GetAudioOutputDevice())
430          pLoadInstrument->StartThread();              throw LinuxSamplerException("No audio output device on channel");
431            if (bBackground) {
432                LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);
433                pLoadInstrument->StartThread();
434            }
435            else pEngine->LoadInstrument(Filename.c_str(), uiInstrument);
436      }      }
437      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
438           result.Error(e);           result.Error(e);
# Line 180  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 217  String LSCPServer::GetEngineInfo(String Line 525  String LSCPServer::GetEngineInfo(String
525      try {      try {
526          if ((EngineName == "GigEngine") || (EngineName == "gig")) {          if ((EngineName == "GigEngine") || (EngineName == "gig")) {
527              Engine* pEngine = new LinuxSampler::gig::Engine;              Engine* pEngine = new LinuxSampler::gig::Engine;
528              result.Add(pEngine->Description());              result.Add("DESCRIPTION", pEngine->Description());
529              result.Add(pEngine->Version());              result.Add("VERSION",     pEngine->Version());
530              delete pEngine;              delete pEngine;
531          }          }
532          else throw LinuxSamplerException("Unknown engine type");          else throw LinuxSamplerException("Unknown engine type");
# Line 243  String LSCPServer::GetChannelInfo(uint u Line 551  String LSCPServer::GetChannelInfo(uint u
551    
552          //Defaults values          //Defaults values
553          String EngineName = "NONE";          String EngineName = "NONE";
554          float Volume = 0;          float Volume = 0.0f;
555          String InstrumentFileName = "NONE";          String InstrumentFileName = "NONE";
556          int InstrumentIndex = -1;          int InstrumentIndex = -1;
557          int InstrumentStatus = -1;          int InstrumentStatus = -1;
558            int AudioOutputChannels = 0;
559            String AudioRouting;
560    
561          if (pEngine) {          if (pEngine) {
562              EngineName =  pEngine->EngineName();              EngineName =  pEngine->EngineName();
563                AudioOutputChannels = pEngine->Channels();
564              Volume = pEngine->Volume();              Volume = pEngine->Volume();
565              InstrumentStatus = pEngine->InstrumentStatus();              InstrumentStatus = pEngine->InstrumentStatus();
566              InstrumentIndex = pEngine->InstrumentIndex();              InstrumentIndex = pEngine->InstrumentIndex();
567              if (InstrumentIndex != -1)              if (InstrumentIndex != -1)
568                  InstrumentFileName = pEngine->InstrumentFileName();                  InstrumentFileName = pEngine->InstrumentFileName();
569                for (int chan = 0; chan < pEngine->Channels(); chan++) {
570                    if (AudioRouting != "") AudioRouting += ",";
571                    AudioRouting += ToString(pEngine->OutputChannel(chan));
572                }
573          }          }
574    
575          result.Add("ENGINE_NAME", EngineName);          result.Add("ENGINE_NAME", EngineName);
576          result.Add("VOLUME", Volume);          result.Add("VOLUME", Volume);
577    
578          //Some hardcoded stuff for now to make GUI look good          //Some not-so-hardcoded stuff to make GUI look good
579          result.Add("AUDIO_OUTPUT_DEVICE", "0");          result.Add("AUDIO_OUTPUT_DEVICE", GetAudioOutputDeviceIndex(pSamplerChannel->GetAudioOutputDevice()));
580          result.Add("AUDIO_OUTPUT_CHANNELS", "2");          result.Add("AUDIO_OUTPUT_CHANNELS", AudioOutputChannels);
581          result.Add("AUDIO_OUTPUT_ROUTING", "0,1");          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);
582    
583            result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice()));
584            result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());
585            if (pSamplerChannel->GetMidiInputChannel()) result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
586            else                                        result.Add("MIDI_INPUT_CHANNEL", "ALL");
587    
588          result.Add("INSTRUMENT_FILE", InstrumentFileName);          result.Add("INSTRUMENT_FILE", InstrumentFileName);
589          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
590          result.Add("INSTRUMENT_STATUS", InstrumentStatus);          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
   
         //Some more hardcoded stuff for now to make GUI look good  
         result.Add("MIDI_INPUT_DEVICE", "0");  
         result.Add("MIDI_INPUT_PORT", "0");  
         result.Add("MIDI_INPUT_CHANNEL", "1");  
591      }      }
592      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
593           result.Error(e);           result.Error(e);
# Line 366  String LSCPServer::GetAvailableAudioOutp Line 681  String LSCPServer::GetAvailableAudioOutp
681      return result.Produce();      return result.Produce();
682  }  }
683    
684    String LSCPServer::GetAvailableMidiInputDrivers() {
685        dmsg(2,("LSCPServer: GetAvailableMidiInputDrivers()\n"));
686        LSCPResultSet result;
687        try {
688            String s = MidiInputDeviceFactory::AvailableDriversAsString();
689            result.Add(s);
690        }
691        catch (LinuxSamplerException e) {
692            result.Error(e);
693        }
694        return result.Produce();
695    }
696    
697    String LSCPServer::GetMidiInputDriverInfo(String Driver) {
698        dmsg(2,("LSCPServer: GetMidiInputDriverInfo(Driver=%s)\n",Driver.c_str()));
699        LSCPResultSet result;
700        try {
701            result.Add("DESCRIPTION", MidiInputDeviceFactory::GetDriverDescription(Driver));
702            result.Add("VERSION",     MidiInputDeviceFactory::GetDriverVersion(Driver));
703    
704            std::map<String,DeviceCreationParameter*> parameters = MidiInputDeviceFactory::GetAvailableDriverParameters(Driver);
705            if (parameters.size()) { // if there are parameters defined for this driver
706                String s;
707                std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
708                for (;iter != parameters.end(); iter++) {
709                    if (s != "") s += ",";
710                    s += iter->first;
711                }
712                result.Add("PARAMETERS", s);
713            }
714        }
715        catch (LinuxSamplerException e) {
716            result.Error(e);
717        }
718        return result.Produce();
719    }
720    
721  String LSCPServer::GetAudioOutputDriverInfo(String Driver) {  String LSCPServer::GetAudioOutputDriverInfo(String Driver) {
722      dmsg(2,("LSCPServer: GetAudioOutputDriverInfo(Driver=%s)\n",Driver.c_str()));      dmsg(2,("LSCPServer: GetAudioOutputDriverInfo(Driver=%s)\n",Driver.c_str()));
723      LSCPResultSet result;      LSCPResultSet result;
# Line 390  String LSCPServer::GetAudioOutputDriverI Line 742  String LSCPServer::GetAudioOutputDriverI
742      return result.Produce();      return result.Produce();
743  }  }
744    
745    String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
746        dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s,DependencyListSize=%d)\n",Driver.c_str(),Parameter.c_str(),DependencyList.size()));
747        LSCPResultSet result;
748        try {
749            DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);
750            result.Add("TYPE",         pParameter->Type());
751            result.Add("DESCRIPTION",  pParameter->Description());
752            result.Add("MANDATORY",    pParameter->Mandatory());
753            result.Add("FIX",          pParameter->Fix());
754            result.Add("MULTIPLICITY", pParameter->Multiplicity());
755            optional<String> oDepends       = pParameter->Depends();
756            optional<String> oDefault       = pParameter->Default(DependencyList);
757            optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
758            optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
759            optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
760            if (oDepends)       result.Add("DEPENDS",       *oDepends);
761            if (oDefault)       result.Add("DEFAULT",       *oDefault);
762            if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
763            if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
764            if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
765        }
766        catch (LinuxSamplerException e) {
767            result.Error(e);
768        }
769        return result.Produce();
770    }
771    
772  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
773      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()));
774      LSCPResultSet result;      LSCPResultSet result;
775      try {      try {
776          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);
# Line 400  String LSCPServer::GetAudioOutputDriverP Line 779  String LSCPServer::GetAudioOutputDriverP
779          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    pParameter->Mandatory());
780          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
781          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
782          if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());          optional<String> oDepends       = pParameter->Depends();
783          if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());          optional<String> oDefault       = pParameter->Default(DependencyList);
784          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
785          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
786          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
787            if (oDepends)       result.Add("DEPENDS",       *oDepends);
788            if (oDefault)       result.Add("DEFAULT",       *oDefault);
789            if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
790            if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
791            if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
792      }      }
793      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
794          result.Error(e);          result.Error(e);
# Line 417  String LSCPServer::GetAudioOutputDeviceC Line 801  String LSCPServer::GetAudioOutputDeviceC
801      LSCPResultSet result;      LSCPResultSet result;
802      try {      try {
803          uint count = pSampler->AudioOutputDevices();          uint count = pSampler->AudioOutputDevices();
804          result = count; // success          result.Add(count); // success
805        }
806        catch (LinuxSamplerException e) {
807            result.Error(e);
808        }
809        return result.Produce();
810    }
811    
812    String LSCPServer::GetMidiInputDeviceCount() {
813        dmsg(2,("LSCPServer: GetMidiInputDeviceCount()\n"));
814        LSCPResultSet result;
815        try {
816            uint count = pSampler->MidiInputDevices();
817            result.Add(count); // success
818      }      }
819      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
820          result.Error(e);          result.Error(e);
# Line 444  String LSCPServer::GetAudioOutputDevices Line 841  String LSCPServer::GetAudioOutputDevices
841      return result.Produce();      return result.Produce();
842  }  }
843    
844    String LSCPServer::GetMidiInputDevices() {
845        dmsg(2,("LSCPServer: GetMidiInputDevices()\n"));
846        LSCPResultSet result;
847        try {
848            String s;
849            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
850            std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
851            for (; iter != devices.end(); iter++) {
852                if (s != "") s += ",";
853                s += ToString(iter->first);
854            }
855            result.Add(s);
856        }
857        catch (LinuxSamplerException e) {
858            result.Error(e);
859        }
860        return result.Produce();
861    }
862    
863  String LSCPServer::GetAudioOutputDeviceInfo(uint DeviceIndex) {  String LSCPServer::GetAudioOutputDeviceInfo(uint DeviceIndex) {
864      dmsg(2,("LSCPServer: GetAudioOutputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));      dmsg(2,("LSCPServer: GetAudioOutputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));
865      LSCPResultSet result;      LSCPResultSet result;
866      try {      try {
867          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
868          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) + ".");
869          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
870            result.Add("DRIVER", pDevice->Driver());
871            std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
872            std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
873            for (; iter != parameters.end(); iter++) {
874                result.Add(iter->first, iter->second->Value());
875            }
876        }
877        catch (LinuxSamplerException e) {
878            result.Error(e);
879        }
880        return result.Produce();
881    }
882    
883    String LSCPServer::GetMidiInputDeviceInfo(uint DeviceIndex) {
884        dmsg(2,("LSCPServer: GetMidiInputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));
885        LSCPResultSet result;
886        try {
887            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
888            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
889            MidiInputDevice* pDevice = devices[DeviceIndex];
890            result.Add("DRIVER", pDevice->Driver());
891          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
892          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
893          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 462  String LSCPServer::GetAudioOutputDeviceI Line 899  String LSCPServer::GetAudioOutputDeviceI
899      }      }
900      return result.Produce();      return result.Produce();
901  }  }
902    String LSCPServer::GetMidiInputPortInfo(uint DeviceIndex, uint PortIndex) {
903        dmsg(2,("LSCPServer: GetMidiInputPortInfo(DeviceIndex=%d, PortIndex=%d)\n",DeviceIndex, PortIndex));
904        LSCPResultSet result;
905        try {
906            // get MIDI input device
907            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
908            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
909            MidiInputDevice* pDevice = devices[DeviceIndex];
910    
911            // get MIDI port
912            MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
913            if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
914    
915            // return the values of all MIDI port parameters
916            std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
917            std::map<String,DeviceRuntimeParameter*>::iterator iter = parameters.begin();
918            for (; iter != parameters.end(); iter++) {
919                result.Add(iter->first, iter->second->Value());
920            }
921        }
922        catch (LinuxSamplerException e) {
923            result.Error(e);
924        }
925        return result.Produce();
926    }
927    
928  String LSCPServer::GetAudioOutputChannelInfo(uint DeviceId, uint ChannelId) {  String LSCPServer::GetAudioOutputChannelInfo(uint DeviceId, uint ChannelId) {
929      dmsg(2,("LSCPServer: GetAudioOutputChannelInfo(DeviceId=%d,ChannelId)\n",DeviceId,ChannelId));      dmsg(2,("LSCPServer: GetAudioOutputChannelInfo(DeviceId=%d,ChannelId)\n",DeviceId,ChannelId));
# Line 469  String LSCPServer::GetAudioOutputChannel Line 931  String LSCPServer::GetAudioOutputChannel
931      try {      try {
932          // get audio output device          // get audio output device
933          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
934          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) + ".");
935          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
936    
937          // get audio channel          // get audio channel
# Line 489  String LSCPServer::GetAudioOutputChannel Line 951  String LSCPServer::GetAudioOutputChannel
951      return result.Produce();      return result.Produce();
952  }  }
953    
954    String LSCPServer::GetMidiInputPortParameterInfo(uint DeviceId, uint PortId, String ParameterName) {
955        dmsg(2,("LSCPServer: GetMidiInputPortParameterInfo(DeviceId=%d,PortId=%d,ParameterName=%s)\n",DeviceId,PortId,ParameterName.c_str()));
956        LSCPResultSet result;
957        try {
958            // get MIDI input device
959            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
960            if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");
961            MidiInputDevice* pDevice = devices[DeviceId];
962    
963            // get midi port
964            MidiInputPort* pPort = pDevice->GetPort(PortId);
965            if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");
966    
967            // get desired port parameter
968            std::map<String,DeviceRuntimeParameter*> parameters = pPort->PortParameters();
969            if (!parameters.count(ParameterName)) throw LinuxSamplerException("Midi port does not provide a parameter '" + ParameterName + "'.");
970            DeviceRuntimeParameter* pParameter = parameters[ParameterName];
971    
972            // return all fields of this audio channel parameter
973            result.Add("TYPE",         pParameter->Type());
974            result.Add("DESCRIPTION",  pParameter->Description());
975            result.Add("FIX",          pParameter->Fix());
976            result.Add("MULTIPLICITY", pParameter->Multiplicity());
977            if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
978            if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
979            if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
980        }
981        catch (LinuxSamplerException e) {
982            result.Error(e);
983        }
984        return result.Produce();
985    }
986    
987  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {
988      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()));
989      LSCPResultSet result;      LSCPResultSet result;
990      try {      try {
991          // get audio output device          // get audio output device
992          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
993          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) + ".");
994          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
995    
996          // get audio channel          // get audio channel
# Line 504  String LSCPServer::GetAudioOutputChannel Line 999  String LSCPServer::GetAudioOutputChannel
999    
1000          // get desired audio channel parameter          // get desired audio channel parameter
1001          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
1002          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 + "'.");
1003          DeviceRuntimeParameter* pParameter = parameters[ParameterName];          DeviceRuntimeParameter* pParameter = parameters[ParameterName];
1004    
1005          // return all fields of this audio channel parameter          // return all fields of this audio channel parameter
# Line 512  String LSCPServer::GetAudioOutputChannel Line 1007  String LSCPServer::GetAudioOutputChannel
1007          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
1008          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
1009          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
1010          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
1011          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
1012          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
1013      }      }
1014      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1015          result.Error(e);          result.Error(e);
# Line 528  String LSCPServer::SetAudioOutputChannel Line 1023  String LSCPServer::SetAudioOutputChannel
1023      try {      try {
1024          // get audio output device          // get audio output device
1025          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1026          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) + ".");
1027          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
1028    
1029          // get audio channel          // get audio channel
# Line 537  String LSCPServer::SetAudioOutputChannel Line 1032  String LSCPServer::SetAudioOutputChannel
1032    
1033          // get desired audio channel parameter          // get desired audio channel parameter
1034          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
1035          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 + "'.");
1036          DeviceRuntimeParameter* pParameter = parameters[ParamKey];          DeviceRuntimeParameter* pParameter = parameters[ParamKey];
1037    
1038          // set new channel parameter value          // set new channel parameter value
# Line 554  String LSCPServer::SetAudioOutputDeviceP Line 1049  String LSCPServer::SetAudioOutputDeviceP
1049      LSCPResultSet result;      LSCPResultSet result;
1050      try {      try {
1051          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1052          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) + ".");
1053          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
1054          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1055          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 + "'");
1056            parameters[ParamKey]->SetValue(ParamVal);
1057        }
1058        catch (LinuxSamplerException e) {
1059            result.Error(e);
1060        }
1061        return result.Produce();
1062    }
1063    
1064    String LSCPServer::SetMidiInputDeviceParameter(uint DeviceIndex, String ParamKey, String ParamVal) {
1065        dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
1066        LSCPResultSet result;
1067        try {
1068            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1069            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1070            MidiInputDevice* pDevice = devices[DeviceIndex];
1071            std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1072            if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
1073            parameters[ParamKey]->SetValue(ParamVal);
1074        }
1075        catch (LinuxSamplerException e) {
1076            result.Error(e);
1077        }
1078        return result.Produce();
1079    }
1080    
1081    String LSCPServer::SetMidiInputPortParameter(uint DeviceIndex, uint PortIndex, String ParamKey, String ParamVal) {
1082        dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
1083        LSCPResultSet result;
1084        try {
1085            // get MIDI input device
1086            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1087            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1088            MidiInputDevice* pDevice = devices[DeviceIndex];
1089    
1090            // get MIDI port
1091            MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
1092            if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
1093    
1094            // set port parameter value
1095            std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
1096            if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
1097          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1098      }      }
1099      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 572  String LSCPServer::SetAudioOutputDeviceP Line 1108  String LSCPServer::SetAudioOutputDeviceP
1108   */   */
1109  String LSCPServer::SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel) {
1110      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));
1111      return "ERR:0:Not implemented yet.\r\n"; //FIXME: Add support for this in resultset class?      LSCPResultSet result;
1112        try {
1113            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1114            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1115            Engine* pEngine = pSamplerChannel->GetEngine();
1116            if (!pEngine) throw LinuxSamplerException("No engine deployed on sampler channel " + ToString(uiSamplerChannel));
1117            pEngine->SetOutputChannel(ChannelAudioOutputChannel, AudioOutputDeviceInputChannel);
1118        }
1119        catch (LinuxSamplerException e) {
1120             result.Error(e);
1121        }
1122        return result.Produce();
1123  }  }
1124    
1125  String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {
1126      dmsg(2,("LSCPServer: SetMIDIInputType(String MidiInputDriver=%s, SamplerChannel=%d)\n",MidiInputDriver.c_str(),uiSamplerChannel));      dmsg(2,("LSCPServer: SetAudiotOutputDevice(AudioDeviceId=%d, SamplerChannel=%d)\n",AudioDeviceId,uiSamplerChannel));
1127      LSCPResultSet result;      LSCPResultSet result;
1128      try {      try {
1129          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1130          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1131          // FIXME: workaround until MIDI driver configuration is implemented (using a Factory class for the MIDI input drivers then, like its already done for audio output drivers)          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1132          if (MidiInputDriver != "ALSA") throw LinuxSamplerException("Unknown MIDI input driver '" + MidiInputDriver + "'.");          if (!devices.count(AudioDeviceId)) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));
1133          MidiInputDevice::type_t MidiInputType = MidiInputDevice::type_alsa;          AudioOutputDevice* pDevice = devices[AudioDeviceId];
1134          pSamplerChannel->SetMidiInputDevice(MidiInputType);          pSamplerChannel->SetAudioOutputDevice(pDevice);
1135      }      }
1136      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1137           result.Error(e);           result.Error(e);
# Line 592  String LSCPServer::SetMIDIInputType(Stri Line 1139  String LSCPServer::SetMIDIInputType(Stri
1139      return result.Produce();      return result.Produce();
1140  }  }
1141    
1142  /**  String LSCPServer::SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel) {
1143   * Will be called by the parser to change the MIDI input port on which the      dmsg(2,("LSCPServer: SetAudioOutputType(String AudioOutputDriver=%s, SamplerChannel=%d)\n",AudioOutputDriver.c_str(),uiSamplerChannel));
  * engine of a particular sampler channel should listen to.  
  */  
 String LSCPServer::SetMIDIInputPort(String MIDIInputPort, uint uiSamplerChannel) {  
     dmsg(2,("LSCPServer: SetMIDIInputPort(MIDIInputPort=%s, Samplerchannel=%d)\n", MIDIInputPort.c_str(), uiSamplerChannel));  
1144      LSCPResultSet result;      LSCPResultSet result;
1145      try {      try {
1146          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1147          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1148          if (!pSamplerChannel->GetMidiInputDevice()) throw LinuxSamplerException("No MIDI input device connected yet");          // Driver type name aliasing...
1149          pSamplerChannel->GetMidiInputDevice()->SetInputPort(MIDIInputPort.c_str());          if (AudioOutputDriver == "Alsa") AudioOutputDriver = "ALSA";
1150            if (AudioOutputDriver == "Jack") AudioOutputDriver = "JACK";
1151            // Check if there's one audio output device already created
1152            // for the intended audio driver type (AudioOutputDriver)...
1153            AudioOutputDevice *pDevice = NULL;
1154            std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1155            std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
1156            for (; iter != devices.end(); iter++) {
1157                if ((iter->second)->Driver() == AudioOutputDriver) {
1158                    pDevice = iter->second;
1159                    break;
1160                }
1161            }
1162            // If it doesn't exist, create a new one with default parameters...
1163            if (pDevice == NULL) {
1164                std::map<String,String> params;
1165                pDevice = pSampler->CreateAudioOutputDevice(AudioOutputDriver, params);
1166            }
1167            // Must have a device...
1168            if (pDevice == NULL)
1169                throw LinuxSamplerException("Internal error: could not create audio output device.");
1170            // Set it as the current channel device...
1171            pSamplerChannel->SetAudioOutputDevice(pDevice);
1172        }
1173        catch (LinuxSamplerException e) {
1174             result.Error(e);
1175        }
1176        return result.Produce();
1177    }
1178    
1179    String LSCPServer::SetMIDIInputPort(uint MIDIPort, uint uiSamplerChannel) {
1180        dmsg(2,("LSCPServer: SetMIDIInputPort(MIDIPort=%d, SamplerChannel=%d)\n",MIDIPort,uiSamplerChannel));
1181        LSCPResultSet result;
1182        try {
1183            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1184            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1185            pSamplerChannel->SetMidiInputPort(MIDIPort);
1186      }      }
1187      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1188           result.Error(e);           result.Error(e);
# Line 611  String LSCPServer::SetMIDIInputPort(Stri Line 1190  String LSCPServer::SetMIDIInputPort(Stri
1190      return result.Produce();      return result.Produce();
1191  }  }
1192    
 /**  
  * Will be called by the parser to change the MIDI input channel on which the  
  * engine of a particular sampler channel should listen to.  
  */  
1193  String LSCPServer::SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel) {  String LSCPServer::SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel) {
1194      dmsg(2,("LSCPServer: SetMIDIInputChannel(MIDIChannel=%d, SamplerChannel=%d)\n", MIDIChannel, uiSamplerChannel));      dmsg(2,("LSCPServer: SetMIDIInputChannel(MIDIChannel=%d, SamplerChannel=%d)\n",MIDIChannel,uiSamplerChannel));
1195      LSCPResultSet result;      LSCPResultSet result;
1196      try {      try {
1197          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1198          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1199          if (!pSamplerChannel->GetMidiInputDevice()) throw LinuxSamplerException("No MIDI input device connected yet");          pSamplerChannel->SetMidiInputChannel((MidiInputPort::midi_chan_t) MIDIChannel);
         MidiInputDevice::type_t oldtype = pSamplerChannel->GetMidiInputDevice()->Type();  
         pSamplerChannel->SetMidiInputDevice(oldtype, (MidiInputDevice::midi_chan_t) MIDIChannel);  
1200      }      }
1201      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1202           result.Error(e);           result.Error(e);
# Line 631  String LSCPServer::SetMIDIInputChannel(u Line 1204  String LSCPServer::SetMIDIInputChannel(u
1204      return result.Produce();      return result.Produce();
1205  }  }
1206    
1207  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint SamplerChannel) {  String LSCPServer::SetMIDIInputDevice(uint MIDIDeviceId, uint uiSamplerChannel) {
1208        dmsg(2,("LSCPServer: SetMIDIInputDevice(MIDIDeviceId=%d, SamplerChannel=%d)\n",MIDIDeviceId,uiSamplerChannel));
1209      LSCPResultSet result;      LSCPResultSet result;
1210      try {      try {
1211          throw LinuxSamplerException("Command not yet implemented");          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1212            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1213            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1214            if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1215            MidiInputDevice* pDevice = devices[MIDIDeviceId];
1216            pSamplerChannel->SetMidiInputDevice(pDevice);
1217        }
1218        catch (LinuxSamplerException e) {
1219             result.Error(e);
1220        }
1221        return result.Produce();
1222    }
1223    
1224    String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) {
1225        dmsg(2,("LSCPServer: SetMIDIInputType(String MidiInputDriver=%s, SamplerChannel=%d)\n",MidiInputDriver.c_str(),uiSamplerChannel));
1226        LSCPResultSet result;
1227        try {
1228            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1229            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1230            // Driver type name aliasing...
1231            if (MidiInputDriver == "Alsa") MidiInputDriver = "ALSA";
1232            // Check if there's one MIDI input device already created
1233            // for the intended MIDI driver type (MidiInputDriver)...
1234            MidiInputDevice *pDevice = NULL;
1235            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1236            std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
1237            for (; iter != devices.end(); iter++) {
1238                if ((iter->second)->Driver() == MidiInputDriver) {
1239                    pDevice = iter->second;
1240                    break;
1241                }
1242            }
1243            // If it doesn't exist, create a new one with default parameters...
1244            if (pDevice == NULL) {
1245                std::map<String,String> params;
1246                pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);
1247                // Make it with at least one initial port.
1248                std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1249                parameters["PORTS"]->SetValue("1");
1250            }
1251            // Must have a device...
1252            if (pDevice == NULL)
1253                throw LinuxSamplerException("Internal error: could not create MIDI input device.");
1254            // Set it as the current channel device...
1255            pSamplerChannel->SetMidiInputDevice(pDevice);
1256        }
1257        catch (LinuxSamplerException e) {
1258             result.Error(e);
1259        }
1260        return result.Produce();
1261    }
1262    
1263    /**
1264     * Will be called by the parser to change the MIDI input device, port and channel on which
1265     * engine of a particular sampler channel should listen to.
1266     */
1267    String LSCPServer::SetMIDIInput(uint MIDIDeviceId, uint MIDIPort, uint MIDIChannel, uint uiSamplerChannel) {
1268        dmsg(2,("LSCPServer: SetMIDIInput(MIDIDeviceId=%d, MIDIPort=%d, MIDIChannel=%d, SamplerChannel=%d)\n", MIDIDeviceId, MIDIPort, MIDIChannel, uiSamplerChannel));
1269        LSCPResultSet result;
1270        try {
1271            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1272            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1273            std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();
1274            if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1275            MidiInputDevice* pDevice = devices[MIDIDeviceId];
1276            pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputPort::midi_chan_t) MIDIChannel);
1277      }      }
1278      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1279           result.Error(e);           result.Error(e);
# Line 646  String LSCPServer::SetAudioOutputDevice( Line 1285  String LSCPServer::SetAudioOutputDevice(
1285   * 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
1286   * particular sampler channel.   * particular sampler channel.
1287   */   */
1288  String LSCPServer::SetVolume(double Volume, uint uiSamplerChannel) {  String LSCPServer::SetVolume(double dVolume, uint uiSamplerChannel) {
1289      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", Volume, uiSamplerChannel));      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", dVolume, uiSamplerChannel));
1290      LSCPResultSet result;      LSCPResultSet result;
1291      try {      try {
1292          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1293          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
1294          Engine* pEngine = pSamplerChannel->GetEngine();          Engine* pEngine = pSamplerChannel->GetEngine();
1295          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
1296          pEngine->Volume(Volume);          pEngine->Volume(dVolume);
1297      }      }
1298      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1299           result.Error(e);           result.Error(e);
# Line 682  String LSCPServer::ResetChannel(uint uiS Line 1321  String LSCPServer::ResetChannel(uint uiS
1321  }  }
1322    
1323  /**  /**
1324     * Will be called by the parser to reset the whole sampler.
1325     */
1326    String LSCPServer::ResetSampler() {
1327        dmsg(2,("LSCPServer: ResetSampler()\n"));
1328        pSampler->Reset();
1329        LSCPResultSet result;
1330        return result.Produce();
1331    }
1332    
1333    /**
1334   * 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
1335   * server for receiving event messages.   * server for receiving event messages.
1336   */   */
1337  String LSCPServer::SubscribeNotification(uint UDPPort) {  String LSCPServer::SubscribeNotification(LSCPEvent::event_t type) {
1338      dmsg(2,("LSCPServer: SubscribeNotification(UDPPort=%d)\n", UDPPort));      dmsg(2,("LSCPServer: SubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
1339      return "ERR:0:Not implemented yet.\r\n";      LSCPResultSet result;
1340        SubscriptionMutex.Lock();
1341        eventSubscriptions[type].push_back(currentSocket);
1342        SubscriptionMutex.Unlock();
1343        return result.Produce();
1344  }  }
1345    
1346  /**  /**
1347   * 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
1348   * for not receiving further event messages.   * for not receiving further event messages.
1349   */   */
1350  String LSCPServer::UnsubscribeNotification(String SessionID) {  String LSCPServer::UnsubscribeNotification(LSCPEvent::event_t type) {
1351      dmsg(2,("LSCPServer: UnsubscribeNotification(SessionID=%s)\n", SessionID.c_str()));      dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
1352      return "ERR:0:Not implemented yet.\r\n";      LSCPResultSet result;
1353        SubscriptionMutex.Lock();
1354        eventSubscriptions[type].remove(currentSocket);
1355        SubscriptionMutex.Unlock();
1356        return result.Produce();
1357  }  }
1358    
1359    /**
1360     * Will be called by the parser to enable or disable echo mode; if echo
1361     * mode is enabled, all commands from the client will (immediately) be
1362     * echoed back to the client.
1363     */
1364    String LSCPServer::SetEcho(yyparse_param_t* pSession, double boolean_value) {
1365        dmsg(2,("LSCPServer: SetEcho(val=%f)\n", boolean_value));
1366        LSCPResultSet result;
1367        try {
1368            if      (boolean_value == 0) pSession->bVerbose = false;
1369            else if (boolean_value == 1) pSession->bVerbose = true;
1370            else throw LinuxSamplerException("Not a boolean value, must either be 0 or 1");
1371        }
1372        catch (LinuxSamplerException e) {
1373             result.Error(e);
1374        }
1375        return result.Produce();
1376    }
1377    
1378  // Instrument loader constructor.  // Instrument loader constructor.
1379  LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)  LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)
Legend:
Removed from v.133  
changed lines
  Added in v.226
  ViewVC Help
Powered by ViewVC