/[svn]/linuxsampler/trunk/src/network/lscpserver.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/network/lscpserver.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 133 by capela, Fri Jun 18 14:29:02 2004 UTC revision 170 by senkov, Sat Jul 3 20:08:07 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 "../audiodriver/AudioOutputDeviceFactory.h"
29    #include "../mididriver/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<int> LSCPServer::hSessions = std::vector<int>();
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  int LSCPServer::Main() {  int LSCPServer::Main() {
65      hSocket = socket(AF_INET, SOCK_STREAM, 0);      int hSocket = socket(AF_INET, SOCK_STREAM, 0);
66      if (hSocket < 0) {      if (hSocket < 0) {
67          std::cerr << "LSCPServer: Could not create server socket." << std::endl;          std::cerr << "LSCPServer: Could not create server socket." << std::endl;
68          //return -1;          //return -1;
# Line 55  int LSCPServer::Main() { Line 86  int LSCPServer::Main() {
86      // now wait for client connections and handle their requests      // now wait for client connections and handle their requests
87      sockaddr_in client;      sockaddr_in client;
88      int length = sizeof(client);      int length = sizeof(client);
89        struct timeval tv;
90        tv.tv_sec = 30;
91        tv.tv_usec = 0;
92        FD_ZERO(&fdSet);
93        FD_SET(hSocket, &fdSet);
94        int maxSessions = hSocket;
95    
96        // Parser initialization
97        yyparse_param_t yyparse_param;
98        yyparse_param.pServer = this;
99    
100      while (true) {      while (true) {
101          hSession = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);          fd_set selectSet = fdSet;
102          if (hSession < 0) {          int retval = select(maxSessions+1, &selectSet, NULL, NULL, &tv);
103              std::cerr << "LSCPServer: Client connection failed." << std::endl;          if (retval == 0)
104              close(hSocket);                  continue; //Nothing in 30 seconds, try again
105              //return -1;          if (retval == -1) {
106              exit(EXIT_FAILURE);                  std::cerr << "LSCPServer: Socket select error." << std::endl;
107          }                  close(hSocket);
108                    exit(EXIT_FAILURE);
109          dmsg(1,("LSCPServer: Client connection established.\n"));          }
110          //send(hSession, "Welcome!\r\n", 10, 0);          
111            //Accept new connections now (if any)
112          // Parser invocation          if (FD_ISSET(hSocket, &selectSet)) {
113          yyparse_param_t yyparse_param;                  int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);
114          yyparse_param.pServer = this;                  if (socket < 0) {
115          yylex_init(&yyparse_param.pScanner);                          std::cerr << "LSCPServer: Client connection failed." << std::endl;
116          while (yyparse(&yyparse_param) == LSCP_SYNTAX_ERROR); // recall parser in case of syntax error                          exit(EXIT_FAILURE);
117          yylex_destroy(yyparse_param.pScanner);                  }
118    
119                    if (fcntl(socket, F_SETFL, O_NONBLOCK)) {
120                            std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;
121                            exit(EXIT_FAILURE);
122                    }
123    
124                    hSessions.push_back(socket);
125                    FD_SET(socket, &fdSet);
126                    if (socket > maxSessions)
127                            maxSessions = socket;
128                    dmsg(1,("LSCPServer: Client connection established on socket:%d.\n", socket));
129                    LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection established on socket", socket));
130                    continue; //Maybe this was the only selected socket, better select again
131            }
132    
133            //Something was selected and it was not the hSocket, so it must be some command(s) coming.
134            for (std::vector<int>::iterator iter = hSessions.begin(); iter !=  hSessions.end(); iter++) {
135                    if (FD_ISSET(*iter, &selectSet)) {      //Was it this socket?
136                            if (GetLSCPCommand(iter)) {     //Have we read the entire command?
137                                    dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));
138                                    yylex_init(&yyparse_param.pScanner);
139                                    currentSocket = *iter;  //a hack
140                                    int result = yyparse(&yyparse_param);
141                                    currentSocket = -1;     //continuation of a hack
142                                    dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
143                                    if (result == LSCP_QUIT) { //Was it a quit command by any chance?
144                                            CloseConnection(iter);
145                                    }
146                            }
147                            //socket may have been closed, iter may be invalid, get out of the loop for now.
148                            //we'll be back if there is data.
149                            break;
150                    }
151            }
152    
153          close(hSession);          //Now let's deliver late notifies (if any)
154          dmsg(1,("LSCPServer: Client connection terminated.\n"));          NotifyBufferMutex.Lock();
155            for (std::map<int,String>::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) {
156                    send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), 0);
157                    bufferedNotifies.erase(iterNotify);
158            }
159            NotifyBufferMutex.Unlock();
160      }      }
161        //It will never get here anyway
162        //yylex_destroy(yyparse_param.pScanner);
163    }
164    
165    void LSCPServer::CloseConnection( std::vector<int>::iterator iter ) {
166            int socket = *iter;
167            dmsg(1,("LSCPServer: Client connection terminated on socket:%d.\n",socket));
168            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));
169            hSessions.erase(iter);
170            FD_CLR(socket,  &fdSet);
171            SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)
172            for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {
173                    iter->second.remove(socket);
174            }
175            SubscriptionMutex.Unlock();
176            NotifyMutex.Lock();
177            bufferedCommands.erase(socket);
178            bufferedNotifies.erase(socket);
179            close(socket);
180            NotifyMutex.Unlock();
181    }
182    
183    void LSCPServer::SendLSCPNotify( LSCPEvent event ) {
184            SubscriptionMutex.Lock();
185            if (eventSubscriptions.count(event.GetType()) == 0) {
186                    SubscriptionMutex.Unlock();     //Nobody is subscribed to this event
187                    return;
188            }
189            std::list<int>::iterator iter = eventSubscriptions[event.GetType()].begin();
190            std::list<int>::iterator end = eventSubscriptions[event.GetType()].end();
191            String notify = event.Produce();
192    
193            while (true) {
194                    if (NotifyMutex.Trylock()) {
195                            for(;iter != end; iter++)
196                                    send(*iter, notify.c_str(), notify.size(), 0);
197                            NotifyMutex.Unlock();
198                            break;
199                    } else {
200                            if (NotifyBufferMutex.Trylock()) {
201                                    for(;iter != end; iter++)
202                                            bufferedNotifies[*iter] += notify;
203                                    NotifyBufferMutex.Unlock();
204                                    break;
205                            }
206                    }
207            }
208            SubscriptionMutex.Unlock();
209    }
210    
211    extern int GetLSCPCommand( void *buf, int max_size ) {
212            String command = LSCPServer::bufferedCommands[LSCPServer::currentSocket];
213            if (command.size() == 0) {              //Parser wants input but we have nothing.
214                    strcpy((char*) buf, "\n");      //So give it an empty command
215                    return 1;                       //to keep it happy.
216            }
217    
218            if (max_size < command.size()) {
219                    std::cerr << "getLSCPCommand: Flex buffer too small, ignoring the command." << std::endl;
220                    return 0;       //This will never happen
221            }
222    
223            strcpy((char*) buf, command.c_str());
224            LSCPServer::bufferedCommands.erase(LSCPServer::currentSocket);
225            return command.size();
226    }
227    
228    /**
229     * Will be called to try to read the command from the socket
230     * If command is read, it will return true. Otherwise false is returned.
231     * In any case the received portion (complete or incomplete) is saved into bufferedCommand map.
232     */
233    bool LSCPServer::GetLSCPCommand( std::vector<int>::iterator iter ) {
234            int socket = *iter;
235            char c;
236            int i = 0;
237            while (true) {
238                    int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now
239                    if (result == 0) { //socket was selected, so 0 here means client has closed the connection
240                            CloseConnection(iter);
241                            break;
242                    }
243                    if (result == 1) {
244                            if (c == '\r')
245                                    continue; //Ignore CR
246                            if (c == '\n') {
247                                    bufferedCommands[socket] += "\n";
248                                    return true; //Complete command was read
249                            }
250                            bufferedCommands[socket] += c;
251                    }
252                    if (result == -1) {
253                            if (errno == EAGAIN) //Would block, try again later.
254                                    return false;
255                            switch(errno) {
256                                    case EBADF:
257                                            dmsg(2,("LSCPScanner: The argument s is an invalid descriptor.\n"));
258                                            break;
259                                    case ECONNREFUSED:
260                                            dmsg(2,("LSCPScanner: A remote host refused to allow the network connection (typically because it is not running the requested service).\n"));
261                                            break;
262                                    case ENOTCONN:
263                                            dmsg(2,("LSCPScanner: The socket is associated with a connection-oriented protocol and has not been connected (see connect(2) and accept(2)).\n"));
264                                            break;
265                                    case ENOTSOCK:
266                                            dmsg(2,("LSCPScanner: The argument s does not refer to a socket.\n"));
267                                            break;
268                                    case EAGAIN:
269                                            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"));
270                                            break;
271                                    case EINTR:
272                                            dmsg(2,("LSCPScanner: The receive was interrupted by delivery of a signal before any data were available.\n"));
273                                            break;
274                                    case EFAULT:
275                                            dmsg(2,("LSCPScanner: The receive buffer pointer(s) point outside the process's address space.\n"));
276                                            break;
277                                    case EINVAL:
278                                            dmsg(2,("LSCPScanner: Invalid argument passed.\n"));
279                                            break;
280                                    case ENOMEM:
281                                            dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));
282                                            break;
283                                    default:
284                                            dmsg(2,("LSCPScanner: Unknown recv() error.\n"));
285                                            break;
286                            }
287                            CloseConnection(iter);
288                            break;
289                    }
290            }
291            return false;
292  }  }
293    
294  /**  /**
# Line 87  int LSCPServer::Main() { Line 299  int LSCPServer::Main() {
299   */   */
300  void LSCPServer::AnswerClient(String ReturnMessage) {  void LSCPServer::AnswerClient(String ReturnMessage) {
301      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));
302      send(hSession, ReturnMessage.c_str(), ReturnMessage.size(), 0);      if (currentSocket != -1) {
303                NotifyMutex.Lock();
304                send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), 0);
305                NotifyMutex.Unlock();
306        }
307    }
308    
309    /**
310     * Find a created audio output device index.
311     */
312    int LSCPServer::GetAudioOutputDeviceIndex ( AudioOutputDevice *pDevice )
313    {
314        // Search for the created device to get its index
315        std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
316        std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
317        for (; iter != devices.end(); iter++) {
318            if (iter->second == pDevice)
319                return iter->first;
320        }
321        // Not found.
322        return -1;
323    }
324    
325    /**
326     * Find a created midi input device index.
327     */
328    int LSCPServer::GetMidiInputDeviceIndex ( MidiInputDevice *pDevice )
329    {
330        // Search for the created device to get its index
331        std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
332        std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
333        for (; iter != devices.end(); iter++) {
334            if (iter->second == pDevice)
335                return iter->first;
336        }
337        // Not found.
338        return -1;
339  }  }
340    
341  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 343  String LSCPServer::CreateAudioOutputDevi
343      LSCPResultSet result;      LSCPResultSet result;
344      try {      try {
345          AudioOutputDevice* pDevice = pSampler->CreateAudioOutputDevice(Driver, Parameters);          AudioOutputDevice* pDevice = pSampler->CreateAudioOutputDevice(Driver, Parameters);
         std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();  
346          // search for the created device to get its index          // search for the created device to get its index
347          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;  
             }  
         }  
348          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.");
349          result = index; // success          result = index; // success
350      }      }
# Line 114  String LSCPServer::CreateAudioOutputDevi Line 354  String LSCPServer::CreateAudioOutputDevi
354      return result.Produce();      return result.Produce();
355  }  }
356    
357    String LSCPServer::CreateMidiInputDevice(String Driver, std::map<String,String> Parameters) {
358        dmsg(2,("LSCPServer: CreateMidiInputDevice(Driver=%s)\n", Driver.c_str()));
359        LSCPResultSet result;
360        try {
361            MidiInputDevice* pDevice = pSampler->CreateMidiInputDevice(Driver, Parameters);
362            // search for the created device to get its index
363            int index = GetMidiInputDeviceIndex(pDevice);
364            if (index == -1) throw LinuxSamplerException("Internal error: could not find created midi input device.");
365            result = index; // success
366        }
367        catch (LinuxSamplerException e) {
368            result.Error(e);
369        }
370        return result.Produce();
371    }
372    
373  String LSCPServer::DestroyAudioOutputDevice(uint DeviceIndex) {  String LSCPServer::DestroyAudioOutputDevice(uint DeviceIndex) {
374      dmsg(2,("LSCPServer: DestroyAudioOutputDevice(DeviceIndex=%d)\n", DeviceIndex));      dmsg(2,("LSCPServer: DestroyAudioOutputDevice(DeviceIndex=%d)\n", DeviceIndex));
375      LSCPResultSet result;      LSCPResultSet result;
# Line 129  String LSCPServer::DestroyAudioOutputDev Line 385  String LSCPServer::DestroyAudioOutputDev
385      return result.Produce();      return result.Produce();
386  }  }
387    
388    String LSCPServer::DestroyMidiInputDevice(uint DeviceIndex) {
389        dmsg(2,("LSCPServer: DestroyMidiInputDevice(DeviceIndex=%d)\n", DeviceIndex));
390        LSCPResultSet result;
391        try {
392            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
393            MidiInputDevice* pDevice = devices[DeviceIndex];
394            if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
395            pSampler->DestroyMidiInputDevice(pDevice);
396        }
397        catch (LinuxSamplerException e) {
398            result.Error(e);
399        }
400        return result.Produce();
401    }
402    
403  /**  /**
404   * Will be called by the parser to load an instrument.   * Will be called by the parser to load an instrument.
405   */   */
406  String LSCPServer::LoadInstrument(String Filename, uint uiInstrument, uint uiSamplerChannel) {  String LSCPServer::LoadInstrument(String Filename, uint uiInstrument, uint uiSamplerChannel, bool bBackground) {
407      dmsg(2,("LSCPServer: LoadInstrument(Filename=%s,Instrument=%d,SamplerChannel=%d)\n", Filename.c_str(), uiInstrument, uiSamplerChannel));      dmsg(2,("LSCPServer: LoadInstrument(Filename=%s,Instrument=%d,SamplerChannel=%d)\n", Filename.c_str(), uiInstrument, uiSamplerChannel));
408      LSCPResultSet result;      LSCPResultSet result;
409      try {      try {
# Line 140  String LSCPServer::LoadInstrument(String Line 411  String LSCPServer::LoadInstrument(String
411          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
412          Engine* pEngine = pSamplerChannel->GetEngine();          Engine* pEngine = pSamplerChannel->GetEngine();
413          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
414          LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);          if (pSamplerChannel->GetAudioOutputDevice() == NULL)
415          pLoadInstrument->StartThread();              throw LinuxSamplerException("No audio output device on channel");
416            if (bBackground) {
417                LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);
418                pLoadInstrument->StartThread();
419            }
420            else pEngine->LoadInstrument(Filename.c_str(), uiInstrument);
421      }      }
422      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
423           result.Error(e);           result.Error(e);
# Line 260  String LSCPServer::GetChannelInfo(uint u Line 536  String LSCPServer::GetChannelInfo(uint u
536          result.Add("ENGINE_NAME", EngineName);          result.Add("ENGINE_NAME", EngineName);
537          result.Add("VOLUME", Volume);          result.Add("VOLUME", Volume);
538    
539          //Some hardcoded stuff for now to make GUI look good          //Some not-so-hardcoded stuff to make GUI look good
540          result.Add("AUDIO_OUTPUT_DEVICE", "0");          result.Add("AUDIO_OUTPUT_DEVICE", GetAudioOutputDeviceIndex(pSamplerChannel->GetAudioOutputDevice()));
541          result.Add("AUDIO_OUTPUT_CHANNELS", "2");          result.Add("AUDIO_OUTPUT_CHANNELS", "2");
542          result.Add("AUDIO_OUTPUT_ROUTING", "0,1");          result.Add("AUDIO_OUTPUT_ROUTING", "0,1");
543    
544            result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice()));
545            result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());
546            result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
547    
548          result.Add("INSTRUMENT_FILE", InstrumentFileName);          result.Add("INSTRUMENT_FILE", InstrumentFileName);
549          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
550          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");  
551      }      }
552      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
553           result.Error(e);           result.Error(e);
# Line 366  String LSCPServer::GetAvailableAudioOutp Line 641  String LSCPServer::GetAvailableAudioOutp
641      return result.Produce();      return result.Produce();
642  }  }
643    
644    String LSCPServer::GetAvailableMidiInputDrivers() {
645        dmsg(2,("LSCPServer: GetAvailableMidiInputDrivers()\n"));
646        LSCPResultSet result;
647        try {
648            String s = MidiInputDeviceFactory::AvailableDriversAsString();
649            result.Add(s);
650        }
651        catch (LinuxSamplerException e) {
652            result.Error(e);
653        }
654        return result.Produce();
655    }
656    
657    String LSCPServer::GetMidiInputDriverInfo(String Driver) {
658        dmsg(2,("LSCPServer: GetMidiInputDriverInfo(Driver=%s)\n",Driver.c_str()));
659        LSCPResultSet result;
660        try {
661            result.Add("DESCRIPTION", MidiInputDeviceFactory::GetDriverDescription(Driver));
662            result.Add("VERSION",     MidiInputDeviceFactory::GetDriverVersion(Driver));
663    
664            std::map<String,DeviceCreationParameter*> parameters = MidiInputDeviceFactory::GetAvailableDriverParameters(Driver);
665            if (parameters.size()) { // if there are parameters defined for this driver
666                String s;
667                std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
668                for (;iter != parameters.end(); iter++) {
669                    if (s != "") s += ",";
670                    s += iter->first;
671                }
672                result.Add("PARAMETERS", s);
673            }
674        }
675        catch (LinuxSamplerException e) {
676            result.Error(e);
677        }
678        return result.Produce();
679    }
680    
681  String LSCPServer::GetAudioOutputDriverInfo(String Driver) {  String LSCPServer::GetAudioOutputDriverInfo(String Driver) {
682      dmsg(2,("LSCPServer: GetAudioOutputDriverInfo(Driver=%s)\n",Driver.c_str()));      dmsg(2,("LSCPServer: GetAudioOutputDriverInfo(Driver=%s)\n",Driver.c_str()));
683      LSCPResultSet result;      LSCPResultSet result;
# Line 390  String LSCPServer::GetAudioOutputDriverI Line 702  String LSCPServer::GetAudioOutputDriverI
702      return result.Produce();      return result.Produce();
703  }  }
704    
705    String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
706        dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str()));
707        LSCPResultSet result;
708        try {
709            DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);
710            result.Add("TYPE",         pParameter->Type());
711            result.Add("DESCRIPTION",  pParameter->Description());
712            result.Add("MANDATORY",    pParameter->Mandatory());
713            result.Add("FIX",          pParameter->Fix());
714            result.Add("MULTIPLICITY", pParameter->Multiplicity());
715            if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());
716            if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());
717            if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());
718            if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());
719            if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());
720        }
721        catch (LinuxSamplerException e) {
722            result.Error(e);
723        }
724        return result.Produce();
725    }
726    
727  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
728      dmsg(2,("LSCPServer: GetAudioOutputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str()));      dmsg(2,("LSCPServer: GetAudioOutputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str()));
729      LSCPResultSet result;      LSCPResultSet result;
# Line 417  String LSCPServer::GetAudioOutputDeviceC Line 751  String LSCPServer::GetAudioOutputDeviceC
751      LSCPResultSet result;      LSCPResultSet result;
752      try {      try {
753          uint count = pSampler->AudioOutputDevices();          uint count = pSampler->AudioOutputDevices();
754          result = count; // success          result.Add(count); // success
755        }
756        catch (LinuxSamplerException e) {
757            result.Error(e);
758        }
759        return result.Produce();
760    }
761    
762    String LSCPServer::GetMidiInputDeviceCount() {
763        dmsg(2,("LSCPServer: GetMidiInputDeviceCount()\n"));
764        LSCPResultSet result;
765        try {
766            uint count = pSampler->MidiInputDevices();
767            result.Add(count); // success
768      }      }
769      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
770          result.Error(e);          result.Error(e);
# Line 444  String LSCPServer::GetAudioOutputDevices Line 791  String LSCPServer::GetAudioOutputDevices
791      return result.Produce();      return result.Produce();
792  }  }
793    
794    String LSCPServer::GetMidiInputDevices() {
795        dmsg(2,("LSCPServer: GetMidiInputDevices()\n"));
796        LSCPResultSet result;
797        try {
798            String s;
799            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
800            std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
801            for (; iter != devices.end(); iter++) {
802                if (s != "") s += ",";
803                s += ToString(iter->first);
804            }
805            result.Add(s);
806        }
807        catch (LinuxSamplerException e) {
808            result.Error(e);
809        }
810        return result.Produce();
811    }
812    
813  String LSCPServer::GetAudioOutputDeviceInfo(uint DeviceIndex) {  String LSCPServer::GetAudioOutputDeviceInfo(uint DeviceIndex) {
814      dmsg(2,("LSCPServer: GetAudioOutputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));      dmsg(2,("LSCPServer: GetAudioOutputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));
815      LSCPResultSet result;      LSCPResultSet result;
# Line 451  String LSCPServer::GetAudioOutputDeviceI Line 817  String LSCPServer::GetAudioOutputDeviceI
817          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
818          if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");          if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
819          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
820            result.Add("driver", pDevice->Driver());
821          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
822          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
823          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 463  String LSCPServer::GetAudioOutputDeviceI Line 830  String LSCPServer::GetAudioOutputDeviceI
830      return result.Produce();      return result.Produce();
831  }  }
832    
833    String LSCPServer::GetMidiInputDeviceInfo(uint DeviceIndex) {
834        dmsg(2,("LSCPServer: GetMidiInputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));
835        LSCPResultSet result;
836        try {
837            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
838            MidiInputDevice* pDevice = devices[DeviceIndex];
839            if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
840            result.Add("driver", pDevice->Driver());
841            std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
842            std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
843            for (; iter != parameters.end(); iter++) {
844                result.Add(iter->first, iter->second->Value());
845            }
846        }
847        catch (LinuxSamplerException e) {
848            result.Error(e);
849        }
850        return result.Produce();
851    }
852    String LSCPServer::GetMidiInputPortInfo(uint DeviceIndex, uint PortIndex) {
853        dmsg(2,("LSCPServer: GetMidiInputPortInfo(DeviceIndex=%d, PortIndex=%d)\n",DeviceIndex, PortIndex));
854        LSCPResultSet result;
855        try {
856            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
857            MidiInputDevice* pDevice = devices[DeviceIndex];
858            if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
859            MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
860            if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
861            std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();
862            std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
863            for (; iter != parameters.end(); iter++) {
864                result.Add(iter->first, iter->second->Value());
865            }
866        }
867        catch (LinuxSamplerException e) {
868            result.Error(e);
869        }
870        return result.Produce();
871    }
872    
873  String LSCPServer::GetAudioOutputChannelInfo(uint DeviceId, uint ChannelId) {  String LSCPServer::GetAudioOutputChannelInfo(uint DeviceId, uint ChannelId) {
874      dmsg(2,("LSCPServer: GetAudioOutputChannelInfo(DeviceId=%d,ChannelId)\n",DeviceId,ChannelId));      dmsg(2,("LSCPServer: GetAudioOutputChannelInfo(DeviceId=%d,ChannelId)\n",DeviceId,ChannelId));
875      LSCPResultSet result;      LSCPResultSet result;
# Line 566  String LSCPServer::SetAudioOutputDeviceP Line 973  String LSCPServer::SetAudioOutputDeviceP
973      return result.Produce();      return result.Produce();
974  }  }
975    
976    String LSCPServer::SetMidiInputDeviceParameter(uint DeviceIndex, String ParamKey, String ParamVal) {
977        dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
978        LSCPResultSet result;
979        try {
980            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
981            if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
982            MidiInputDevice* pDevice = devices[DeviceIndex];
983            std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
984            if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
985            parameters[ParamKey]->SetValue(ParamVal);
986        }
987        catch (LinuxSamplerException e) {
988            result.Error(e);
989        }
990        return result.Produce();
991    }
992    
993    String LSCPServer::SetMidiInputPortParameter(uint DeviceIndex, uint PortIndex, String ParamKey, String ParamVal) {
994        dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
995        LSCPResultSet result;
996        try {
997            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
998            MidiInputDevice* pDevice = devices[DeviceIndex];
999            if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1000            MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
1001            if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
1002            std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();
1003            if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
1004            parameters[ParamKey]->SetValue(ParamVal);
1005        }
1006        catch (LinuxSamplerException e) {
1007            result.Error(e);
1008        }
1009        return result.Produce();
1010    }
1011    
1012  /**  /**
1013   * Will be called by the parser to change the audio output channel for   * Will be called by the parser to change the audio output channel for
1014   * playback on a particular sampler channel.   * playback on a particular sampler channel.
# Line 575  String LSCPServer::SetAudioOutputChannel Line 1018  String LSCPServer::SetAudioOutputChannel
1018      return "ERR:0:Not implemented yet.\r\n"; //FIXME: Add support for this in resultset class?      return "ERR:0:Not implemented yet.\r\n"; //FIXME: Add support for this in resultset class?
1019  }  }
1020    
1021  String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {
1022      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));
1023      LSCPResultSet result;      LSCPResultSet result;
1024      try {      try {
1025          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1026          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1027          // 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();
1028          if (MidiInputDriver != "ALSA") throw LinuxSamplerException("Unknown MIDI input driver '" + MidiInputDriver + "'.");          AudioOutputDevice* pDevice = devices[AudioDeviceId];
1029          MidiInputDevice::type_t MidiInputType = MidiInputDevice::type_alsa;          if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));
1030          pSamplerChannel->SetMidiInputDevice(MidiInputType);          pSamplerChannel->SetAudioOutputDevice(pDevice);
1031      }      }
1032      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1033           result.Error(e);           result.Error(e);
# Line 592  String LSCPServer::SetMIDIInputType(Stri Line 1035  String LSCPServer::SetMIDIInputType(Stri
1035      return result.Produce();      return result.Produce();
1036  }  }
1037    
1038  /**  String LSCPServer::SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel) {
1039   * 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));  
1040      LSCPResultSet result;      LSCPResultSet result;
1041      try {      try {
1042          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1043          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1044          if (!pSamplerChannel->GetMidiInputDevice()) throw LinuxSamplerException("No MIDI input device connected yet");          // Driver type name aliasing...
1045          pSamplerChannel->GetMidiInputDevice()->SetInputPort(MIDIInputPort.c_str());          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";
1046            if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";        
1047            // Check if there's one audio output device already created
1048            // for the intended audio driver type (AudioOutputDriver)...
1049            AudioOutputDevice *pDevice = NULL;
1050            std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1051            std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
1052            for (; iter != devices.end(); iter++) {
1053                if ((iter->second)->Driver() == AudioOutputDriver) {
1054                    pDevice = iter->second;
1055                    break;
1056                }
1057            }
1058            // If it doesn't exist, create a new one with default parameters...
1059            if (pDevice == NULL) {
1060                std::map<String,String> params;
1061                pDevice = pSampler->CreateAudioOutputDevice(AudioOutputDriver, params);
1062            }
1063            // Must have a device...
1064            if (pDevice == NULL)
1065                throw LinuxSamplerException("Internal error: could not create audio output device.");
1066            // Set it as the current channel device...
1067            pSamplerChannel->SetAudioOutputDevice(pDevice);
1068        }
1069        catch (LinuxSamplerException e) {
1070             result.Error(e);
1071        }
1072        return result.Produce();
1073    }
1074    
1075    String LSCPServer::SetMIDIInputPort(uint MIDIPort, uint uiSamplerChannel) {
1076        dmsg(2,("LSCPServer: SetMIDIInputPort(MIDIPort=%d, SamplerChannel=%d)\n",MIDIPort,uiSamplerChannel));
1077        LSCPResultSet result;
1078        try {
1079            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1080            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1081            pSamplerChannel->SetMidiInputPort(MIDIPort);
1082      }      }
1083      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1084           result.Error(e);           result.Error(e);
# Line 611  String LSCPServer::SetMIDIInputPort(Stri Line 1086  String LSCPServer::SetMIDIInputPort(Stri
1086      return result.Produce();      return result.Produce();
1087  }  }
1088    
 /**  
  * Will be called by the parser to change the MIDI input channel on which the  
  * engine of a particular sampler channel should listen to.  
  */  
1089  String LSCPServer::SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel) {  String LSCPServer::SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel) {
1090      dmsg(2,("LSCPServer: SetMIDIInputChannel(MIDIChannel=%d, SamplerChannel=%d)\n", MIDIChannel, uiSamplerChannel));      dmsg(2,("LSCPServer: SetMIDIInputChannel(MIDIChannel=%d, SamplerChannel=%d)\n",MIDIChannel,uiSamplerChannel));
1091      LSCPResultSet result;      LSCPResultSet result;
1092      try {      try {
1093          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1094          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1095          if (!pSamplerChannel->GetMidiInputDevice()) throw LinuxSamplerException("No MIDI input device connected yet");          pSamplerChannel->SetMidiInputChannel((MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);
1096          MidiInputDevice::type_t oldtype = pSamplerChannel->GetMidiInputDevice()->Type();      }
1097          pSamplerChannel->SetMidiInputDevice(oldtype, (MidiInputDevice::midi_chan_t) MIDIChannel);      catch (LinuxSamplerException e) {
1098             result.Error(e);
1099        }
1100        return result.Produce();
1101    }
1102    
1103    String LSCPServer::SetMIDIInputDevice(uint MIDIDeviceId, uint uiSamplerChannel) {
1104        dmsg(2,("LSCPServer: SetMIDIInputDevice(MIDIDeviceId=%d, SamplerChannel=%d)\n",MIDIDeviceId,uiSamplerChannel));
1105        LSCPResultSet result;
1106        try {
1107            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1108            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1109            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1110            MidiInputDevice* pDevice = devices[MIDIDeviceId];
1111            if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1112            pSamplerChannel->SetMidiInputDevice(pDevice);
1113      }      }
1114      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1115           result.Error(e);           result.Error(e);
# Line 631  String LSCPServer::SetMIDIInputChannel(u Line 1117  String LSCPServer::SetMIDIInputChannel(u
1117      return result.Produce();      return result.Produce();
1118  }  }
1119    
1120  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint SamplerChannel) {  String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) {
1121        dmsg(2,("LSCPServer: SetMIDIInputType(String MidiInputDriver=%s, SamplerChannel=%d)\n",MidiInputDriver.c_str(),uiSamplerChannel));
1122      LSCPResultSet result;      LSCPResultSet result;
1123      try {      try {
1124          throw LinuxSamplerException("Command not yet implemented");          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1125            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1126            // Driver type name aliasing...
1127            if (MidiInputDriver == "ALSA") MidiInputDriver = "Alsa";
1128            // Check if there's one MIDI input device already created
1129            // for the intended MIDI driver type (MidiInputDriver)...
1130            MidiInputDevice *pDevice = NULL;
1131            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1132            std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
1133            for (; iter != devices.end(); iter++) {
1134                if ((iter->second)->Driver() == MidiInputDriver) {
1135                    pDevice = iter->second;
1136                    break;
1137                }
1138            }
1139            // If it doesn't exist, create a new one with default parameters...
1140            if (pDevice == NULL) {
1141                std::map<String,String> params;
1142                pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);
1143                // Make it with at least one initial port.
1144                std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1145                parameters["ports"]->SetValue("1");
1146            }
1147            // Must have a device...
1148            if (pDevice == NULL)
1149                throw LinuxSamplerException("Internal error: could not create MIDI input device.");
1150            // Set it as the current channel device...
1151            pSamplerChannel->SetMidiInputDevice(pDevice);
1152        }
1153        catch (LinuxSamplerException e) {
1154             result.Error(e);
1155        }
1156        return result.Produce();
1157    }
1158    
1159    /**
1160     * Will be called by the parser to change the MIDI input device, port and channel on which
1161     * engine of a particular sampler channel should listen to.
1162     */
1163    String LSCPServer::SetMIDIInput(uint MIDIDeviceId, uint MIDIPort, uint MIDIChannel, uint uiSamplerChannel) {
1164        dmsg(2,("LSCPServer: SetMIDIInput(MIDIDeviceId=%d, MIDIPort=%d, MIDIChannel=%d, SamplerChannel=%d)\n", MIDIDeviceId, MIDIPort, MIDIChannel, uiSamplerChannel));
1165        LSCPResultSet result;
1166        try {
1167            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1168            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1169            std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();
1170            MidiInputDevice* pDevice = devices[MIDIDeviceId];
1171            if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1172            pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);
1173      }      }
1174      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1175           result.Error(e);           result.Error(e);
# Line 685  String LSCPServer::ResetChannel(uint uiS Line 1220  String LSCPServer::ResetChannel(uint uiS
1220   * 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
1221   * server for receiving event messages.   * server for receiving event messages.
1222   */   */
1223  String LSCPServer::SubscribeNotification(uint UDPPort) {  String LSCPServer::SubscribeNotification(LSCPEvent::event_t type) {
1224      dmsg(2,("LSCPServer: SubscribeNotification(UDPPort=%d)\n", UDPPort));      dmsg(2,("LSCPServer: SubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
1225      return "ERR:0:Not implemented yet.\r\n";      LSCPResultSet result;
1226        SubscriptionMutex.Lock();
1227        eventSubscriptions[type].push_back(currentSocket);
1228        SubscriptionMutex.Unlock();
1229        return result.Produce();
1230  }  }
1231    
1232  /**  /**
1233   * 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
1234   * for not receiving further event messages.   * for not receiving further event messages.
1235   */   */
1236  String LSCPServer::UnsubscribeNotification(String SessionID) {  String LSCPServer::UnsubscribeNotification(LSCPEvent::event_t type) {
1237      dmsg(2,("LSCPServer: UnsubscribeNotification(SessionID=%s)\n", SessionID.c_str()));      dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
1238      return "ERR:0:Not implemented yet.\r\n";      LSCPResultSet result;
1239        SubscriptionMutex.Lock();
1240        eventSubscriptions[type].remove(currentSocket);
1241        SubscriptionMutex.Unlock();
1242        return result.Produce();
1243  }  }
1244    
1245    
Legend:
Removed from v.133  
changed lines
  Added in v.170
  ViewVC Help
Powered by ViewVC