/[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 123 by schoenebeck, Mon Jun 14 19:33:16 2004 UTC revision 209 by schoenebeck, Sun Jul 18 00:29:39 2004 UTC
# Line 22  Line 22 
22    
23  #include "lscpserver.h"  #include "lscpserver.h"
24  #include "lscpresultset.h"  #include "lscpresultset.h"
25    #include "lscpevent.h"
26    
27  #include "../engines/gig/Engine.h"  #include "../engines/gig/Engine.h"
28  #include "../audiodriver/AudioOutputDeviceFactory.h"  #include "../drivers/audio/AudioOutputDeviceFactory.h"
29    #include "../drivers/midi/MidiInputDeviceFactory.h"
30    
31    /**
32     * Below are a few static members of the LSCPServer class.
33     * The big assumption here is that LSCPServer is going to remain a singleton.
34     * These members are used to support client connections.
35     * Class handles multiple connections at the same time using select() and non-blocking recv()
36     * Commands are processed by a single LSCPServer thread.
37     * Notifications are delivered either by the thread that originated them
38     * or (if the resultset is currently in progress) by the LSCPServer thread
39     * after the resultset was sent out.
40     * This makes sure that resultsets can not be interrupted by notifications.
41     * This also makes sure that the thread sending notification is not blocked
42     * by the LSCPServer thread.
43     */
44    fd_set LSCPServer::fdSet;
45    int LSCPServer::currentSocket = -1;
46    std::vector<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        FD_ZERO(&fdSet);
90        FD_SET(hSocket, &fdSet);
91        int maxSessions = hSocket;
92    
93        // Parser initialization
94        yyparse_param_t yyparse_param;
95        yyparse_param.pServer = this;
96    
97      while (true) {      while (true) {
98          hSession = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);          fd_set selectSet = fdSet;
99          if (hSession < 0) {          int retval = select(maxSessions+1, &selectSet, NULL, NULL, NULL);
100              std::cerr << "LSCPServer: Client connection failed." << std::endl;          if (retval == 0)
101              close(hSocket);                  continue; //Nothing try again
102              //return -1;          if (retval == -1) {
103              exit(EXIT_FAILURE);                  std::cerr << "LSCPServer: Socket select error." << std::endl;
104          }                  close(hSocket);
105                    exit(EXIT_FAILURE);
106          dmsg(1,("LSCPServer: Client connection established.\n"));          }
         //send(hSession, "Welcome!\r\n", 10, 0);  
   
         // Parser invocation  
         yyparse_param_t yyparse_param;  
         yyparse_param.pServer = this;  
         yylex_init(&yyparse_param.pScanner);  
         while (yyparse(&yyparse_param) == LSCP_SYNTAX_ERROR); // recall parser in case of syntax error  
         yylex_destroy(yyparse_param.pScanner);  
107    
108          close(hSession);          //Accept new connections now (if any)
109          dmsg(1,("LSCPServer: Client connection terminated.\n"));          if (FD_ISSET(hSocket, &selectSet)) {
110                    int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);
111                    if (socket < 0) {
112                            std::cerr << "LSCPServer: Client connection failed." << std::endl;
113                            exit(EXIT_FAILURE);
114                    }
115    
116                    if (fcntl(socket, F_SETFL, O_NONBLOCK)) {
117                            std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;
118                            exit(EXIT_FAILURE);
119                    }
120    
121                    hSessions.push_back(socket);
122                    FD_SET(socket, &fdSet);
123                    if (socket > maxSessions)
124                            maxSessions = socket;
125                    dmsg(1,("LSCPServer: Client connection established on socket:%d.\n", socket));
126                    LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection established on socket", socket));
127                    continue; //Maybe this was the only selected socket, better select again
128            }
129    
130            //Something was selected and it was not the hSocket, so it must be some command(s) coming.
131            for (std::vector<int>::iterator iter = hSessions.begin(); iter !=  hSessions.end(); iter++) {
132                    if (FD_ISSET(*iter, &selectSet)) {      //Was it this socket?
133                            if (GetLSCPCommand(iter)) {     //Have we read the entire command?
134                                    dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));
135                                    yylex_init(&yyparse_param.pScanner);
136                                    currentSocket = *iter;  //a hack
137                                    int result = yyparse(&yyparse_param);
138                                    currentSocket = -1;     //continuation of a hack
139                                    dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
140                                    if (result == LSCP_QUIT) { //Was it a quit command by any chance?
141                                            CloseConnection(iter);
142                                    }
143                            }
144                            //socket may have been closed, iter may be invalid, get out of the loop for now.
145                            //we'll be back if there is data.
146                            break;
147                    }
148            }
149    
150            //Now let's deliver late notifies (if any)
151            NotifyBufferMutex.Lock();
152            for (std::map<int,String>::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) {
153                    send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), 0);
154                    bufferedNotifies.erase(iterNotify);
155            }
156            NotifyBufferMutex.Unlock();
157      }      }
158        //It will never get here anyway
159        //yylex_destroy(yyparse_param.pScanner);
160    }
161    
162    void LSCPServer::CloseConnection( std::vector<int>::iterator iter ) {
163            int socket = *iter;
164            dmsg(1,("LSCPServer: Client connection terminated on socket:%d.\n",socket));
165            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));
166            hSessions.erase(iter);
167            FD_CLR(socket,  &fdSet);
168            SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)
169            for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {
170                    iter->second.remove(socket);
171            }
172            SubscriptionMutex.Unlock();
173            NotifyMutex.Lock();
174            bufferedCommands.erase(socket);
175            bufferedNotifies.erase(socket);
176            close(socket);
177            NotifyMutex.Unlock();
178    }
179    
180    void LSCPServer::SendLSCPNotify( LSCPEvent event ) {
181            SubscriptionMutex.Lock();
182            if (eventSubscriptions.count(event.GetType()) == 0) {
183                    SubscriptionMutex.Unlock();     //Nobody is subscribed to this event
184                    return;
185            }
186            std::list<int>::iterator iter = eventSubscriptions[event.GetType()].begin();
187            std::list<int>::iterator end = eventSubscriptions[event.GetType()].end();
188            String notify = event.Produce();
189    
190            while (true) {
191                    if (NotifyMutex.Trylock()) {
192                            for(;iter != end; iter++)
193                                    send(*iter, notify.c_str(), notify.size(), 0);
194                            NotifyMutex.Unlock();
195                            break;
196                    } else {
197                            if (NotifyBufferMutex.Trylock()) {
198                                    for(;iter != end; iter++)
199                                            bufferedNotifies[*iter] += notify;
200                                    NotifyBufferMutex.Unlock();
201                                    break;
202                            }
203                    }
204            }
205            SubscriptionMutex.Unlock();
206    }
207    
208    extern int GetLSCPCommand( void *buf, int max_size ) {
209            String command = LSCPServer::bufferedCommands[LSCPServer::currentSocket];
210            if (command.size() == 0) {              //Parser wants input but we have nothing.
211                    strcpy((char*) buf, "\n");      //So give it an empty command
212                    return 1;                       //to keep it happy.
213            }
214    
215            if (max_size < command.size()) {
216                    std::cerr << "getLSCPCommand: Flex buffer too small, ignoring the command." << std::endl;
217                    return 0;       //This will never happen
218            }
219    
220            strcpy((char*) buf, command.c_str());
221            LSCPServer::bufferedCommands.erase(LSCPServer::currentSocket);
222            return command.size();
223    }
224    
225    /**
226     * Will be called to try to read the command from the socket
227     * If command is read, it will return true. Otherwise false is returned.
228     * In any case the received portion (complete or incomplete) is saved into bufferedCommand map.
229     */
230    bool LSCPServer::GetLSCPCommand( std::vector<int>::iterator iter ) {
231            int socket = *iter;
232            char c;
233            int i = 0;
234            while (true) {
235                    int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now
236                    if (result == 0) { //socket was selected, so 0 here means client has closed the connection
237                            CloseConnection(iter);
238                            break;
239                    }
240                    if (result == 1) {
241                            if (c == '\r')
242                                    continue; //Ignore CR
243                            if (c == '\n') {
244                                    LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));
245                                    bufferedCommands[socket] += "\n";
246                                    return true; //Complete command was read
247                            }
248                            bufferedCommands[socket] += c;
249                    }
250                    if (result == -1) {
251                            if (errno == EAGAIN) //Would block, try again later.
252                                    return false;
253                            switch(errno) {
254                                    case EBADF:
255                                            dmsg(2,("LSCPScanner: The argument s is an invalid descriptor.\n"));
256                                            break;
257                                    case ECONNREFUSED:
258                                            dmsg(2,("LSCPScanner: A remote host refused to allow the network connection (typically because it is not running the requested service).\n"));
259                                            break;
260                                    case ENOTCONN:
261                                            dmsg(2,("LSCPScanner: The socket is associated with a connection-oriented protocol and has not been connected (see connect(2) and accept(2)).\n"));
262                                            break;
263                                    case ENOTSOCK:
264                                            dmsg(2,("LSCPScanner: The argument s does not refer to a socket.\n"));
265                                            break;
266                                    case EAGAIN:
267                                            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"));
268                                            break;
269                                    case EINTR:
270                                            dmsg(2,("LSCPScanner: The receive was interrupted by delivery of a signal before any data were available.\n"));
271                                            break;
272                                    case EFAULT:
273                                            dmsg(2,("LSCPScanner: The receive buffer pointer(s) point outside the process's address space.\n"));
274                                            break;
275                                    case EINVAL:
276                                            dmsg(2,("LSCPScanner: Invalid argument passed.\n"));
277                                            break;
278                                    case ENOMEM:
279                                            dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));
280                                            break;
281                                    default:
282                                            dmsg(2,("LSCPScanner: Unknown recv() error.\n"));
283                                            break;
284                            }
285                            CloseConnection(iter);
286                            break;
287                    }
288            }
289            return false;
290  }  }
291    
292  /**  /**
# Line 87  int LSCPServer::Main() { Line 297  int LSCPServer::Main() {
297   */   */
298  void LSCPServer::AnswerClient(String ReturnMessage) {  void LSCPServer::AnswerClient(String ReturnMessage) {
299      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));
300      send(hSession, ReturnMessage.c_str(), ReturnMessage.size(), 0);      if (currentSocket != -1) {
301                NotifyMutex.Lock();
302                send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), 0);
303                NotifyMutex.Unlock();
304        }
305    }
306    
307    /**
308     * Find a created audio output device index.
309     */
310    int LSCPServer::GetAudioOutputDeviceIndex ( AudioOutputDevice *pDevice )
311    {
312        // Search for the created device to get its index
313        std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
314        std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
315        for (; iter != devices.end(); iter++) {
316            if (iter->second == pDevice)
317                return iter->first;
318        }
319        // Not found.
320        return -1;
321    }
322    
323    /**
324     * Find a created midi input device index.
325     */
326    int LSCPServer::GetMidiInputDeviceIndex ( MidiInputDevice *pDevice )
327    {
328        // Search for the created device to get its index
329        std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
330        std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
331        for (; iter != devices.end(); iter++) {
332            if (iter->second == pDevice)
333                return iter->first;
334        }
335        // Not found.
336        return -1;
337  }  }
338    
339  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 341  String LSCPServer::CreateAudioOutputDevi
341      LSCPResultSet result;      LSCPResultSet result;
342      try {      try {
343          AudioOutputDevice* pDevice = pSampler->CreateAudioOutputDevice(Driver, Parameters);          AudioOutputDevice* pDevice = pSampler->CreateAudioOutputDevice(Driver, Parameters);
         std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();  
344          // search for the created device to get its index          // search for the created device to get its index
345          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;  
             }  
         }  
346          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.");
347          result = index; // success          result = index; // success
348      }      }
# Line 114  String LSCPServer::CreateAudioOutputDevi Line 352  String LSCPServer::CreateAudioOutputDevi
352      return result.Produce();      return result.Produce();
353  }  }
354    
355    String LSCPServer::CreateMidiInputDevice(String Driver, std::map<String,String> Parameters) {
356        dmsg(2,("LSCPServer: CreateMidiInputDevice(Driver=%s)\n", Driver.c_str()));
357        LSCPResultSet result;
358        try {
359            MidiInputDevice* pDevice = pSampler->CreateMidiInputDevice(Driver, Parameters);
360            // search for the created device to get its index
361            int index = GetMidiInputDeviceIndex(pDevice);
362            if (index == -1) throw LinuxSamplerException("Internal error: could not find created midi input device.");
363            result = index; // success
364        }
365        catch (LinuxSamplerException e) {
366            result.Error(e);
367        }
368        return result.Produce();
369    }
370    
371  String LSCPServer::DestroyAudioOutputDevice(uint DeviceIndex) {  String LSCPServer::DestroyAudioOutputDevice(uint DeviceIndex) {
372      dmsg(2,("LSCPServer: DestroyAudioOutputDevice(DeviceIndex=%d)\n", DeviceIndex));      dmsg(2,("LSCPServer: DestroyAudioOutputDevice(DeviceIndex=%d)\n", DeviceIndex));
373      LSCPResultSet result;      LSCPResultSet result;
# Line 129  String LSCPServer::DestroyAudioOutputDev Line 383  String LSCPServer::DestroyAudioOutputDev
383      return result.Produce();      return result.Produce();
384  }  }
385    
386    String LSCPServer::DestroyMidiInputDevice(uint DeviceIndex) {
387        dmsg(2,("LSCPServer: DestroyMidiInputDevice(DeviceIndex=%d)\n", DeviceIndex));
388        LSCPResultSet result;
389        try {
390            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
391            MidiInputDevice* pDevice = devices[DeviceIndex];
392            if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
393            pSampler->DestroyMidiInputDevice(pDevice);
394        }
395        catch (LinuxSamplerException e) {
396            result.Error(e);
397        }
398        return result.Produce();
399    }
400    
401  /**  /**
402   * Will be called by the parser to load an instrument.   * Will be called by the parser to load an instrument.
403   */   */
404  String LSCPServer::LoadInstrument(String Filename, uint uiInstrument, uint uiSamplerChannel) {  String LSCPServer::LoadInstrument(String Filename, uint uiInstrument, uint uiSamplerChannel, bool bBackground) {
405      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));
406      LSCPResultSet result;      LSCPResultSet result;
407      try {      try {
# Line 140  String LSCPServer::LoadInstrument(String Line 409  String LSCPServer::LoadInstrument(String
409          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
410          Engine* pEngine = pSamplerChannel->GetEngine();          Engine* pEngine = pSamplerChannel->GetEngine();
411          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
412          pEngine->LoadInstrument(Filename.c_str(), uiInstrument);          if (pSamplerChannel->GetAudioOutputDevice() == NULL)
413                throw LinuxSamplerException("No audio output device on channel");
414            if (bBackground) {
415                LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);
416                pLoadInstrument->StartThread();
417            }
418            else pEngine->LoadInstrument(Filename.c_str(), uiInstrument);
419      }      }
420      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
421           result.Error(e);           result.Error(e);
# Line 179  String LSCPServer::GetChannels() { Line 454  String LSCPServer::GetChannels() {
454  }  }
455    
456  /**  /**
457     * Will be called by the parser to get the list of sampler channels.
458     */
459    String LSCPServer::ListChannels() {
460        dmsg(2,("LSCPServer: ListChannels()\n"));
461        String list;
462        std::map<uint,SamplerChannel*> channels = pSampler->GetSamplerChannels();
463        std::map<uint,SamplerChannel*>::iterator iter = channels.begin();
464        for (; iter != channels.end(); iter++) {
465            if (list != "") list += ",";
466            list += ToString(iter->first);
467        }
468        LSCPResultSet result;
469        result.Add(list);
470        return result.Produce();
471    }
472    
473    /**
474   * Will be called by the parser to add a sampler channel.   * Will be called by the parser to add a sampler channel.
475   */   */
476  String LSCPServer::AddChannel() {  String LSCPServer::AddChannel() {
# Line 244  String LSCPServer::GetChannelInfo(uint u Line 536  String LSCPServer::GetChannelInfo(uint u
536          String EngineName = "NONE";          String EngineName = "NONE";
537          float Volume = 0;          float Volume = 0;
538          String InstrumentFileName = "NONE";          String InstrumentFileName = "NONE";
539          int InstrumentIndex = 0;          int InstrumentIndex = -1;
540            int InstrumentStatus = -1;
541    
542          if (pEngine) {          if (pEngine) {
543              EngineName =  pEngine->EngineName();              EngineName =  pEngine->EngineName();
544              Volume = pEngine->Volume();              Volume = pEngine->Volume();
545              int iIdx = pEngine->InstrumentIndex();              InstrumentStatus = pEngine->InstrumentStatus();
546              if (iIdx != -1) {              InstrumentIndex = pEngine->InstrumentIndex();
547                if (InstrumentIndex != -1)
548                  InstrumentFileName = pEngine->InstrumentFileName();                  InstrumentFileName = pEngine->InstrumentFileName();
                 InstrumentIndex = iIdx;  
             }  
549          }          }
550    
551          result.Add("ENGINE_NAME", EngineName);          result.Add("ENGINE_NAME", EngineName);
552          result.Add("VOLUME", Volume);          result.Add("VOLUME", Volume);
553    
554          //Some hardcoded stuff for now to make GUI look good          //Some not-so-hardcoded stuff to make GUI look good
555          result.Add("AUDIO_OUTPUT_DEVICE", "0");          result.Add("AUDIO_OUTPUT_DEVICE", GetAudioOutputDeviceIndex(pSamplerChannel->GetAudioOutputDevice()));
556          result.Add("AUDIO_OUTPUT_CHANNELS", "2");          result.Add("AUDIO_OUTPUT_CHANNELS", "2");
557          result.Add("AUDIO_OUTPUT_ROUTING", "0,1");          result.Add("AUDIO_OUTPUT_ROUTING", "0,1");
558    
559            result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice()));
560            result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());
561            result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
562    
563          result.Add("INSTRUMENT_FILE", InstrumentFileName);          result.Add("INSTRUMENT_FILE", InstrumentFileName);
564          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
565            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");  
566      }      }
567      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
568           result.Error(e);           result.Error(e);
# Line 330  String LSCPServer::GetBufferFill(fill_re Line 622  String LSCPServer::GetBufferFill(fill_re
622          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");
623          Engine* pEngine = pSamplerChannel->GetEngine();          Engine* pEngine = pSamplerChannel->GetEngine();
624          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");
625          if (!pEngine->DiskStreamSupported()) return "NA\r\n"; //FIXME: Update resultset class to support "NA"          if (!pEngine->DiskStreamSupported())
626          switch (ResponseType) {              result.Add("NA");
627              case fill_response_bytes:          else {
628                  result.Add(pEngine->DiskStreamBufferFillBytes());              switch (ResponseType) {
629                  break;                  case fill_response_bytes:
630              case fill_response_percentage:                      result.Add(pEngine->DiskStreamBufferFillBytes());
631                  result.Add(pEngine->DiskStreamBufferFillPercentage());                      break;
632                  break;                  case fill_response_percentage:
633              default:                      result.Add(pEngine->DiskStreamBufferFillPercentage());
634                  throw LinuxSamplerException("Unknown fill response type");                      break;
635          }                  default:
636                        throw LinuxSamplerException("Unknown fill response type");
637                }
638            }
639      }      }
640      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
641           result.Error(e);           result.Error(e);
# Line 361  String LSCPServer::GetAvailableAudioOutp Line 656  String LSCPServer::GetAvailableAudioOutp
656      return result.Produce();      return result.Produce();
657  }  }
658    
659    String LSCPServer::GetAvailableMidiInputDrivers() {
660        dmsg(2,("LSCPServer: GetAvailableMidiInputDrivers()\n"));
661        LSCPResultSet result;
662        try {
663            String s = MidiInputDeviceFactory::AvailableDriversAsString();
664            result.Add(s);
665        }
666        catch (LinuxSamplerException e) {
667            result.Error(e);
668        }
669        return result.Produce();
670    }
671    
672    String LSCPServer::GetMidiInputDriverInfo(String Driver) {
673        dmsg(2,("LSCPServer: GetMidiInputDriverInfo(Driver=%s)\n",Driver.c_str()));
674        LSCPResultSet result;
675        try {
676            result.Add("DESCRIPTION", MidiInputDeviceFactory::GetDriverDescription(Driver));
677            result.Add("VERSION",     MidiInputDeviceFactory::GetDriverVersion(Driver));
678    
679            std::map<String,DeviceCreationParameter*> parameters = MidiInputDeviceFactory::GetAvailableDriverParameters(Driver);
680            if (parameters.size()) { // if there are parameters defined for this driver
681                String s;
682                std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
683                for (;iter != parameters.end(); iter++) {
684                    if (s != "") s += ",";
685                    s += iter->first;
686                }
687                result.Add("PARAMETERS", s);
688            }
689        }
690        catch (LinuxSamplerException e) {
691            result.Error(e);
692        }
693        return result.Produce();
694    }
695    
696  String LSCPServer::GetAudioOutputDriverInfo(String Driver) {  String LSCPServer::GetAudioOutputDriverInfo(String Driver) {
697      dmsg(2,("LSCPServer: GetAudioOutputDriverInfo(Driver=%s)\n",Driver.c_str()));      dmsg(2,("LSCPServer: GetAudioOutputDriverInfo(Driver=%s)\n",Driver.c_str()));
698      LSCPResultSet result;      LSCPResultSet result;
# Line 385  String LSCPServer::GetAudioOutputDriverI Line 717  String LSCPServer::GetAudioOutputDriverI
717      return result.Produce();      return result.Produce();
718  }  }
719    
720    String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
721        dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str()));
722        LSCPResultSet result;
723        try {
724            DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);
725            result.Add("TYPE",         pParameter->Type());
726            result.Add("DESCRIPTION",  pParameter->Description());
727            result.Add("MANDATORY",    pParameter->Mandatory());
728            result.Add("FIX",          pParameter->Fix());
729            result.Add("MULTIPLICITY", pParameter->Multiplicity());
730            if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());
731            if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());
732            if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());
733            if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());
734            if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());
735        }
736        catch (LinuxSamplerException e) {
737            result.Error(e);
738        }
739        return result.Produce();
740    }
741    
742  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
743      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()));
744      LSCPResultSet result;      LSCPResultSet result;
# Line 412  String LSCPServer::GetAudioOutputDeviceC Line 766  String LSCPServer::GetAudioOutputDeviceC
766      LSCPResultSet result;      LSCPResultSet result;
767      try {      try {
768          uint count = pSampler->AudioOutputDevices();          uint count = pSampler->AudioOutputDevices();
769          result = count; // success          result.Add(count); // success
770        }
771        catch (LinuxSamplerException e) {
772            result.Error(e);
773        }
774        return result.Produce();
775    }
776    
777    String LSCPServer::GetMidiInputDeviceCount() {
778        dmsg(2,("LSCPServer: GetMidiInputDeviceCount()\n"));
779        LSCPResultSet result;
780        try {
781            uint count = pSampler->MidiInputDevices();
782            result.Add(count); // success
783      }      }
784      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
785          result.Error(e);          result.Error(e);
# Line 439  String LSCPServer::GetAudioOutputDevices Line 806  String LSCPServer::GetAudioOutputDevices
806      return result.Produce();      return result.Produce();
807  }  }
808    
809    String LSCPServer::GetMidiInputDevices() {
810        dmsg(2,("LSCPServer: GetMidiInputDevices()\n"));
811        LSCPResultSet result;
812        try {
813            String s;
814            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
815            std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
816            for (; iter != devices.end(); iter++) {
817                if (s != "") s += ",";
818                s += ToString(iter->first);
819            }
820            result.Add(s);
821        }
822        catch (LinuxSamplerException e) {
823            result.Error(e);
824        }
825        return result.Produce();
826    }
827    
828  String LSCPServer::GetAudioOutputDeviceInfo(uint DeviceIndex) {  String LSCPServer::GetAudioOutputDeviceInfo(uint DeviceIndex) {
829      dmsg(2,("LSCPServer: GetAudioOutputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));      dmsg(2,("LSCPServer: GetAudioOutputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));
830      LSCPResultSet result;      LSCPResultSet result;
# Line 446  String LSCPServer::GetAudioOutputDeviceI Line 832  String LSCPServer::GetAudioOutputDeviceI
832          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
833          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) + ".");
834          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
835            result.Add("driver", pDevice->Driver());
836          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
837          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
838          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 458  String LSCPServer::GetAudioOutputDeviceI Line 845  String LSCPServer::GetAudioOutputDeviceI
845      return result.Produce();      return result.Produce();
846  }  }
847    
848    String LSCPServer::GetMidiInputDeviceInfo(uint DeviceIndex) {
849        dmsg(2,("LSCPServer: GetMidiInputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex));
850        LSCPResultSet result;
851        try {
852            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
853            MidiInputDevice* pDevice = devices[DeviceIndex];
854            if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
855            result.Add("driver", pDevice->Driver());
856            std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
857            std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
858            for (; iter != parameters.end(); iter++) {
859                result.Add(iter->first, iter->second->Value());
860            }
861        }
862        catch (LinuxSamplerException e) {
863            result.Error(e);
864        }
865        return result.Produce();
866    }
867    String LSCPServer::GetMidiInputPortInfo(uint DeviceIndex, uint PortIndex) {
868        dmsg(2,("LSCPServer: GetMidiInputPortInfo(DeviceIndex=%d, PortIndex=%d)\n",DeviceIndex, PortIndex));
869        LSCPResultSet result;
870        try {
871            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
872            MidiInputDevice* pDevice = devices[DeviceIndex];
873            if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
874            MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
875            if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
876            std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();
877            std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
878            for (; iter != parameters.end(); iter++) {
879                result.Add(iter->first, iter->second->Value());
880            }
881        }
882        catch (LinuxSamplerException e) {
883            result.Error(e);
884        }
885        return result.Produce();
886    }
887    
888  String LSCPServer::GetAudioOutputChannelInfo(uint DeviceId, uint ChannelId) {  String LSCPServer::GetAudioOutputChannelInfo(uint DeviceId, uint ChannelId) {
889      dmsg(2,("LSCPServer: GetAudioOutputChannelInfo(DeviceId=%d,ChannelId)\n",DeviceId,ChannelId));      dmsg(2,("LSCPServer: GetAudioOutputChannelInfo(DeviceId=%d,ChannelId)\n",DeviceId,ChannelId));
890      LSCPResultSet result;      LSCPResultSet result;
# Line 484  String LSCPServer::GetAudioOutputChannel Line 911  String LSCPServer::GetAudioOutputChannel
911      return result.Produce();      return result.Produce();
912  }  }
913    
914    String LSCPServer::GetMidiInputPortParameterInfo(uint DeviceId, uint PortId, String ParameterName) {
915        dmsg(2,("LSCPServer: GetMidiInputPortParameterInfo(DeviceId=%d,PortId=%d,ParameterName=%s)\n",DeviceId,PortId,ParameterName.c_str()));
916        LSCPResultSet result;
917        try {
918            // get audio output device
919            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
920            if (!devices[DeviceId]) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");
921            MidiInputDevice* pDevice = devices[DeviceId];
922    
923            // get midi port
924            MidiInputDevice::MidiInputPort* pPort = pDevice->GetPort(PortId);
925            if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");
926    
927            // get desired port parameter
928            std::map<String,DeviceCreationParameter*> parameters = pPort->DeviceParameters();
929            if (!parameters[ParameterName]) throw LinuxSamplerException("Midi port does not provice a parameters '" + ParameterName + "'.");
930            DeviceCreationParameter* pParameter = parameters[ParameterName];
931    
932            // return all fields of this audio channel parameter
933            result.Add("TYPE",         pParameter->Type());
934            result.Add("DESCRIPTION",  pParameter->Description());
935            result.Add("FIX",          pParameter->Fix());
936            result.Add("MULTIPLICITY", pParameter->Multiplicity());
937            if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());
938            if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());
939            if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());
940        }
941        catch (LinuxSamplerException e) {
942            result.Error(e);
943        }
944        return result.Produce();
945    }
946    
947  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {  String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) {
948      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()));
949      LSCPResultSet result;      LSCPResultSet result;
# Line 561  String LSCPServer::SetAudioOutputDeviceP Line 1021  String LSCPServer::SetAudioOutputDeviceP
1021      return result.Produce();      return result.Produce();
1022  }  }
1023    
1024    String LSCPServer::SetMidiInputDeviceParameter(uint DeviceIndex, String ParamKey, String ParamVal) {
1025        dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
1026        LSCPResultSet result;
1027        try {
1028            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1029            if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1030            MidiInputDevice* pDevice = devices[DeviceIndex];
1031            std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1032            if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
1033            parameters[ParamKey]->SetValue(ParamVal);
1034        }
1035        catch (LinuxSamplerException e) {
1036            result.Error(e);
1037        }
1038        return result.Produce();
1039    }
1040    
1041    String LSCPServer::SetMidiInputPortParameter(uint DeviceIndex, uint PortIndex, String ParamKey, String ParamVal) {
1042        dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
1043        LSCPResultSet result;
1044        try {
1045            std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1046            MidiInputDevice* pDevice = devices[DeviceIndex];
1047            if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1048            MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
1049            if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
1050            std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();
1051            if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
1052            parameters[ParamKey]->SetValue(ParamVal);
1053        }
1054        catch (LinuxSamplerException e) {
1055            result.Error(e);
1056        }
1057        return result.Produce();
1058    }
1059    
1060  /**  /**
1061   * 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
1062   * playback on a particular sampler channel.   * playback on a particular sampler channel.
# Line 570  String LSCPServer::SetAudioOutputChannel Line 1066  String LSCPServer::SetAudioOutputChannel
1066      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?
1067  }  }
1068    
1069  String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {
1070      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));
1071      LSCPResultSet result;      LSCPResultSet result;
1072      try {      try {
1073          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1074          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1075          // 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();
1076          if (MidiInputDriver != "ALSA") throw LinuxSamplerException("Unknown MIDI input driver '" + MidiInputDriver + "'.");          AudioOutputDevice* pDevice = devices[AudioDeviceId];
1077          MidiInputDevice::type_t MidiInputType = MidiInputDevice::type_alsa;          if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));
1078          pSamplerChannel->SetMidiInputDevice(MidiInputType);          pSamplerChannel->SetAudioOutputDevice(pDevice);
1079      }      }
1080      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1081           result.Error(e);           result.Error(e);
# Line 587  String LSCPServer::SetMIDIInputType(Stri Line 1083  String LSCPServer::SetMIDIInputType(Stri
1083      return result.Produce();      return result.Produce();
1084  }  }
1085    
1086  /**  String LSCPServer::SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel) {
1087   * 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));  
1088      LSCPResultSet result;      LSCPResultSet result;
1089      try {      try {
1090          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1091          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1092          if (!pSamplerChannel->GetMidiInputDevice()) throw LinuxSamplerException("No MIDI input device connected yet");          // Driver type name aliasing...
1093          pSamplerChannel->GetMidiInputDevice()->SetInputPort(MIDIInputPort.c_str());          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";
1094            if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";
1095            // Check if there's one audio output device already created
1096            // for the intended audio driver type (AudioOutputDriver)...
1097            AudioOutputDevice *pDevice = NULL;
1098            std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1099            std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
1100            for (; iter != devices.end(); iter++) {
1101                if ((iter->second)->Driver() == AudioOutputDriver) {
1102                    pDevice = iter->second;
1103                    break;
1104                }
1105            }
1106            // If it doesn't exist, create a new one with default parameters...
1107            if (pDevice == NULL) {
1108                std::map<String,String> params;
1109                pDevice = pSampler->CreateAudioOutputDevice(AudioOutputDriver, params);
1110            }
1111            // Must have a device...
1112            if (pDevice == NULL)
1113                throw LinuxSamplerException("Internal error: could not create audio output device.");
1114            // Set it as the current channel device...
1115            pSamplerChannel->SetAudioOutputDevice(pDevice);
1116        }
1117        catch (LinuxSamplerException e) {
1118             result.Error(e);
1119        }
1120        return result.Produce();
1121    }
1122    
1123    String LSCPServer::SetMIDIInputPort(uint MIDIPort, uint uiSamplerChannel) {
1124        dmsg(2,("LSCPServer: SetMIDIInputPort(MIDIPort=%d, SamplerChannel=%d)\n",MIDIPort,uiSamplerChannel));
1125        LSCPResultSet result;
1126        try {
1127            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1128            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1129            pSamplerChannel->SetMidiInputPort(MIDIPort);
1130      }      }
1131      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1132           result.Error(e);           result.Error(e);
# Line 606  String LSCPServer::SetMIDIInputPort(Stri Line 1134  String LSCPServer::SetMIDIInputPort(Stri
1134      return result.Produce();      return result.Produce();
1135  }  }
1136    
 /**  
  * Will be called by the parser to change the MIDI input channel on which the  
  * engine of a particular sampler channel should listen to.  
  */  
1137  String LSCPServer::SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel) {  String LSCPServer::SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel) {
1138      dmsg(2,("LSCPServer: SetMIDIInputChannel(MIDIChannel=%d, SamplerChannel=%d)\n", MIDIChannel, uiSamplerChannel));      dmsg(2,("LSCPServer: SetMIDIInputChannel(MIDIChannel=%d, SamplerChannel=%d)\n",MIDIChannel,uiSamplerChannel));
1139      LSCPResultSet result;      LSCPResultSet result;
1140      try {      try {
1141          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1142          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1143          if (!pSamplerChannel->GetMidiInputDevice()) throw LinuxSamplerException("No MIDI input device connected yet");          pSamplerChannel->SetMidiInputChannel((MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);
         MidiInputDevice::type_t oldtype = pSamplerChannel->GetMidiInputDevice()->Type();  
         pSamplerChannel->SetMidiInputDevice(oldtype, (MidiInputDevice::midi_chan_t) MIDIChannel);  
1144      }      }
1145      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1146           result.Error(e);           result.Error(e);
# Line 626  String LSCPServer::SetMIDIInputChannel(u Line 1148  String LSCPServer::SetMIDIInputChannel(u
1148      return result.Produce();      return result.Produce();
1149  }  }
1150    
1151  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint SamplerChannel) {  String LSCPServer::SetMIDIInputDevice(uint MIDIDeviceId, uint uiSamplerChannel) {
1152        dmsg(2,("LSCPServer: SetMIDIInputDevice(MIDIDeviceId=%d, SamplerChannel=%d)\n",MIDIDeviceId,uiSamplerChannel));
1153      LSCPResultSet result;      LSCPResultSet result;
1154      try {      try {
1155          throw LinuxSamplerException("Command not yet implemented");          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1156            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1157            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1158            MidiInputDevice* pDevice = devices[MIDIDeviceId];
1159            if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1160            pSamplerChannel->SetMidiInputDevice(pDevice);
1161        }
1162        catch (LinuxSamplerException e) {
1163             result.Error(e);
1164        }
1165        return result.Produce();
1166    }
1167    
1168    String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) {
1169        dmsg(2,("LSCPServer: SetMIDIInputType(String MidiInputDriver=%s, SamplerChannel=%d)\n",MidiInputDriver.c_str(),uiSamplerChannel));
1170        LSCPResultSet result;
1171        try {
1172            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1173            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1174            // Driver type name aliasing...
1175            if (MidiInputDriver == "ALSA") MidiInputDriver = "Alsa";
1176            // Check if there's one MIDI input device already created
1177            // for the intended MIDI driver type (MidiInputDriver)...
1178            MidiInputDevice *pDevice = NULL;
1179            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1180            std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
1181            for (; iter != devices.end(); iter++) {
1182                if ((iter->second)->Driver() == MidiInputDriver) {
1183                    pDevice = iter->second;
1184                    break;
1185                }
1186            }
1187            // If it doesn't exist, create a new one with default parameters...
1188            if (pDevice == NULL) {
1189                std::map<String,String> params;
1190                pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);
1191                // Make it with at least one initial port.
1192                std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1193                parameters["ports"]->SetValue("1");
1194            }
1195            // Must have a device...
1196            if (pDevice == NULL)
1197                throw LinuxSamplerException("Internal error: could not create MIDI input device.");
1198            // Set it as the current channel device...
1199            pSamplerChannel->SetMidiInputDevice(pDevice);
1200        }
1201        catch (LinuxSamplerException e) {
1202             result.Error(e);
1203        }
1204        return result.Produce();
1205    }
1206    
1207    /**
1208     * Will be called by the parser to change the MIDI input device, port and channel on which
1209     * engine of a particular sampler channel should listen to.
1210     */
1211    String LSCPServer::SetMIDIInput(uint MIDIDeviceId, uint MIDIPort, uint MIDIChannel, uint uiSamplerChannel) {
1212        dmsg(2,("LSCPServer: SetMIDIInput(MIDIDeviceId=%d, MIDIPort=%d, MIDIChannel=%d, SamplerChannel=%d)\n", MIDIDeviceId, MIDIPort, MIDIChannel, uiSamplerChannel));
1213        LSCPResultSet result;
1214        try {
1215            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1216            if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1217            std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();
1218            MidiInputDevice* pDevice = devices[MIDIDeviceId];
1219            if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1220            pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);
1221      }      }
1222      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1223           result.Error(e);           result.Error(e);
# Line 680  String LSCPServer::ResetChannel(uint uiS Line 1268  String LSCPServer::ResetChannel(uint uiS
1268   * 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
1269   * server for receiving event messages.   * server for receiving event messages.
1270   */   */
1271  String LSCPServer::SubscribeNotification(uint UDPPort) {  String LSCPServer::SubscribeNotification(LSCPEvent::event_t type) {
1272      dmsg(2,("LSCPServer: SubscribeNotification(UDPPort=%d)\n", UDPPort));      dmsg(2,("LSCPServer: SubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
1273      return "ERR:0:Not implemented yet.\r\n";      LSCPResultSet result;
1274        SubscriptionMutex.Lock();
1275        eventSubscriptions[type].push_back(currentSocket);
1276        SubscriptionMutex.Unlock();
1277        return result.Produce();
1278  }  }
1279    
1280  /**  /**
1281   * 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
1282   * for not receiving further event messages.   * for not receiving further event messages.
1283   */   */
1284  String LSCPServer::UnsubscribeNotification(String SessionID) {  String LSCPServer::UnsubscribeNotification(LSCPEvent::event_t type) {
1285      dmsg(2,("LSCPServer: UnsubscribeNotification(SessionID=%s)\n", SessionID.c_str()));      dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
1286      return "ERR:0:Not implemented yet.\r\n";      LSCPResultSet result;
1287        SubscriptionMutex.Lock();
1288        eventSubscriptions[type].remove(currentSocket);
1289        SubscriptionMutex.Unlock();
1290        return result.Produce();
1291    }
1292    
1293    
1294    // Instrument loader constructor.
1295    LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)
1296        : Thread(false, 0, -4)
1297    {
1298        this->pEngine = pEngine;
1299        this->Filename = Filename;
1300        this->uiInstrument = uiInstrument;
1301    }
1302    
1303    // Instrument loader process.
1304    int LSCPLoadInstrument::Main()
1305    {
1306        try {
1307            pEngine->LoadInstrument(Filename.c_str(), uiInstrument);
1308        }
1309    
1310        catch (LinuxSamplerException e) {
1311            e.PrintMessage();
1312        }
1313    
1314        // Always re-enable the engine.
1315        pEngine->Enable();
1316    
1317        // FIXME: Shoot ourselves on the foot?
1318        delete this;
1319  }  }

Legend:
Removed from v.123  
changed lines
  Added in v.209

  ViewVC Help
Powered by ViewVC