/[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 159 by capela, Tue Jun 29 21:11:50 2004 UTC revision 225 by schoenebeck, Sun Aug 22 14:46:47 2004 UTC
# Line 22  Line 22 
22    
23  #include "lscpserver.h"  #include "lscpserver.h"
24  #include "lscpresultset.h"  #include "lscpresultset.h"
25    #include "lscpevent.h"
26    
27  #include "../engines/gig/Engine.h"  #include "../engines/gig/Engine.h"
28  #include "../audiodriver/AudioOutputDeviceFactory.h"  #include "../drivers/audio/AudioOutputDeviceFactory.h"
29  #include "../mididriver/MidiInputDeviceFactory.h"  #include "../drivers/midi/MidiInputDeviceFactory.h"
30    
31    /**
32     * Below are a few static members of the LSCPServer class.
33     * The big assumption here is that LSCPServer is going to remain a singleton.
34     * These members are used to support client connections.
35     * Class handles multiple connections at the same time using select() and non-blocking recv()
36     * Commands are processed by a single LSCPServer thread.
37     * Notifications are delivered either by the thread that originated them
38     * or (if the resultset is currently in progress) by the LSCPServer thread
39     * after the resultset was sent out.
40     * This makes sure that resultsets can not be interrupted by notifications.
41     * This also makes sure that the thread sending notification is not blocked
42     * by the LSCPServer thread.
43     */
44    fd_set LSCPServer::fdSet;
45    int LSCPServer::currentSocket = -1;
46    std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();
47    std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();
48    std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();
49    std::map< LSCPEvent::event_t, std::list<int> > LSCPServer::eventSubscriptions = std::map< LSCPEvent::event_t, std::list<int> >();
50    Mutex LSCPServer::NotifyMutex = Mutex();
51    Mutex LSCPServer::NotifyBufferMutex = Mutex();
52    Mutex LSCPServer::SubscriptionMutex = Mutex();
53    
54  LSCPServer::LSCPServer(Sampler* pSampler) : Thread(false, 0, -4) {  LSCPServer::LSCPServer(Sampler* pSampler) : Thread(false, 0, -4) {
55      this->pSampler = pSampler;      this->pSampler = pSampler;
56        LSCPEvent::RegisterEvent(LSCPEvent::event_channels, "CHANNELS");
57        LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT");
58        LSCPEvent::RegisterEvent(LSCPEvent::event_stream_count, "STREAM_COUNT");
59        LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL");
60        LSCPEvent::RegisterEvent(LSCPEvent::event_info, "INFO");
61        LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
62    }
63    
64    /**
65     * Blocks the calling thread until the LSCP Server is initialized and
66     * accepting socket connections, if the server is already initialized then
67     * this method will return immediately.
68     * @param TimeoutSeconds     - optional: max. wait time in seconds
69     *                             (default: 0s)
70     * @param TimeoutNanoSeconds - optional: max wait time in nano seconds
71     *                             (default: 0ns)
72     * @returns  0 on success, a value less than 0 if timeout exceeded
73     */
74    int LSCPServer::WaitUntilInitialized(long TimeoutSeconds, long TimeoutNanoSeconds) {
75        return Initialized.WaitAndUnlockIf(false, TimeoutSeconds, TimeoutNanoSeconds);
76  }  }
77    
78  int LSCPServer::Main() {  int LSCPServer::Main() {
79      hSocket = socket(AF_INET, SOCK_STREAM, 0);      int hSocket = socket(AF_INET, SOCK_STREAM, 0);
80      if (hSocket < 0) {      if (hSocket < 0) {
81          std::cerr << "LSCPServer: Could not create server socket." << std::endl;          std::cerr << "LSCPServer: Could not create server socket." << std::endl;
82          //return -1;          //return -1;
# Line 51  int LSCPServer::Main() { Line 95  int LSCPServer::Main() {
95      }      }
96    
97      listen(hSocket, 1);      listen(hSocket, 1);
98      dmsg(1,("LSCPServer: Server running.\n")); // server running      Initialized.Set(true);
99    
100      // now wait for client connections and handle their requests      // now wait for client connections and handle their requests
101      sockaddr_in client;      sockaddr_in client;
102      int length = sizeof(client);      int length = sizeof(client);
103        FD_ZERO(&fdSet);
104        FD_SET(hSocket, &fdSet);
105        int maxSessions = hSocket;
106    
107      while (true) {      while (true) {
108          hSession = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);          fd_set selectSet = fdSet;
109          if (hSession < 0) {          int retval = select(maxSessions+1, &selectSet, NULL, NULL, NULL);
110              std::cerr << "LSCPServer: Client connection failed." << std::endl;          if (retval == 0)
111              close(hSocket);                  continue; //Nothing try again
112              //return -1;          if (retval == -1) {
113              exit(EXIT_FAILURE);                  std::cerr << "LSCPServer: Socket select error." << std::endl;
114          }                  close(hSocket);
115                    exit(EXIT_FAILURE);
116          dmsg(1,("LSCPServer: Client connection established.\n"));          }
117          //send(hSession, "Welcome!\r\n", 10, 0);  
118            //Accept new connections now (if any)
119          // Parser invocation          if (FD_ISSET(hSocket, &selectSet)) {
120          yyparse_param_t yyparse_param;                  int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);
121          yyparse_param.pServer = this;                  if (socket < 0) {
122          yylex_init(&yyparse_param.pScanner);                          std::cerr << "LSCPServer: Client connection failed." << std::endl;
123          while (yyparse(&yyparse_param) == LSCP_SYNTAX_ERROR); // recall parser in case of syntax error                          exit(EXIT_FAILURE);
124          yylex_destroy(yyparse_param.pScanner);                  }
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          close(hSession);          //Now let's deliver late notifies (if any)
170          dmsg(1,("LSCPServer: Client connection terminated.\n"));          NotifyBufferMutex.Lock();
171            for (std::map<int,String>::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) {
172                    send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), 0);
173                    bufferedNotifies.erase(iterNotify);
174            }
175            NotifyBufferMutex.Unlock();
176      }      }
177  }  }
178    
179    void LSCPServer::CloseConnection( std::vector<yyparse_param_t>::iterator iter ) {
180            int socket = (*iter).hSession;
181            dmsg(1,("LSCPServer: Client connection terminated on socket:%d.\n",socket));
182            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));
183            Sessions.erase(iter);
184            FD_CLR(socket,  &fdSet);
185            SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)
186            for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {
187                    iter->second.remove(socket);
188            }
189            SubscriptionMutex.Unlock();
190            NotifyMutex.Lock();
191            bufferedCommands.erase(socket);
192            bufferedNotifies.erase(socket);
193            close(socket);
194            NotifyMutex.Unlock();
195    }
196    
197    void LSCPServer::SendLSCPNotify( LSCPEvent event ) {
198            SubscriptionMutex.Lock();
199            if (eventSubscriptions.count(event.GetType()) == 0) {
200                    SubscriptionMutex.Unlock();     //Nobody is subscribed to this event
201                    return;
202            }
203            std::list<int>::iterator iter = eventSubscriptions[event.GetType()].begin();
204            std::list<int>::iterator end = eventSubscriptions[event.GetType()].end();
205            String notify = event.Produce();
206    
207            while (true) {
208                    if (NotifyMutex.Trylock()) {
209                            for(;iter != end; iter++)
210                                    send(*iter, notify.c_str(), notify.size(), 0);
211                            NotifyMutex.Unlock();
212                            break;
213                    } else {
214                            if (NotifyBufferMutex.Trylock()) {
215                                    for(;iter != end; iter++)
216                                            bufferedNotifies[*iter] += notify;
217                                    NotifyBufferMutex.Unlock();
218                                    break;
219                            }
220                    }
221            }
222            SubscriptionMutex.Unlock();
223    }
224    
225    extern int GetLSCPCommand( void *buf, int max_size ) {
226            String command = LSCPServer::bufferedCommands[LSCPServer::currentSocket];
227            if (command.size() == 0) {              //Parser wants input but we have nothing.
228                    strcpy((char*) buf, "\n");      //So give it an empty command
229                    return 1;                       //to keep it happy.
230            }
231    
232            if (max_size < command.size()) {
233                    std::cerr << "getLSCPCommand: Flex buffer too small, ignoring the command." << std::endl;
234                    return 0;       //This will never happen
235            }
236    
237            strcpy((char*) buf, command.c_str());
238            LSCPServer::bufferedCommands.erase(LSCPServer::currentSocket);
239            return command.size();
240    }
241    
242    /**
243     * Will be called to try to read the command from the socket
244     * If command is read, it will return true. Otherwise false is returned.
245     * In any case the received portion (complete or incomplete) is saved into bufferedCommand map.
246     */
247    bool LSCPServer::GetLSCPCommand( std::vector<yyparse_param_t>::iterator iter ) {
248            int socket = (*iter).hSession;
249            char c;
250            int i = 0;
251            while (true) {
252                    int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now
253                    if (result == 0) { //socket was selected, so 0 here means client has closed the connection
254                            CloseConnection(iter);
255                            break;
256                    }
257                    if (result == 1) {
258                            if (c == '\r')
259                                    continue; //Ignore CR
260                            if (c == '\n') {
261                                    LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));
262                                    bufferedCommands[socket] += "\n";
263                                    return true; //Complete command was read
264                            }
265                            bufferedCommands[socket] += c;
266                    }
267                    if (result == -1) {
268                            if (errno == EAGAIN) //Would block, try again later.
269                                    return false;
270                            switch(errno) {
271                                    case EBADF:
272                                            dmsg(2,("LSCPScanner: The argument s is an invalid descriptor.\n"));
273                                            break;
274                                    case ECONNREFUSED:
275                                            dmsg(2,("LSCPScanner: A remote host refused to allow the network connection (typically because it is not running the requested service).\n"));
276                                            break;
277                                    case ENOTCONN:
278                                            dmsg(2,("LSCPScanner: The socket is associated with a connection-oriented protocol and has not been connected (see connect(2) and accept(2)).\n"));
279                                            break;
280                                    case ENOTSOCK:
281                                            dmsg(2,("LSCPScanner: The argument s does not refer to a socket.\n"));
282                                            break;
283                                    case EAGAIN:
284                                            dmsg(2,("LSCPScanner: The socket is marked non-blocking and the receive operation would block, or a receive timeout had been set and the timeout expired before data was received.\n"));
285                                            break;
286                                    case EINTR:
287                                            dmsg(2,("LSCPScanner: The receive was interrupted by delivery of a signal before any data were available.\n"));
288                                            break;
289                                    case EFAULT:
290                                            dmsg(2,("LSCPScanner: The receive buffer pointer(s) point outside the process's address space.\n"));
291                                            break;
292                                    case EINVAL:
293                                            dmsg(2,("LSCPScanner: Invalid argument passed.\n"));
294                                            break;
295                                    case ENOMEM:
296                                            dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));
297                                            break;
298                                    default:
299                                            dmsg(2,("LSCPScanner: Unknown recv() error.\n"));
300                                            break;
301                            }
302                            CloseConnection(iter);
303                            break;
304                    }
305            }
306            return false;
307    }
308    
309  /**  /**
310   * Will be called by the parser whenever it wants to send an answer to the   * Will be called by the parser whenever it wants to send an answer to the
311   * client / frontend.   * client / frontend.
# Line 88  int LSCPServer::Main() { Line 314  int LSCPServer::Main() {
314   */   */
315  void LSCPServer::AnswerClient(String ReturnMessage) {  void LSCPServer::AnswerClient(String ReturnMessage) {
316      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));
317      send(hSession, ReturnMessage.c_str(), ReturnMessage.size(), 0);      if (currentSocket != -1) {
318                NotifyMutex.Lock();
319                send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), 0);
320                NotifyMutex.Unlock();
321        }
322  }  }
323    
324  /**  /**
# Line 160  String LSCPServer::DestroyAudioOutputDev Line 390  String LSCPServer::DestroyAudioOutputDev
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 175  String LSCPServer::DestroyMidiInputDevic Line 405  String LSCPServer::DestroyMidiInputDevic
405      LSCPResultSet result;      LSCPResultSet result;
406      try {      try {
407          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          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];          MidiInputDevice* pDevice = devices[DeviceIndex];
         if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");  
410          pSampler->DestroyMidiInputDevice(pDevice);          pSampler->DestroyMidiInputDevice(pDevice);
411      }      }
412      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 196  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          if (pSamplerChannel->GetAudioOutputDevice() == NULL)          if (!pSamplerChannel->GetAudioOutputDevice())
430              throw LinuxSamplerException("No audio output device on channel");              throw LinuxSamplerException("No audio output device on channel");
431          if (bBackground) {          if (bBackground) {
432              LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);              LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);
# Line 241  String LSCPServer::GetChannels() { Line 471  String LSCPServer::GetChannels() {
471  }  }
472    
473  /**  /**
474     * Will be called by the parser to get the list of sampler channels.
475     */
476    String LSCPServer::ListChannels() {
477        dmsg(2,("LSCPServer: ListChannels()\n"));
478        String list;
479        std::map<uint,SamplerChannel*> channels = pSampler->GetSamplerChannels();
480        std::map<uint,SamplerChannel*>::iterator iter = channels.begin();
481        for (; iter != channels.end(); iter++) {
482            if (list != "") list += ",";
483            list += ToString(iter->first);
484        }
485        LSCPResultSet result;
486        result.Add(list);
487        return result.Produce();
488    }
489    
490    /**
491   * Will be called by the parser to add a sampler channel.   * Will be called by the parser to add a sampler channel.
492   */   */
493  String LSCPServer::AddChannel() {  String LSCPServer::AddChannel() {
# Line 278  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 304  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);
# Line 323  String LSCPServer::GetChannelInfo(uint u Line 577  String LSCPServer::GetChannelInfo(uint u
577    
578          //Some not-so-hardcoded stuff to make GUI look good          //Some not-so-hardcoded stuff to make GUI look good
579          result.Add("AUDIO_OUTPUT_DEVICE", GetAudioOutputDeviceIndex(pSamplerChannel->GetAudioOutputDevice()));          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()));          result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice()));
584          result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());          result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());
585          result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());          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);
# Line 497  String LSCPServer::GetMidiInputDriverPar Line 752  String LSCPServer::GetMidiInputDriverPar
752          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    pParameter->Mandatory());
753          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
754          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
755          if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());          if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());
756          if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());          if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());
757          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
758          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
759          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
760      }      }
761      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
762          result.Error(e);          result.Error(e);
# Line 519  String LSCPServer::GetAudioOutputDriverP Line 774  String LSCPServer::GetAudioOutputDriverP
774          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    pParameter->Mandatory());
775          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
776          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
777          if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());          if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());
778          if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());          if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());
779          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
780          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
781          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
782      }      }
783      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
784          result.Error(e);          result.Error(e);
# Line 600  String LSCPServer::GetAudioOutputDeviceI Line 855  String LSCPServer::GetAudioOutputDeviceI
855      LSCPResultSet result;      LSCPResultSet result;
856      try {      try {
857          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
858          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) + ".");
859          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
860          result.Add("driver", pDevice->Driver());          result.Add("DRIVER", pDevice->Driver());
861          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
862          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
863          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 620  String LSCPServer::GetMidiInputDeviceInf Line 875  String LSCPServer::GetMidiInputDeviceInf
875      LSCPResultSet result;      LSCPResultSet result;
876      try {      try {
877          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
878            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
879          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
880          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");          result.Add("DRIVER", pDevice->Driver());
         result.Add("driver", pDevice->Driver());  
881          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
882          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
883          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 638  String LSCPServer::GetMidiInputPortInfo( Line 893  String LSCPServer::GetMidiInputPortInfo(
893      dmsg(2,("LSCPServer: GetMidiInputPortInfo(DeviceIndex=%d, PortIndex=%d)\n",DeviceIndex, PortIndex));      dmsg(2,("LSCPServer: GetMidiInputPortInfo(DeviceIndex=%d, PortIndex=%d)\n",DeviceIndex, PortIndex));
894      LSCPResultSet result;      LSCPResultSet result;
895      try {      try {
896            // get MIDI input device
897          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
898            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
899          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
900          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");  
901          MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);          // get MIDI port
902          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");          MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
903          std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
904          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();  
905            // return the values of all MIDI port parameters
906            std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
907            std::map<String,DeviceRuntimeParameter*>::iterator iter = parameters.begin();
908          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
909              result.Add(iter->first, iter->second->Value());              result.Add(iter->first, iter->second->Value());
910          }          }
# Line 661  String LSCPServer::GetAudioOutputChannel Line 921  String LSCPServer::GetAudioOutputChannel
921      try {      try {
922          // get audio output device          // get audio output device
923          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
924          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) + ".");
925          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
926    
927          // get audio channel          // get audio channel
# Line 681  String LSCPServer::GetAudioOutputChannel Line 941  String LSCPServer::GetAudioOutputChannel
941      return result.Produce();      return result.Produce();
942  }  }
943    
944    String LSCPServer::GetMidiInputPortParameterInfo(uint DeviceId, uint PortId, String ParameterName) {
945        dmsg(2,("LSCPServer: GetMidiInputPortParameterInfo(DeviceId=%d,PortId=%d,ParameterName=%s)\n",DeviceId,PortId,ParameterName.c_str()));
946        LSCPResultSet result;
947        try {
948            // get MIDI input device
949            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
950            if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");
951            MidiInputDevice* pDevice = devices[DeviceId];
952    
953            // get midi port
954            MidiInputPort* pPort = pDevice->GetPort(PortId);
955            if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");
956    
957            // get desired port parameter
958            std::map<String,DeviceRuntimeParameter*> parameters = pPort->PortParameters();
959            if (!parameters.count(ParameterName)) throw LinuxSamplerException("Midi port does not provide a parameter '" + ParameterName + "'.");
960            DeviceRuntimeParameter* pParameter = parameters[ParameterName];
961    
962            // return all fields of this audio channel parameter
963            result.Add("TYPE",         pParameter->Type());
964            result.Add("DESCRIPTION",  pParameter->Description());
965            result.Add("FIX",          pParameter->Fix());
966            result.Add("MULTIPLICITY", pParameter->Multiplicity());
967            if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
968            if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
969            if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
970        }
971        catch (LinuxSamplerException e) {
972            result.Error(e);
973        }
974        return result.Produce();
975    }
976    
977  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {
978      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()));
979      LSCPResultSet result;      LSCPResultSet result;
980      try {      try {
981          // get audio output device          // get audio output device
982          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
983          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) + ".");
984          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
985    
986          // get audio channel          // get audio channel
# Line 696  String LSCPServer::GetAudioOutputChannel Line 989  String LSCPServer::GetAudioOutputChannel
989    
990          // get desired audio channel parameter          // get desired audio channel parameter
991          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
992          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 + "'.");
993          DeviceRuntimeParameter* pParameter = parameters[ParameterName];          DeviceRuntimeParameter* pParameter = parameters[ParameterName];
994    
995          // return all fields of this audio channel parameter          // return all fields of this audio channel parameter
# Line 704  String LSCPServer::GetAudioOutputChannel Line 997  String LSCPServer::GetAudioOutputChannel
997          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
998          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
999          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
1000          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
1001          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
1002          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
1003      }      }
1004      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1005          result.Error(e);          result.Error(e);
# Line 720  String LSCPServer::SetAudioOutputChannel Line 1013  String LSCPServer::SetAudioOutputChannel
1013      try {      try {
1014          // get audio output device          // get audio output device
1015          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1016          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) + ".");
1017          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
1018    
1019          // get audio channel          // get audio channel
# Line 729  String LSCPServer::SetAudioOutputChannel Line 1022  String LSCPServer::SetAudioOutputChannel
1022    
1023          // get desired audio channel parameter          // get desired audio channel parameter
1024          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
1025          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 + "'.");
1026          DeviceRuntimeParameter* pParameter = parameters[ParamKey];          DeviceRuntimeParameter* pParameter = parameters[ParamKey];
1027    
1028          // set new channel parameter value          // set new channel parameter value
# Line 746  String LSCPServer::SetAudioOutputDeviceP Line 1039  String LSCPServer::SetAudioOutputDeviceP
1039      LSCPResultSet result;      LSCPResultSet result;
1040      try {      try {
1041          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1042          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) + ".");
1043          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
1044          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1045          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 + "'");
1046          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1047      }      }
1048      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 763  String LSCPServer::SetMidiInputDevicePar Line 1056  String LSCPServer::SetMidiInputDevicePar
1056      LSCPResultSet result;      LSCPResultSet result;
1057      try {      try {
1058          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1059          if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");          if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1060          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
1061          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1062          if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");          if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
1063          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1064      }      }
1065      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 779  String LSCPServer::SetMidiInputPortParam Line 1072  String LSCPServer::SetMidiInputPortParam
1072      dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));      dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
1073      LSCPResultSet result;      LSCPResultSet result;
1074      try {      try {
1075            // get MIDI input device
1076          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1077            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1078          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
1079          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");  
1080          MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);          // get MIDI port
1081          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");          MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
1082          std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
1083          if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");  
1084            // set port parameter value
1085            std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
1086            if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
1087          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1088      }      }
1089      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 800  String LSCPServer::SetMidiInputPortParam Line 1098  String LSCPServer::SetMidiInputPortParam
1098   */   */
1099  String LSCPServer::SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel) {
1100      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));
1101      return "ERR:0:Not implemented yet.\r\n"; //FIXME: Add support for this in resultset class?      LSCPResultSet result;
1102        try {
1103            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1104            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1105            Engine* pEngine = pSamplerChannel->GetEngine();
1106            if (!pEngine) throw LinuxSamplerException("No engine deployed on sampler channel " + ToString(uiSamplerChannel));
1107            pEngine->SetOutputChannel(ChannelAudioOutputChannel, AudioOutputDeviceInputChannel);
1108        }
1109        catch (LinuxSamplerException e) {
1110             result.Error(e);
1111        }
1112        return result.Produce();
1113  }  }
1114    
1115  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {
# Line 810  String LSCPServer::SetAudioOutputDevice( Line 1119  String LSCPServer::SetAudioOutputDevice(
1119          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1120          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1121          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1122            if (!devices.count(AudioDeviceId)) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));
1123          AudioOutputDevice* pDevice = devices[AudioDeviceId];          AudioOutputDevice* pDevice = devices[AudioDeviceId];
         if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));  
1124          pSamplerChannel->SetAudioOutputDevice(pDevice);          pSamplerChannel->SetAudioOutputDevice(pDevice);
1125      }      }
1126      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 828  String LSCPServer::SetAudioOutputType(St Line 1137  String LSCPServer::SetAudioOutputType(St
1137          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1138          // Driver type name aliasing...          // Driver type name aliasing...
1139          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";
1140          if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";                  if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";
1141          // Check if there's one audio output device already created          // Check if there's one audio output device already created
1142          // for the intended audio driver type (AudioOutputDriver)...          // for the intended audio driver type (AudioOutputDriver)...
1143          AudioOutputDevice *pDevice = NULL;          AudioOutputDevice *pDevice = NULL;
# Line 877  String LSCPServer::SetMIDIInputChannel(u Line 1186  String LSCPServer::SetMIDIInputChannel(u
1186      try {      try {
1187          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1188          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1189          pSamplerChannel->SetMidiInputChannel((MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);          pSamplerChannel->SetMidiInputChannel((MidiInputPort::midi_chan_t) MIDIChannel);
1190      }      }
1191      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1192           result.Error(e);           result.Error(e);
# Line 892  String LSCPServer::SetMIDIInputDevice(ui Line 1201  String LSCPServer::SetMIDIInputDevice(ui
1201          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1202          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1203          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1204            if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1205          MidiInputDevice* pDevice = devices[MIDIDeviceId];          MidiInputDevice* pDevice = devices[MIDIDeviceId];
         if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));  
1206          pSamplerChannel->SetMidiInputDevice(pDevice);          pSamplerChannel->SetMidiInputDevice(pDevice);
1207      }      }
1208      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 927  String LSCPServer::SetMIDIInputType(Stri Line 1236  String LSCPServer::SetMIDIInputType(Stri
1236              pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);              pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);
1237              // Make it with at least one initial port.              // Make it with at least one initial port.
1238              std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();              std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1239              parameters["ports"]->SetValue("1");              parameters["PORTS"]->SetValue("1");
1240          }          }
1241          // Must have a device...          // Must have a device...
1242          if (pDevice == NULL)          if (pDevice == NULL)
# Line 952  String LSCPServer::SetMIDIInput(uint MID Line 1261  String LSCPServer::SetMIDIInput(uint MID
1261          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1262          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1263          std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();          std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();
1264            if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1265          MidiInputDevice* pDevice = devices[MIDIDeviceId];          MidiInputDevice* pDevice = devices[MIDIDeviceId];
1266          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));          pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputPort::midi_chan_t) MIDIChannel);
         pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);  
1267      }      }
1268      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1269           result.Error(e);           result.Error(e);
# Line 966  String LSCPServer::SetMIDIInput(uint MID Line 1275  String LSCPServer::SetMIDIInput(uint MID
1275   * 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
1276   * particular sampler channel.   * particular sampler channel.
1277   */   */
1278  String LSCPServer::SetVolume(double Volume, uint uiSamplerChannel) {  String LSCPServer::SetVolume(double dVolume, uint uiSamplerChannel) {
1279      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", Volume, uiSamplerChannel));      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", dVolume, uiSamplerChannel));
1280      LSCPResultSet result;      LSCPResultSet result;
1281      try {      try {
1282          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1283          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
1284          Engine* pEngine = pSamplerChannel->GetEngine();          Engine* pEngine = pSamplerChannel->GetEngine();
1285          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
1286          pEngine->Volume(Volume);          pEngine->Volume(dVolume);
1287      }      }
1288      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1289           result.Error(e);           result.Error(e);
# Line 1002  String LSCPServer::ResetChannel(uint uiS Line 1311  String LSCPServer::ResetChannel(uint uiS
1311  }  }
1312    
1313  /**  /**
1314     * Will be called by the parser to reset the whole sampler.
1315     */
1316    String LSCPServer::ResetSampler() {
1317        dmsg(2,("LSCPServer: ResetSampler()\n"));
1318        pSampler->Reset();
1319        LSCPResultSet result;
1320        return result.Produce();
1321    }
1322    
1323    /**
1324   * 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
1325   * server for receiving event messages.   * server for receiving event messages.
1326   */   */
1327  String LSCPServer::SubscribeNotification(event_t Event) {  String LSCPServer::SubscribeNotification(LSCPEvent::event_t type) {
1328      dmsg(2,("LSCPServer: SubscribeNotification(Event=%d)\n", Event));      dmsg(2,("LSCPServer: SubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
1329      return "ERR:0:Not implemented yet.\r\n";      LSCPResultSet result;
1330        SubscriptionMutex.Lock();
1331        eventSubscriptions[type].push_back(currentSocket);
1332        SubscriptionMutex.Unlock();
1333        return result.Produce();
1334  }  }
1335    
1336  /**  /**
1337   * 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
1338   * for not receiving further event messages.   * for not receiving further event messages.
1339   */   */
1340  String LSCPServer::UnsubscribeNotification(event_t Event) {  String LSCPServer::UnsubscribeNotification(LSCPEvent::event_t type) {
1341      dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%d)\n", Event));      dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
1342      return "ERR:0:Not implemented yet.\r\n";      LSCPResultSet result;
1343        SubscriptionMutex.Lock();
1344        eventSubscriptions[type].remove(currentSocket);
1345        SubscriptionMutex.Unlock();
1346        return result.Produce();
1347  }  }
1348    
1349    /**
1350     * Will be called by the parser to enable or disable echo mode; if echo
1351     * mode is enabled, all commands from the client will (immediately) be
1352     * echoed back to the client.
1353     */
1354    String LSCPServer::SetEcho(yyparse_param_t* pSession, double boolean_value) {
1355        dmsg(2,("LSCPServer: SetEcho(val=%f)\n", boolean_value));
1356        LSCPResultSet result;
1357        try {
1358            if      (boolean_value == 0) pSession->bVerbose = false;
1359            else if (boolean_value == 1) pSession->bVerbose = true;
1360            else throw LinuxSamplerException("Not a boolean value, must either be 0 or 1");
1361        }
1362        catch (LinuxSamplerException e) {
1363             result.Error(e);
1364        }
1365        return result.Produce();
1366    }
1367    
1368  // Instrument loader constructor.  // Instrument loader constructor.
1369  LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)  LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)
Legend:
Removed from v.159  
changed lines
  Added in v.225
  ViewVC Help
Powered by ViewVC