/[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 138 by senkov, Sun Jun 20 23:18:24 2004 UTC revision 227 by schoenebeck, Thu Aug 26 22:05:44 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 43  int LSCPServer::Main() { Line 88  int LSCPServer::Main() {
88      SocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);      SocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);
89    
90      if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {      if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
91          std::cerr << "LSCPServer: Could not bind server socket." << std::endl;          std::cerr << "LSCPServer: Could not bind server socket, retrying for " << ToString(LSCP_SERVER_BIND_TIMEOUT) << " seconds...";
92          close(hSocket);          for (int trial = 0; true; trial++) { // retry for LSCP_SERVER_BIND_TIMEOUT seconds
93          //return -1;              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
94          exit(EXIT_FAILURE);                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {
95                        std::cerr << "gave up!" << std::endl;
96                        close(hSocket);
97                        //return -1;
98                        exit(EXIT_FAILURE);
99                    }
100                    else sleep(1); // sleep 1s
101                }
102                else break; // success
103            }
104      }      }
105    
106      listen(hSocket, 1);      listen(hSocket, 1);
107      dmsg(1,("LSCPServer: Server running.\n")); // server running      Initialized.Set(true);
108    
109      // now wait for client connections and handle their requests      // now wait for client connections and handle their requests
110      sockaddr_in client;      sockaddr_in client;
111      int length = sizeof(client);      int length = sizeof(client);
112        FD_ZERO(&fdSet);
113        FD_SET(hSocket, &fdSet);
114        int maxSessions = hSocket;
115    
116      while (true) {      while (true) {
117          hSession = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);          fd_set selectSet = fdSet;
118          if (hSession < 0) {          int retval = select(maxSessions+1, &selectSet, NULL, NULL, NULL);
119              std::cerr << "LSCPServer: Client connection failed." << std::endl;          if (retval == 0)
120              close(hSocket);                  continue; //Nothing try again
121              //return -1;          if (retval == -1) {
122              exit(EXIT_FAILURE);                  std::cerr << "LSCPServer: Socket select error." << std::endl;
123          }                  close(hSocket);
124                    exit(EXIT_FAILURE);
125          dmsg(1,("LSCPServer: Client connection established.\n"));          }
126          //send(hSession, "Welcome!\r\n", 10, 0);  
127            //Accept new connections now (if any)
128          // Parser invocation          if (FD_ISSET(hSocket, &selectSet)) {
129          yyparse_param_t yyparse_param;                  int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);
130          yyparse_param.pServer = this;                  if (socket < 0) {
131          yylex_init(&yyparse_param.pScanner);                          std::cerr << "LSCPServer: Client connection failed." << std::endl;
132          while (yyparse(&yyparse_param) == LSCP_SYNTAX_ERROR); // recall parser in case of syntax error                          exit(EXIT_FAILURE);
133          yylex_destroy(yyparse_param.pScanner);                  }
134    
135                    if (fcntl(socket, F_SETFL, O_NONBLOCK)) {
136                            std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;
137                            exit(EXIT_FAILURE);
138                    }
139    
140                    // Parser initialization
141                    yyparse_param_t yyparse_param;
142                    yyparse_param.pServer  = this;
143                    yyparse_param.hSession = socket;
144    
145                    Sessions.push_back(yyparse_param);
146                    FD_SET(socket, &fdSet);
147                    if (socket > maxSessions)
148                            maxSessions = socket;
149                    dmsg(1,("LSCPServer: Client connection established on socket:%d.\n", socket));
150                    LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection established on socket", socket));
151                    continue; //Maybe this was the only selected socket, better select again
152            }
153    
154          close(hSession);          //Something was selected and it was not the hSocket, so it must be some command(s) coming.
155          dmsg(1,("LSCPServer: Client connection terminated.\n"));          for (std::vector<yyparse_param_t>::iterator iter = Sessions.begin(); iter != Sessions.end(); iter++) {
156                    if (FD_ISSET((*iter).hSession, &selectSet)) {   //Was it this socket?
157                            if (GetLSCPCommand(iter)) {     //Have we read the entire command?
158                                    dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));
159                                    int dummy; // just a temporary hack to fulfill the restart() function prototype
160                                    restart(NULL, dummy); // restart the 'scanner'
161                                    currentSocket = (*iter).hSession;  //a hack
162                                    if ((*iter).bVerbose) { // if echo mode enabled
163                                        AnswerClient(bufferedCommands[currentSocket]);
164                                    }
165                                    int result = yyparse(&(*iter));
166                                    currentSocket = -1;     //continuation of a hack
167                                    dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
168                                    if (result == LSCP_QUIT) { //Was it a quit command by any chance?
169                                            CloseConnection(iter);
170                                    }
171                            }
172                            //socket may have been closed, iter may be invalid, get out of the loop for now.
173                            //we'll be back if there is data.
174                            break;
175                    }
176            }
177    
178            //Now let's deliver late notifies (if any)
179            NotifyBufferMutex.Lock();
180            for (std::map<int,String>::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) {
181                    send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), 0);
182                    bufferedNotifies.erase(iterNotify);
183            }
184            NotifyBufferMutex.Unlock();
185      }      }
186  }  }
187    
188    void LSCPServer::CloseConnection( std::vector<yyparse_param_t>::iterator iter ) {
189            int socket = (*iter).hSession;
190            dmsg(1,("LSCPServer: Client connection terminated on socket:%d.\n",socket));
191            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));
192            Sessions.erase(iter);
193            FD_CLR(socket,  &fdSet);
194            SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)
195            for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {
196                    iter->second.remove(socket);
197            }
198            SubscriptionMutex.Unlock();
199            NotifyMutex.Lock();
200            bufferedCommands.erase(socket);
201            bufferedNotifies.erase(socket);
202            close(socket);
203            NotifyMutex.Unlock();
204    }
205    
206    void LSCPServer::SendLSCPNotify( LSCPEvent event ) {
207            SubscriptionMutex.Lock();
208            if (eventSubscriptions.count(event.GetType()) == 0) {
209                    SubscriptionMutex.Unlock();     //Nobody is subscribed to this event
210                    return;
211            }
212            std::list<int>::iterator iter = eventSubscriptions[event.GetType()].begin();
213            std::list<int>::iterator end = eventSubscriptions[event.GetType()].end();
214            String notify = event.Produce();
215    
216            while (true) {
217                    if (NotifyMutex.Trylock()) {
218                            for(;iter != end; iter++)
219                                    send(*iter, notify.c_str(), notify.size(), 0);
220                            NotifyMutex.Unlock();
221                            break;
222                    } else {
223                            if (NotifyBufferMutex.Trylock()) {
224                                    for(;iter != end; iter++)
225                                            bufferedNotifies[*iter] += notify;
226                                    NotifyBufferMutex.Unlock();
227                                    break;
228                            }
229                    }
230            }
231            SubscriptionMutex.Unlock();
232    }
233    
234    extern int GetLSCPCommand( void *buf, int max_size ) {
235            String command = LSCPServer::bufferedCommands[LSCPServer::currentSocket];
236            if (command.size() == 0) {              //Parser wants input but we have nothing.
237                    strcpy((char*) buf, "\n");      //So give it an empty command
238                    return 1;                       //to keep it happy.
239            }
240    
241            if (max_size < command.size()) {
242                    std::cerr << "getLSCPCommand: Flex buffer too small, ignoring the command." << std::endl;
243                    return 0;       //This will never happen
244            }
245    
246            strcpy((char*) buf, command.c_str());
247            LSCPServer::bufferedCommands.erase(LSCPServer::currentSocket);
248            return command.size();
249    }
250    
251    /**
252     * Will be called to try to read the command from the socket
253     * If command is read, it will return true. Otherwise false is returned.
254     * In any case the received portion (complete or incomplete) is saved into bufferedCommand map.
255     */
256    bool LSCPServer::GetLSCPCommand( std::vector<yyparse_param_t>::iterator iter ) {
257            int socket = (*iter).hSession;
258            char c;
259            int i = 0;
260            while (true) {
261                    int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now
262                    if (result == 0) { //socket was selected, so 0 here means client has closed the connection
263                            CloseConnection(iter);
264                            break;
265                    }
266                    if (result == 1) {
267                            if (c == '\r')
268                                    continue; //Ignore CR
269                            if (c == '\n') {
270                                    LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));
271                                    bufferedCommands[socket] += "\n";
272                                    return true; //Complete command was read
273                            }
274                            bufferedCommands[socket] += c;
275                    }
276                    if (result == -1) {
277                            if (errno == EAGAIN) //Would block, try again later.
278                                    return false;
279                            switch(errno) {
280                                    case EBADF:
281                                            dmsg(2,("LSCPScanner: The argument s is an invalid descriptor.\n"));
282                                            break;
283                                    case ECONNREFUSED:
284                                            dmsg(2,("LSCPScanner: A remote host refused to allow the network connection (typically because it is not running the requested service).\n"));
285                                            break;
286                                    case ENOTCONN:
287                                            dmsg(2,("LSCPScanner: The socket is associated with a connection-oriented protocol and has not been connected (see connect(2) and accept(2)).\n"));
288                                            break;
289                                    case ENOTSOCK:
290                                            dmsg(2,("LSCPScanner: The argument s does not refer to a socket.\n"));
291                                            break;
292                                    case EAGAIN:
293                                            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"));
294                                            break;
295                                    case EINTR:
296                                            dmsg(2,("LSCPScanner: The receive was interrupted by delivery of a signal before any data were available.\n"));
297                                            break;
298                                    case EFAULT:
299                                            dmsg(2,("LSCPScanner: The receive buffer pointer(s) point outside the process's address space.\n"));
300                                            break;
301                                    case EINVAL:
302                                            dmsg(2,("LSCPScanner: Invalid argument passed.\n"));
303                                            break;
304                                    case ENOMEM:
305                                            dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));
306                                            break;
307                                    default:
308                                            dmsg(2,("LSCPScanner: Unknown recv() error.\n"));
309                                            break;
310                            }
311                            CloseConnection(iter);
312                            break;
313                    }
314            }
315            return false;
316    }
317    
318  /**  /**
319   * 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
320   * client / frontend.   * client / frontend.
# Line 87  int LSCPServer::Main() { Line 323  int LSCPServer::Main() {
323   */   */
324  void LSCPServer::AnswerClient(String ReturnMessage) {  void LSCPServer::AnswerClient(String ReturnMessage) {
325      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));
326      send(hSession, ReturnMessage.c_str(), ReturnMessage.size(), 0);      if (currentSocket != -1) {
327                NotifyMutex.Lock();
328                send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), 0);
329                NotifyMutex.Unlock();
330        }
331    }
332    
333    /**
334     * Find a created audio output device index.
335     */
336    int LSCPServer::GetAudioOutputDeviceIndex ( AudioOutputDevice *pDevice )
337    {
338        // Search for the created device to get its index
339        std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
340        std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
341        for (; iter != devices.end(); iter++) {
342            if (iter->second == pDevice)
343                return iter->first;
344        }
345        // Not found.
346        return -1;
347    }
348    
349    /**
350     * Find a created midi input device index.
351     */
352    int LSCPServer::GetMidiInputDeviceIndex ( MidiInputDevice *pDevice )
353    {
354        // Search for the created device to get its index
355        std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
356        std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
357        for (; iter != devices.end(); iter++) {
358            if (iter->second == pDevice)
359                return iter->first;
360        }
361        // Not found.
362        return -1;
363  }  }
364    
365  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 367  String LSCPServer::CreateAudioOutputDevi
367      LSCPResultSet result;      LSCPResultSet result;
368      try {      try {
369          AudioOutputDevice* pDevice = pSampler->CreateAudioOutputDevice(Driver, Parameters);          AudioOutputDevice* pDevice = pSampler->CreateAudioOutputDevice(Driver, Parameters);
         std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();  
370          // search for the created device to get its index          // search for the created device to get its index
371          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;  
             }  
         }  
372          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.");
373          result = index; // success          result = index; // success
374      }      }
# Line 114  String LSCPServer::CreateAudioOutputDevi Line 378  String LSCPServer::CreateAudioOutputDevi
378      return result.Produce();      return result.Produce();
379  }  }
380    
381    String LSCPServer::CreateMidiInputDevice(String Driver, std::map<String,String> Parameters) {
382        dmsg(2,("LSCPServer: CreateMidiInputDevice(Driver=%s)\n", Driver.c_str()));
383        LSCPResultSet result;
384        try {
385            MidiInputDevice* pDevice = pSampler->CreateMidiInputDevice(Driver, Parameters);
386            // search for the created device to get its index
387            int index = GetMidiInputDeviceIndex(pDevice);
388            if (index == -1) throw LinuxSamplerException("Internal error: could not find created midi input device.");
389            result = index; // success
390        }
391        catch (LinuxSamplerException e) {
392            result.Error(e);
393        }
394        return result.Produce();
395    }
396    
397  String LSCPServer::DestroyAudioOutputDevice(uint DeviceIndex) {  String LSCPServer::DestroyAudioOutputDevice(uint DeviceIndex) {
398      dmsg(2,("LSCPServer: DestroyAudioOutputDevice(DeviceIndex=%d)\n", DeviceIndex));      dmsg(2,("LSCPServer: DestroyAudioOutputDevice(DeviceIndex=%d)\n", DeviceIndex));
399      LSCPResultSet result;      LSCPResultSet result;
400      try {      try {
401          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
402          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) + ".");
403          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
404          pSampler->DestroyAudioOutputDevice(pDevice);          pSampler->DestroyAudioOutputDevice(pDevice);
405      }      }
# Line 129  String LSCPServer::DestroyAudioOutputDev Line 409  String LSCPServer::DestroyAudioOutputDev
409      return result.Produce();      return result.Produce();
410  }  }
411    
412    String LSCPServer::DestroyMidiInputDevice(uint DeviceIndex) {
413        dmsg(2,("LSCPServer: DestroyMidiInputDevice(DeviceIndex=%d)\n", DeviceIndex));
414        LSCPResultSet result;
415        try {
416            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
417            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
418            MidiInputDevice* pDevice = devices[DeviceIndex];
419            pSampler->DestroyMidiInputDevice(pDevice);
420        }
421        catch (LinuxSamplerException e) {
422            result.Error(e);
423        }
424        return result.Produce();
425    }
426    
427  /**  /**
428   * Will be called by the parser to load an instrument.   * Will be called by the parser to load an instrument.
429   */   */
# Line 140  String LSCPServer::LoadInstrument(String Line 435  String LSCPServer::LoadInstrument(String
435          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
436          Engine* pEngine = pSamplerChannel->GetEngine();          Engine* pEngine = pSamplerChannel->GetEngine();
437          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
438            if (!pSamplerChannel->GetAudioOutputDevice())
439                throw LinuxSamplerException("No audio output device on channel");
440          if (bBackground) {          if (bBackground) {
441              LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);              LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);
442              pLoadInstrument->StartThread();              pLoadInstrument->StartThread();
# Line 183  String LSCPServer::GetChannels() { Line 480  String LSCPServer::GetChannels() {
480  }  }
481    
482  /**  /**
483     * Will be called by the parser to get the list of sampler channels.
484     */
485    String LSCPServer::ListChannels() {
486        dmsg(2,("LSCPServer: ListChannels()\n"));
487        String list;
488        std::map<uint,SamplerChannel*> channels = pSampler->GetSamplerChannels();
489        std::map<uint,SamplerChannel*>::iterator iter = channels.begin();
490        for (; iter != channels.end(); iter++) {
491            if (list != "") list += ",";
492            list += ToString(iter->first);
493        }
494        LSCPResultSet result;
495        result.Add(list);
496        return result.Produce();
497    }
498    
499    /**
500   * Will be called by the parser to add a sampler channel.   * Will be called by the parser to add a sampler channel.
501   */   */
502  String LSCPServer::AddChannel() {  String LSCPServer::AddChannel() {
# Line 220  String LSCPServer::GetEngineInfo(String Line 534  String LSCPServer::GetEngineInfo(String
534      try {      try {
535          if ((EngineName == "GigEngine") || (EngineName == "gig")) {          if ((EngineName == "GigEngine") || (EngineName == "gig")) {
536              Engine* pEngine = new LinuxSampler::gig::Engine;              Engine* pEngine = new LinuxSampler::gig::Engine;
537              result.Add(pEngine->Description());              result.Add("DESCRIPTION", pEngine->Description());
538              result.Add(pEngine->Version());              result.Add("VERSION",     pEngine->Version());
539              delete pEngine;              delete pEngine;
540          }          }
541          else throw LinuxSamplerException("Unknown engine type");          else throw LinuxSamplerException("Unknown engine type");
# Line 246  String LSCPServer::GetChannelInfo(uint u Line 560  String LSCPServer::GetChannelInfo(uint u
560    
561          //Defaults values          //Defaults values
562          String EngineName = "NONE";          String EngineName = "NONE";
563          float Volume = 0;          float Volume = 0.0f;
564          String InstrumentFileName = "NONE";          String InstrumentFileName = "NONE";
565          int InstrumentIndex = -1;          int InstrumentIndex = -1;
566          int InstrumentStatus = -1;          int InstrumentStatus = -1;
567            int AudioOutputChannels = 0;
568            String AudioRouting;
569    
570          if (pEngine) {          if (pEngine) {
571              EngineName =  pEngine->EngineName();              EngineName =  pEngine->EngineName();
572                AudioOutputChannels = pEngine->Channels();
573              Volume = pEngine->Volume();              Volume = pEngine->Volume();
574              InstrumentStatus = pEngine->InstrumentStatus();              InstrumentStatus = pEngine->InstrumentStatus();
575              InstrumentIndex = pEngine->InstrumentIndex();              InstrumentIndex = pEngine->InstrumentIndex();
576              if (InstrumentIndex != -1)              if (InstrumentIndex != -1)
577                  InstrumentFileName = pEngine->InstrumentFileName();                  InstrumentFileName = pEngine->InstrumentFileName();
578                for (int chan = 0; chan < pEngine->Channels(); chan++) {
579                    if (AudioRouting != "") AudioRouting += ",";
580                    AudioRouting += ToString(pEngine->OutputChannel(chan));
581                }
582          }          }
583    
584          result.Add("ENGINE_NAME", EngineName);          result.Add("ENGINE_NAME", EngineName);
585          result.Add("VOLUME", Volume);          result.Add("VOLUME", Volume);
586    
587          //Some hardcoded stuff for now to make GUI look good          //Some not-so-hardcoded stuff to make GUI look good
588          result.Add("AUDIO_OUTPUT_DEVICE", "0");          result.Add("AUDIO_OUTPUT_DEVICE", GetAudioOutputDeviceIndex(pSamplerChannel->GetAudioOutputDevice()));
589          result.Add("AUDIO_OUTPUT_CHANNELS", "2");          result.Add("AUDIO_OUTPUT_CHANNELS", AudioOutputChannels);
590          result.Add("AUDIO_OUTPUT_ROUTING", "0,1");          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);
591    
592            result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice()));
593            result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());
594            if (pSamplerChannel->GetMidiInputChannel()) result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
595            else                                        result.Add("MIDI_INPUT_CHANNEL", "ALL");
596    
597          result.Add("INSTRUMENT_FILE", InstrumentFileName);          result.Add("INSTRUMENT_FILE", InstrumentFileName);
598          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
599          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");  
600      }      }
601      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
602           result.Error(e);           result.Error(e);
# Line 369  String LSCPServer::GetAvailableAudioOutp Line 690  String LSCPServer::GetAvailableAudioOutp
690      return result.Produce();      return result.Produce();
691  }  }
692    
693    String LSCPServer::GetAvailableMidiInputDrivers() {
694        dmsg(2,("LSCPServer: GetAvailableMidiInputDrivers()\n"));
695        LSCPResultSet result;
696        try {
697            String s = MidiInputDeviceFactory::AvailableDriversAsString();
698            result.Add(s);
699        }
700        catch (LinuxSamplerException e) {
701            result.Error(e);
702        }
703        return result.Produce();
704    }
705    
706    String LSCPServer::GetMidiInputDriverInfo(String Driver) {
707        dmsg(2,("LSCPServer: GetMidiInputDriverInfo(Driver=%s)\n",Driver.c_str()));
708        LSCPResultSet result;
709        try {
710            result.Add("DESCRIPTION", MidiInputDeviceFactory::GetDriverDescription(Driver));
711            result.Add("VERSION",     MidiInputDeviceFactory::GetDriverVersion(Driver));
712    
713            std::map<String,DeviceCreationParameter*> parameters = MidiInputDeviceFactory::GetAvailableDriverParameters(Driver);
714            if (parameters.size()) { // if there are parameters defined for this driver
715                String s;
716                std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
717                for (;iter != parameters.end(); iter++) {
718                    if (s != "") s += ",";
719                    s += iter->first;
720                }
721                result.Add("PARAMETERS", s);
722            }
723        }
724        catch (LinuxSamplerException e) {
725            result.Error(e);
726        }
727        return result.Produce();
728    }
729    
730  String LSCPServer::GetAudioOutputDriverInfo(String Driver) {  String LSCPServer::GetAudioOutputDriverInfo(String Driver) {
731      dmsg(2,("LSCPServer: GetAudioOutputDriverInfo(Driver=%s)\n",Driver.c_str()));      dmsg(2,("LSCPServer: GetAudioOutputDriverInfo(Driver=%s)\n",Driver.c_str()));
732      LSCPResultSet result;      LSCPResultSet result;
# Line 393  String LSCPServer::GetAudioOutputDriverI Line 751  String LSCPServer::GetAudioOutputDriverI
751      return result.Produce();      return result.Produce();
752  }  }
753    
754    String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
755        dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s,DependencyListSize=%d)\n",Driver.c_str(),Parameter.c_str(),DependencyList.size()));
756        LSCPResultSet result;
757        try {
758            DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);
759            result.Add("TYPE",         pParameter->Type());
760            result.Add("DESCRIPTION",  pParameter->Description());
761            result.Add("MANDATORY",    pParameter->Mandatory());
762            result.Add("FIX",          pParameter->Fix());
763            result.Add("MULTIPLICITY", pParameter->Multiplicity());
764            optional<String> oDepends       = pParameter->Depends();
765            optional<String> oDefault       = pParameter->Default(DependencyList);
766            optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
767            optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
768            optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
769            if (oDepends)       result.Add("DEPENDS",       *oDepends);
770            if (oDefault)       result.Add("DEFAULT",       *oDefault);
771            if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
772            if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
773            if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
774        }
775        catch (LinuxSamplerException e) {
776            result.Error(e);
777        }
778        return result.Produce();
779    }
780    
781  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
782      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()));
783      LSCPResultSet result;      LSCPResultSet result;
784      try {      try {
785          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);
# Line 403  String LSCPServer::GetAudioOutputDriverP Line 788  String LSCPServer::GetAudioOutputDriverP
788          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    pParameter->Mandatory());
789          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
790          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
791          if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());          optional<String> oDepends       = pParameter->Depends();
792          if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());          optional<String> oDefault       = pParameter->Default(DependencyList);
793          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
794          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
795          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
796            if (oDepends)       result.Add("DEPENDS",       *oDepends);
797            if (oDefault)       result.Add("DEFAULT",       *oDefault);
798            if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
799            if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
800            if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
801      }      }
802      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
803          result.Error(e);          result.Error(e);
# Line 428  String LSCPServer::GetAudioOutputDeviceC Line 818  String LSCPServer::GetAudioOutputDeviceC
818      return result.Produce();      return result.Produce();
819  }  }
820    
821    String LSCPServer::GetMidiInputDeviceCount() {
822        dmsg(2,("LSCPServer: GetMidiInputDeviceCount()\n"));
823        LSCPResultSet result;
824        try {
825            uint count = pSampler->MidiInputDevices();
826            result.Add(count); // success
827        }
828        catch (LinuxSamplerException e) {
829            result.Error(e);
830        }
831        return result.Produce();
832    }
833    
834  String LSCPServer::GetAudioOutputDevices() {  String LSCPServer::GetAudioOutputDevices() {
835      dmsg(2,("LSCPServer: GetAudioOutputDevices()\n"));      dmsg(2,("LSCPServer: GetAudioOutputDevices()\n"));
836      LSCPResultSet result;      LSCPResultSet result;
# Line 447  String LSCPServer::GetAudioOutputDevices Line 850  String LSCPServer::GetAudioOutputDevices
850      return result.Produce();      return result.Produce();
851  }  }
852    
853    String LSCPServer::GetMidiInputDevices() {
854        dmsg(2,("LSCPServer: GetMidiInputDevices()\n"));
855        LSCPResultSet result;
856        try {
857            String s;
858            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
859            std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
860            for (; iter != devices.end(); iter++) {
861                if (s != "") s += ",";
862                s += ToString(iter->first);
863            }
864            result.Add(s);
865        }
866        catch (LinuxSamplerException e) {
867            result.Error(e);
868        }
869        return result.Produce();
870    }
871    
872  String LSCPServer::GetAudioOutputDeviceInfo(uint DeviceIndex) {  String LSCPServer::GetAudioOutputDeviceInfo(uint DeviceIndex) {
873      dmsg(2,("LSCPServer: GetAudioOutputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));      dmsg(2,("LSCPServer: GetAudioOutputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));
874      LSCPResultSet result;      LSCPResultSet result;
875      try {      try {
876          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
877          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) + ".");
878          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
879            result.Add("DRIVER", pDevice->Driver());
880            std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
881            std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
882            for (; iter != parameters.end(); iter++) {
883                result.Add(iter->first, iter->second->Value());
884            }
885        }
886        catch (LinuxSamplerException e) {
887            result.Error(e);
888        }
889        return result.Produce();
890    }
891    
892    String LSCPServer::GetMidiInputDeviceInfo(uint DeviceIndex) {
893        dmsg(2,("LSCPServer: GetMidiInputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));
894        LSCPResultSet result;
895        try {
896            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
897            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
898            MidiInputDevice* pDevice = devices[DeviceIndex];
899            result.Add("DRIVER", pDevice->Driver());
900          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
901          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
902          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 465  String LSCPServer::GetAudioOutputDeviceI Line 908  String LSCPServer::GetAudioOutputDeviceI
908      }      }
909      return result.Produce();      return result.Produce();
910  }  }
911    String LSCPServer::GetMidiInputPortInfo(uint DeviceIndex, uint PortIndex) {
912        dmsg(2,("LSCPServer: GetMidiInputPortInfo(DeviceIndex=%d, PortIndex=%d)\n",DeviceIndex, PortIndex));
913        LSCPResultSet result;
914        try {
915            // get MIDI input device
916            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
917            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
918            MidiInputDevice* pDevice = devices[DeviceIndex];
919    
920            // get MIDI port
921            MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
922            if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
923    
924            // return the values of all MIDI port parameters
925            std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
926            std::map<String,DeviceRuntimeParameter*>::iterator iter = parameters.begin();
927            for (; iter != parameters.end(); iter++) {
928                result.Add(iter->first, iter->second->Value());
929            }
930        }
931        catch (LinuxSamplerException e) {
932            result.Error(e);
933        }
934        return result.Produce();
935    }
936    
937  String LSCPServer::GetAudioOutputChannelInfo(uint DeviceId, uint ChannelId) {  String LSCPServer::GetAudioOutputChannelInfo(uint DeviceId, uint ChannelId) {
938      dmsg(2,("LSCPServer: GetAudioOutputChannelInfo(DeviceId=%d,ChannelId)\n",DeviceId,ChannelId));      dmsg(2,("LSCPServer: GetAudioOutputChannelInfo(DeviceId=%d,ChannelId)\n",DeviceId,ChannelId));
# Line 472  String LSCPServer::GetAudioOutputChannel Line 940  String LSCPServer::GetAudioOutputChannel
940      try {      try {
941          // get audio output device          // get audio output device
942          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
943          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) + ".");
944          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
945    
946          // get audio channel          // get audio channel
# Line 492  String LSCPServer::GetAudioOutputChannel Line 960  String LSCPServer::GetAudioOutputChannel
960      return result.Produce();      return result.Produce();
961  }  }
962    
963    String LSCPServer::GetMidiInputPortParameterInfo(uint DeviceId, uint PortId, String ParameterName) {
964        dmsg(2,("LSCPServer: GetMidiInputPortParameterInfo(DeviceId=%d,PortId=%d,ParameterName=%s)\n",DeviceId,PortId,ParameterName.c_str()));
965        LSCPResultSet result;
966        try {
967            // get MIDI input device
968            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
969            if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");
970            MidiInputDevice* pDevice = devices[DeviceId];
971    
972            // get midi port
973            MidiInputPort* pPort = pDevice->GetPort(PortId);
974            if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");
975    
976            // get desired port parameter
977            std::map<String,DeviceRuntimeParameter*> parameters = pPort->PortParameters();
978            if (!parameters.count(ParameterName)) throw LinuxSamplerException("Midi port does not provide a parameter '" + ParameterName + "'.");
979            DeviceRuntimeParameter* pParameter = parameters[ParameterName];
980    
981            // return all fields of this audio channel parameter
982            result.Add("TYPE",         pParameter->Type());
983            result.Add("DESCRIPTION",  pParameter->Description());
984            result.Add("FIX",          pParameter->Fix());
985            result.Add("MULTIPLICITY", pParameter->Multiplicity());
986            if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
987            if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
988            if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
989        }
990        catch (LinuxSamplerException e) {
991            result.Error(e);
992        }
993        return result.Produce();
994    }
995    
996  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {
997      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()));
998      LSCPResultSet result;      LSCPResultSet result;
999      try {      try {
1000          // get audio output device          // get audio output device
1001          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1002          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) + ".");
1003          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
1004    
1005          // get audio channel          // get audio channel
# Line 507  String LSCPServer::GetAudioOutputChannel Line 1008  String LSCPServer::GetAudioOutputChannel
1008    
1009          // get desired audio channel parameter          // get desired audio channel parameter
1010          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
1011          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 + "'.");
1012          DeviceRuntimeParameter* pParameter = parameters[ParameterName];          DeviceRuntimeParameter* pParameter = parameters[ParameterName];
1013    
1014          // return all fields of this audio channel parameter          // return all fields of this audio channel parameter
# Line 515  String LSCPServer::GetAudioOutputChannel Line 1016  String LSCPServer::GetAudioOutputChannel
1016          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
1017          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
1018          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
1019          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
1020          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
1021          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
1022      }      }
1023      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1024          result.Error(e);          result.Error(e);
# Line 531  String LSCPServer::SetAudioOutputChannel Line 1032  String LSCPServer::SetAudioOutputChannel
1032      try {      try {
1033          // get audio output device          // get audio output device
1034          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1035          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) + ".");
1036          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
1037    
1038          // get audio channel          // get audio channel
# Line 540  String LSCPServer::SetAudioOutputChannel Line 1041  String LSCPServer::SetAudioOutputChannel
1041    
1042          // get desired audio channel parameter          // get desired audio channel parameter
1043          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
1044          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 + "'.");
1045          DeviceRuntimeParameter* pParameter = parameters[ParamKey];          DeviceRuntimeParameter* pParameter = parameters[ParamKey];
1046    
1047          // set new channel parameter value          // set new channel parameter value
# Line 557  String LSCPServer::SetAudioOutputDeviceP Line 1058  String LSCPServer::SetAudioOutputDeviceP
1058      LSCPResultSet result;      LSCPResultSet result;
1059      try {      try {
1060          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1061          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) + ".");
1062          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
1063          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1064          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 + "'");
1065            parameters[ParamKey]->SetValue(ParamVal);
1066        }
1067        catch (LinuxSamplerException e) {
1068            result.Error(e);
1069        }
1070        return result.Produce();
1071    }
1072    
1073    String LSCPServer::SetMidiInputDeviceParameter(uint DeviceIndex, String ParamKey, String ParamVal) {
1074        dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
1075        LSCPResultSet result;
1076        try {
1077            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1078            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1079            MidiInputDevice* pDevice = devices[DeviceIndex];
1080            std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1081            if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
1082            parameters[ParamKey]->SetValue(ParamVal);
1083        }
1084        catch (LinuxSamplerException e) {
1085            result.Error(e);
1086        }
1087        return result.Produce();
1088    }
1089    
1090    String LSCPServer::SetMidiInputPortParameter(uint DeviceIndex, uint PortIndex, String ParamKey, String ParamVal) {
1091        dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
1092        LSCPResultSet result;
1093        try {
1094            // get MIDI input device
1095            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1096            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1097            MidiInputDevice* pDevice = devices[DeviceIndex];
1098    
1099            // get MIDI port
1100            MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
1101            if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
1102    
1103            // set port parameter value
1104            std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
1105            if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
1106          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1107      }      }
1108      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 575  String LSCPServer::SetAudioOutputDeviceP Line 1117  String LSCPServer::SetAudioOutputDeviceP
1117   */   */
1118  String LSCPServer::SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel) {
1119      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));
1120      return "ERR:0:Not implemented yet.\r\n"; //FIXME: Add support for this in resultset class?      LSCPResultSet result;
1121        try {
1122            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1123            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1124            Engine* pEngine = pSamplerChannel->GetEngine();
1125            if (!pEngine) throw LinuxSamplerException("No engine deployed on sampler channel " + ToString(uiSamplerChannel));
1126            pEngine->SetOutputChannel(ChannelAudioOutputChannel, AudioOutputDeviceInputChannel);
1127        }
1128        catch (LinuxSamplerException e) {
1129             result.Error(e);
1130        }
1131        return result.Produce();
1132  }  }
1133    
1134  String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {
1135      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));
1136      LSCPResultSet result;      LSCPResultSet result;
1137      try {      try {
1138          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1139          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1140          // 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();
1141          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));
1142          MidiInputDevice::type_t MidiInputType = MidiInputDevice::type_alsa;          AudioOutputDevice* pDevice = devices[AudioDeviceId];
1143          pSamplerChannel->SetMidiInputDevice(MidiInputType);          pSamplerChannel->SetAudioOutputDevice(pDevice);
1144      }      }
1145      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1146           result.Error(e);           result.Error(e);
# Line 595  String LSCPServer::SetMIDIInputType(Stri Line 1148  String LSCPServer::SetMIDIInputType(Stri
1148      return result.Produce();      return result.Produce();
1149  }  }
1150    
1151  /**  String LSCPServer::SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel) {
1152   * 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));  
1153      LSCPResultSet result;      LSCPResultSet result;
1154      try {      try {
1155          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1156          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1157          if (!pSamplerChannel->GetMidiInputDevice()) throw LinuxSamplerException("No MIDI input device connected yet");          // Driver type name aliasing...
1158          pSamplerChannel->GetMidiInputDevice()->SetInputPort(MIDIInputPort.c_str());          if (AudioOutputDriver == "Alsa") AudioOutputDriver = "ALSA";
1159            if (AudioOutputDriver == "Jack") AudioOutputDriver = "JACK";
1160            // Check if there's one audio output device already created
1161            // for the intended audio driver type (AudioOutputDriver)...
1162            AudioOutputDevice *pDevice = NULL;
1163            std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1164            std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
1165            for (; iter != devices.end(); iter++) {
1166                if ((iter->second)->Driver() == AudioOutputDriver) {
1167                    pDevice = iter->second;
1168                    break;
1169                }
1170            }
1171            // If it doesn't exist, create a new one with default parameters...
1172            if (pDevice == NULL) {
1173                std::map<String,String> params;
1174                pDevice = pSampler->CreateAudioOutputDevice(AudioOutputDriver, params);
1175            }
1176            // Must have a device...
1177            if (pDevice == NULL)
1178                throw LinuxSamplerException("Internal error: could not create audio output device.");
1179            // Set it as the current channel device...
1180            pSamplerChannel->SetAudioOutputDevice(pDevice);
1181        }
1182        catch (LinuxSamplerException e) {
1183             result.Error(e);
1184        }
1185        return result.Produce();
1186    }
1187    
1188    String LSCPServer::SetMIDIInputPort(uint MIDIPort, uint uiSamplerChannel) {
1189        dmsg(2,("LSCPServer: SetMIDIInputPort(MIDIPort=%d, SamplerChannel=%d)\n",MIDIPort,uiSamplerChannel));
1190        LSCPResultSet result;
1191        try {
1192            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1193            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1194            pSamplerChannel->SetMidiInputPort(MIDIPort);
1195      }      }
1196      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1197           result.Error(e);           result.Error(e);
# Line 614  String LSCPServer::SetMIDIInputPort(Stri Line 1199  String LSCPServer::SetMIDIInputPort(Stri
1199      return result.Produce();      return result.Produce();
1200  }  }
1201    
 /**  
  * Will be called by the parser to change the MIDI input channel on which the  
  * engine of a particular sampler channel should listen to.  
  */  
1202  String LSCPServer::SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel) {  String LSCPServer::SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel) {
1203      dmsg(2,("LSCPServer: SetMIDIInputChannel(MIDIChannel=%d, SamplerChannel=%d)\n", MIDIChannel, uiSamplerChannel));      dmsg(2,("LSCPServer: SetMIDIInputChannel(MIDIChannel=%d, SamplerChannel=%d)\n",MIDIChannel,uiSamplerChannel));
1204      LSCPResultSet result;      LSCPResultSet result;
1205      try {      try {
1206          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1207          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1208          if (!pSamplerChannel->GetMidiInputDevice()) throw LinuxSamplerException("No MIDI input device connected yet");          pSamplerChannel->SetMidiInputChannel((MidiInputPort::midi_chan_t) MIDIChannel);
1209          MidiInputDevice::type_t oldtype = pSamplerChannel->GetMidiInputDevice()->Type();      }
1210          pSamplerChannel->SetMidiInputDevice(oldtype, (MidiInputDevice::midi_chan_t) MIDIChannel);      catch (LinuxSamplerException e) {
1211             result.Error(e);
1212        }
1213        return result.Produce();
1214    }
1215    
1216    String LSCPServer::SetMIDIInputDevice(uint MIDIDeviceId, uint uiSamplerChannel) {
1217        dmsg(2,("LSCPServer: SetMIDIInputDevice(MIDIDeviceId=%d, SamplerChannel=%d)\n",MIDIDeviceId,uiSamplerChannel));
1218        LSCPResultSet result;
1219        try {
1220            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1221            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1222            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1223            if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1224            MidiInputDevice* pDevice = devices[MIDIDeviceId];
1225            pSamplerChannel->SetMidiInputDevice(pDevice);
1226        }
1227        catch (LinuxSamplerException e) {
1228             result.Error(e);
1229        }
1230        return result.Produce();
1231    }
1232    
1233    String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) {
1234        dmsg(2,("LSCPServer: SetMIDIInputType(String MidiInputDriver=%s, SamplerChannel=%d)\n",MidiInputDriver.c_str(),uiSamplerChannel));
1235        LSCPResultSet result;
1236        try {
1237            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1238            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1239            // Driver type name aliasing...
1240            if (MidiInputDriver == "Alsa") MidiInputDriver = "ALSA";
1241            // Check if there's one MIDI input device already created
1242            // for the intended MIDI driver type (MidiInputDriver)...
1243            MidiInputDevice *pDevice = NULL;
1244            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1245            std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
1246            for (; iter != devices.end(); iter++) {
1247                if ((iter->second)->Driver() == MidiInputDriver) {
1248                    pDevice = iter->second;
1249                    break;
1250                }
1251            }
1252            // If it doesn't exist, create a new one with default parameters...
1253            if (pDevice == NULL) {
1254                std::map<String,String> params;
1255                pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);
1256                // Make it with at least one initial port.
1257                std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1258                parameters["PORTS"]->SetValue("1");
1259            }
1260            // Must have a device...
1261            if (pDevice == NULL)
1262                throw LinuxSamplerException("Internal error: could not create MIDI input device.");
1263            // Set it as the current channel device...
1264            pSamplerChannel->SetMidiInputDevice(pDevice);
1265      }      }
1266      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1267           result.Error(e);           result.Error(e);
# Line 634  String LSCPServer::SetMIDIInputChannel(u Line 1269  String LSCPServer::SetMIDIInputChannel(u
1269      return result.Produce();      return result.Produce();
1270  }  }
1271    
1272  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint SamplerChannel) {  /**
1273     * Will be called by the parser to change the MIDI input device, port and channel on which
1274     * engine of a particular sampler channel should listen to.
1275     */
1276    String LSCPServer::SetMIDIInput(uint MIDIDeviceId, uint MIDIPort, uint MIDIChannel, uint uiSamplerChannel) {
1277        dmsg(2,("LSCPServer: SetMIDIInput(MIDIDeviceId=%d, MIDIPort=%d, MIDIChannel=%d, SamplerChannel=%d)\n", MIDIDeviceId, MIDIPort, MIDIChannel, uiSamplerChannel));
1278      LSCPResultSet result;      LSCPResultSet result;
1279      try {      try {
1280          throw LinuxSamplerException("Command not yet implemented");          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1281            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1282            std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();
1283            if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1284            MidiInputDevice* pDevice = devices[MIDIDeviceId];
1285            pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputPort::midi_chan_t) MIDIChannel);
1286      }      }
1287      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1288           result.Error(e);           result.Error(e);
# Line 649  String LSCPServer::SetAudioOutputDevice( Line 1294  String LSCPServer::SetAudioOutputDevice(
1294   * 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
1295   * particular sampler channel.   * particular sampler channel.
1296   */   */
1297  String LSCPServer::SetVolume(double Volume, uint uiSamplerChannel) {  String LSCPServer::SetVolume(double dVolume, uint uiSamplerChannel) {
1298      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", Volume, uiSamplerChannel));      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", dVolume, uiSamplerChannel));
1299      LSCPResultSet result;      LSCPResultSet result;
1300      try {      try {
1301          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1302          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
1303          Engine* pEngine = pSamplerChannel->GetEngine();          Engine* pEngine = pSamplerChannel->GetEngine();
1304          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
1305          pEngine->Volume(Volume);          pEngine->Volume(dVolume);
1306      }      }
1307      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1308           result.Error(e);           result.Error(e);
# Line 685  String LSCPServer::ResetChannel(uint uiS Line 1330  String LSCPServer::ResetChannel(uint uiS
1330  }  }
1331    
1332  /**  /**
1333     * Will be called by the parser to reset the whole sampler.
1334     */
1335    String LSCPServer::ResetSampler() {
1336        dmsg(2,("LSCPServer: ResetSampler()\n"));
1337        pSampler->Reset();
1338        LSCPResultSet result;
1339        return result.Produce();
1340    }
1341    
1342    /**
1343   * 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
1344   * server for receiving event messages.   * server for receiving event messages.
1345   */   */
1346  String LSCPServer::SubscribeNotification(event_t Event) {  String LSCPServer::SubscribeNotification(LSCPEvent::event_t type) {
1347      dmsg(2,("LSCPServer: SubscribeNotification(Event=%d)\n", Event));      dmsg(2,("LSCPServer: SubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
1348      return "ERR:0:Not implemented yet.\r\n";      LSCPResultSet result;
1349        SubscriptionMutex.Lock();
1350        eventSubscriptions[type].push_back(currentSocket);
1351        SubscriptionMutex.Unlock();
1352        return result.Produce();
1353  }  }
1354    
1355  /**  /**
1356   * 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
1357   * for not receiving further event messages.   * for not receiving further event messages.
1358   */   */
1359  String LSCPServer::UnsubscribeNotification(event_t Event) {  String LSCPServer::UnsubscribeNotification(LSCPEvent::event_t type) {
1360      dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%d)\n", Event));      dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
1361      return "ERR:0:Not implemented yet.\r\n";      LSCPResultSet result;
1362        SubscriptionMutex.Lock();
1363        eventSubscriptions[type].remove(currentSocket);
1364        SubscriptionMutex.Unlock();
1365        return result.Produce();
1366  }  }
1367    
1368    /**
1369     * Will be called by the parser to enable or disable echo mode; if echo
1370     * mode is enabled, all commands from the client will (immediately) be
1371     * echoed back to the client.
1372     */
1373    String LSCPServer::SetEcho(yyparse_param_t* pSession, double boolean_value) {
1374        dmsg(2,("LSCPServer: SetEcho(val=%f)\n", boolean_value));
1375        LSCPResultSet result;
1376        try {
1377            if      (boolean_value == 0) pSession->bVerbose = false;
1378            else if (boolean_value == 1) pSession->bVerbose = true;
1379            else throw LinuxSamplerException("Not a boolean value, must either be 0 or 1");
1380        }
1381        catch (LinuxSamplerException e) {
1382             result.Error(e);
1383        }
1384        return result.Produce();
1385    }
1386    
1387  // Instrument loader constructor.  // Instrument loader constructor.
1388  LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)  LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)
Legend:
Removed from v.138  
changed lines
  Added in v.227
  ViewVC Help
Powered by ViewVC