/[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 185 by senkov, Wed Jul 7 02:49:51 2004 UTC revision 221 by schoenebeck, Fri Aug 20 17:25:19 2004 UTC
# Line 25  Line 25 
25  #include "lscpevent.h"  #include "lscpevent.h"
26    
27  #include "../engines/gig/Engine.h"  #include "../engines/gig/Engine.h"
28  #include "../audiodriver/AudioOutputDeviceFactory.h"  #include "../drivers/audio/AudioOutputDeviceFactory.h"
29  #include "../mididriver/MidiInputDeviceFactory.h"  #include "../drivers/midi/MidiInputDeviceFactory.h"
30    
31  /**  /**
32   * Below are a few static members of the LSCPServer class.   * Below are a few static members of the LSCPServer class.
# Line 43  Line 43 
43   */   */
44  fd_set LSCPServer::fdSet;  fd_set LSCPServer::fdSet;
45  int LSCPServer::currentSocket = -1;  int LSCPServer::currentSocket = -1;
46  std::vector<int> LSCPServer::hSessions = std::vector<int>();  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();
47  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();
48  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();  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> >();  std::map< LSCPEvent::event_t, std::list<int> > LSCPServer::eventSubscriptions = std::map< LSCPEvent::event_t, std::list<int> >();
# Line 61  LSCPServer::LSCPServer(Sampler* pSampler Line 61  LSCPServer::LSCPServer(Sampler* pSampler
61      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
62  }  }
63    
64    /**
65     * Blocks the calling thread until the LSCP Server is initialized and
66     * accepting socket connections, if the server is already initialized then
67     * this method will return immediately.
68     * @param TimeoutSeconds     - optional: max. wait time in seconds
69     *                             (default: 0s)
70     * @param TimeoutNanoSeconds - optional: max wait time in nano seconds
71     *                             (default: 0ns)
72     * @returns  0 on success, a value less than 0 if timeout exceeded
73     */
74    int LSCPServer::WaitUntilInitialized(long TimeoutSeconds, long TimeoutNanoSeconds) {
75        return Initialized.WaitAndUnlockIf(false, TimeoutSeconds, TimeoutNanoSeconds);
76    }
77    
78  int LSCPServer::Main() {  int LSCPServer::Main() {
79      int hSocket = socket(AF_INET, SOCK_STREAM, 0);      int hSocket = socket(AF_INET, SOCK_STREAM, 0);
80      if (hSocket < 0) {      if (hSocket < 0) {
# Line 81  int LSCPServer::Main() { Line 95  int LSCPServer::Main() {
95      }      }
96    
97      listen(hSocket, 1);      listen(hSocket, 1);
98      dmsg(1,("LSCPServer: Server running.\n")); // server running      Initialized.Set(true);
99    
100      // now wait for client connections and handle their requests      // now wait for client connections and handle their requests
101      sockaddr_in client;      sockaddr_in client;
102      int length = sizeof(client);      int length = sizeof(client);
     struct timeval tv;  
     tv.tv_sec = 30;  
     tv.tv_usec = 0;  
103      FD_ZERO(&fdSet);      FD_ZERO(&fdSet);
104      FD_SET(hSocket, &fdSet);      FD_SET(hSocket, &fdSet);
105      int maxSessions = hSocket;      int maxSessions = hSocket;
   
     // Parser initialization  
     yyparse_param_t yyparse_param;  
     yyparse_param.pServer = this;  
106    
107      while (true) {      while (true) {
108          fd_set selectSet = fdSet;          fd_set selectSet = fdSet;
109          int retval = select(maxSessions+1, &selectSet, NULL, NULL, &tv);          int retval = select(maxSessions+1, &selectSet, NULL, NULL, NULL);
110          if (retval == 0)          if (retval == 0)
111                  continue; //Nothing in 30 seconds, try again                  continue; //Nothing try again
112          if (retval == -1) {          if (retval == -1) {
113                  std::cerr << "LSCPServer: Socket select error." << std::endl;                  std::cerr << "LSCPServer: Socket select error." << std::endl;
114                  close(hSocket);                  close(hSocket);
115                  exit(EXIT_FAILURE);                  exit(EXIT_FAILURE);
116          }          }
117            
118          //Accept new connections now (if any)          //Accept new connections now (if any)
119          if (FD_ISSET(hSocket, &selectSet)) {          if (FD_ISSET(hSocket, &selectSet)) {
120                  int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);                  int socket = accept(hSocket, (sockaddr*) &client, (socklen_t*) &length);
# Line 121  int LSCPServer::Main() { Line 128  int LSCPServer::Main() {
128                          exit(EXIT_FAILURE);                          exit(EXIT_FAILURE);
129                  }                  }
130    
131                  hSessions.push_back(socket);                  // Parser initialization
132                    yyparse_param_t yyparse_param;
133                    yyparse_param.pServer  = this;
134                    yyparse_param.hSession = socket;
135    
136                    Sessions.push_back(yyparse_param);
137                  FD_SET(socket, &fdSet);                  FD_SET(socket, &fdSet);
138                  if (socket > maxSessions)                  if (socket > maxSessions)
139                          maxSessions = socket;                          maxSessions = socket;
# Line 131  int LSCPServer::Main() { Line 143  int LSCPServer::Main() {
143          }          }
144    
145          //Something was selected and it was not the hSocket, so it must be some command(s) coming.          //Something was selected and it was not the hSocket, so it must be some command(s) coming.
146          for (std::vector<int>::iterator iter = hSessions.begin(); iter !=  hSessions.end(); iter++) {          for (std::vector<yyparse_param_t>::iterator iter = Sessions.begin(); iter != Sessions.end(); iter++) {
147                  if (FD_ISSET(*iter, &selectSet)) {      //Was it this socket?                  if (FD_ISSET((*iter).hSession, &selectSet)) {   //Was it this socket?
148                          if (GetLSCPCommand(iter)) {     //Have we read the entire command?                          if (GetLSCPCommand(iter)) {     //Have we read the entire command?
149                                  dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));                                  dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));
150                                  yylex_init(&yyparse_param.pScanner);                                  int dummy; // just a temporary hack to fulfill the restart() function prototype
151                                  currentSocket = *iter;  //a hack                                  restart(NULL, dummy); // restart the 'scanner'
152                                  int result = yyparse(&yyparse_param);                                  currentSocket = (*iter).hSession;  //a hack
153                                    if ((*iter).bVerbose) { // if echo mode enabled
154                                        AnswerClient(bufferedCommands[currentSocket]);
155                                    }
156                                    int result = yyparse(&(*iter));
157                                  currentSocket = -1;     //continuation of a hack                                  currentSocket = -1;     //continuation of a hack
158                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
159                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?
# Line 146  int LSCPServer::Main() { Line 162  int LSCPServer::Main() {
162                          }                          }
163                          //socket may have been closed, iter may be invalid, get out of the loop for now.                          //socket may have been closed, iter may be invalid, get out of the loop for now.
164                          //we'll be back if there is data.                          //we'll be back if there is data.
165                          break;                          break;
166                  }                  }
167          }          }
168    
# Line 158  int LSCPServer::Main() { Line 174  int LSCPServer::Main() {
174          }          }
175          NotifyBufferMutex.Unlock();          NotifyBufferMutex.Unlock();
176      }      }
     //It will never get here anyway  
     //yylex_destroy(yyparse_param.pScanner);  
177  }  }
178    
179  void LSCPServer::CloseConnection( std::vector<int>::iterator iter ) {  void LSCPServer::CloseConnection( std::vector<yyparse_param_t>::iterator iter ) {
180          int socket = *iter;          int socket = (*iter).hSession;
181          dmsg(1,("LSCPServer: Client connection terminated on socket:%d.\n",socket));          dmsg(1,("LSCPServer: Client connection terminated on socket:%d.\n",socket));
182          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));
183          hSessions.erase(iter);          Sessions.erase(iter);
184          FD_CLR(socket,  &fdSet);          FD_CLR(socket,  &fdSet);
185          SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)          SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)
186          for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {          for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {
# Line 230  extern int GetLSCPCommand( void *buf, in Line 244  extern int GetLSCPCommand( void *buf, in
244   * If command is read, it will return true. Otherwise false is returned.   * If command is read, it will return true. Otherwise false is returned.
245   * In any case the received portion (complete or incomplete) is saved into bufferedCommand map.   * In any case the received portion (complete or incomplete) is saved into bufferedCommand map.
246   */   */
247  bool LSCPServer::GetLSCPCommand( std::vector<int>::iterator iter ) {  bool LSCPServer::GetLSCPCommand( std::vector<yyparse_param_t>::iterator iter ) {
248          int socket = *iter;          int socket = (*iter).hSession;
249          char c;          char c;
250          int i = 0;          int i = 0;
251          while (true) {          while (true) {
# Line 241  bool LSCPServer::GetLSCPCommand( std::ve Line 255  bool LSCPServer::GetLSCPCommand( std::ve
255                          break;                          break;
256                  }                  }
257                  if (result == 1) {                  if (result == 1) {
258                          if (c == '\r')                          if (c == '\r')
259                                  continue; //Ignore CR                                  continue; //Ignore CR
260                          if (c == '\n') {                          if (c == '\n') {
261                                  LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));                                  LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));
# Line 268  bool LSCPServer::GetLSCPCommand( std::ve Line 282  bool LSCPServer::GetLSCPCommand( std::ve
282                                          break;                                          break;
283                                  case EAGAIN:                                  case EAGAIN:
284                                          dmsg(2,("LSCPScanner: The socket is marked non-blocking and the receive operation would block, or a receive timeout had been set and the timeout expired before data was received.\n"));                                          dmsg(2,("LSCPScanner: The socket is marked non-blocking and the receive operation would block, or a receive timeout had been set and the timeout expired before data was received.\n"));
285                                          break;                                          break;
286                                  case EINTR:                                  case EINTR:
287                                          dmsg(2,("LSCPScanner: The receive was interrupted by delivery of a signal before any data were available.\n"));                                          dmsg(2,("LSCPScanner: The receive was interrupted by delivery of a signal before any data were available.\n"));
288                                          break;                                          break;
289                                  case EFAULT:                                  case EFAULT:
290                                          dmsg(2,("LSCPScanner: The receive buffer pointer(s) point outside the process's address space.\n"));                                          dmsg(2,("LSCPScanner: The receive buffer pointer(s) point outside the process's address space.\n"));
291                                          break;                                          break;
292                                  case EINVAL:                                  case EINVAL:
293                                          dmsg(2,("LSCPScanner: Invalid argument passed.\n"));                                          dmsg(2,("LSCPScanner: Invalid argument passed.\n"));
294                                          break;                                          break;
295                                  case ENOMEM:                                  case ENOMEM:
296                                          dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));                                          dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));
297                                          break;                                          break;
298                                  default:                                  default:
299                                          dmsg(2,("LSCPScanner: Unknown recv() error.\n"));                                          dmsg(2,("LSCPScanner: Unknown recv() error.\n"));
300                                          break;                                          break;
301                          }                          }
302                          CloseConnection(iter);                          CloseConnection(iter);
303                          break;                          break;
304                  }                  }
# Line 457  String LSCPServer::GetChannels() { Line 471  String LSCPServer::GetChannels() {
471  }  }
472    
473  /**  /**
474     * Will be called by the parser to get the list of sampler channels.
475     */
476    String LSCPServer::ListChannels() {
477        dmsg(2,("LSCPServer: ListChannels()\n"));
478        String list;
479        std::map<uint,SamplerChannel*> channels = pSampler->GetSamplerChannels();
480        std::map<uint,SamplerChannel*>::iterator iter = channels.begin();
481        for (; iter != channels.end(); iter++) {
482            if (list != "") list += ",";
483            list += ToString(iter->first);
484        }
485        LSCPResultSet result;
486        result.Add(list);
487        return result.Produce();
488    }
489    
490    /**
491   * Will be called by the parser to add a sampler channel.   * Will be called by the parser to add a sampler channel.
492   */   */
493  String LSCPServer::AddChannel() {  String LSCPServer::AddChannel() {
# Line 710  String LSCPServer::GetMidiInputDriverPar Line 741  String LSCPServer::GetMidiInputDriverPar
741          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);
742          result.Add("TYPE",         pParameter->Type());          result.Add("TYPE",         pParameter->Type());
743          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
744          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    (pParameter->Mandatory())    ? "true" : "false");
745          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          (pParameter->Fix())          ? "true" : "false");
746          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", (pParameter->Multiplicity()) ? "true" : "false");
747          if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());          if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());
748          if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());          if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());
749          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
750          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
751          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
752      }      }
753      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
754          result.Error(e);          result.Error(e);
# Line 732  String LSCPServer::GetAudioOutputDriverP Line 763  String LSCPServer::GetAudioOutputDriverP
763          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);
764          result.Add("TYPE",         pParameter->Type());          result.Add("TYPE",         pParameter->Type());
765          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
766          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    (pParameter->Mandatory())    ? "true" : "false");
767          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          (pParameter->Fix())          ? "true" : "false");
768          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", (pParameter->Multiplicity()) ? "true" : "false");
769          if (pParameter->Depends())       result.Add("DEPENDS",       pParameter->Depends());          if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());
770          if (pParameter->Default())       result.Add("DEFAULT",       pParameter->Default());          if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());
771          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
772          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
773          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
774      }      }
775      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
776          result.Error(e);          result.Error(e);
# Line 818  String LSCPServer::GetAudioOutputDeviceI Line 849  String LSCPServer::GetAudioOutputDeviceI
849          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
850          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) + ".");
851          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
852          result.Add("driver", pDevice->Driver());          result.Add("DRIVER", pDevice->Driver());
853          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
854          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
855          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 838  String LSCPServer::GetMidiInputDeviceInf Line 869  String LSCPServer::GetMidiInputDeviceInf
869          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
870          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
871          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
872          result.Add("driver", pDevice->Driver());          result.Add("DRIVER", pDevice->Driver());
873          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
874          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
875          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 857  String LSCPServer::GetMidiInputPortInfo( Line 888  String LSCPServer::GetMidiInputPortInfo(
888          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
889          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
890          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
891          MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);          MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
892          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
893          std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
894          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceRuntimeParameter*>::iterator iter = parameters.begin();
895          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
896              result.Add(iter->first, iter->second->Value());              result.Add(iter->first, iter->second->Value());
897          }          }
# Line 906  String LSCPServer::GetMidiInputPortParam Line 937  String LSCPServer::GetMidiInputPortParam
937          if (!devices[DeviceId]) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");          if (!devices[DeviceId]) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");
938          MidiInputDevice* pDevice = devices[DeviceId];          MidiInputDevice* pDevice = devices[DeviceId];
939    
940          // get midi port          // get midi port
941          MidiInputDevice::MidiInputPort* pPort = pDevice->GetPort(PortId);          MidiInputPort* pPort = pDevice->GetPort(PortId);
942          if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");          if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");
943    
944          // get desired port parameter          // get desired port parameter
945          std::map<String,DeviceCreationParameter*> parameters = pPort->DeviceParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pPort->PortParameters();
946          if (!parameters[ParameterName]) throw LinuxSamplerException("Midi port does not provice a parameters '" + ParameterName + "'.");          if (!parameters[ParameterName]) throw LinuxSamplerException("Midi port does not provice a parameters '" + ParameterName + "'.");
947          DeviceCreationParameter* pParameter = parameters[ParameterName];          DeviceRuntimeParameter* pParameter = parameters[ParameterName];
948            
949          // return all fields of this audio channel parameter          // return all fields of this audio channel parameter
950          result.Add("TYPE",         pParameter->Type());          result.Add("TYPE",         pParameter->Type());
951          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
# Line 1031  String LSCPServer::SetMidiInputPortParam Line 1062  String LSCPServer::SetMidiInputPortParam
1062          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1063          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
1064          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1065          MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);          MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
1066          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
1067          std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
1068          if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");          if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
1069          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1070      }      }
# Line 1077  String LSCPServer::SetAudioOutputType(St Line 1108  String LSCPServer::SetAudioOutputType(St
1108          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1109          // Driver type name aliasing...          // Driver type name aliasing...
1110          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";
1111          if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";                  if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";
1112          // Check if there's one audio output device already created          // Check if there's one audio output device already created
1113          // for the intended audio driver type (AudioOutputDriver)...          // for the intended audio driver type (AudioOutputDriver)...
1114          AudioOutputDevice *pDevice = NULL;          AudioOutputDevice *pDevice = NULL;
# Line 1126  String LSCPServer::SetMIDIInputChannel(u Line 1157  String LSCPServer::SetMIDIInputChannel(u
1157      try {      try {
1158          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1159          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1160          pSamplerChannel->SetMidiInputChannel((MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);          pSamplerChannel->SetMidiInputChannel((MidiInputPort::midi_chan_t) MIDIChannel);
1161      }      }
1162      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1163           result.Error(e);           result.Error(e);
# Line 1176  String LSCPServer::SetMIDIInputType(Stri Line 1207  String LSCPServer::SetMIDIInputType(Stri
1207              pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);              pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);
1208              // Make it with at least one initial port.              // Make it with at least one initial port.
1209              std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();              std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1210              parameters["ports"]->SetValue("1");              parameters["PORTS"]->SetValue("1");
1211          }          }
1212          // Must have a device...          // Must have a device...
1213          if (pDevice == NULL)          if (pDevice == NULL)
# Line 1203  String LSCPServer::SetMIDIInput(uint MID Line 1234  String LSCPServer::SetMIDIInput(uint MID
1234          std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();          std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();
1235          MidiInputDevice* pDevice = devices[MIDIDeviceId];          MidiInputDevice* pDevice = devices[MIDIDeviceId];
1236          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1237          pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);          pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputPort::midi_chan_t) MIDIChannel);
1238      }      }
1239      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1240           result.Error(e);           result.Error(e);
# Line 1251  String LSCPServer::ResetChannel(uint uiS Line 1282  String LSCPServer::ResetChannel(uint uiS
1282  }  }
1283    
1284  /**  /**
1285     * Will be called by the parser to reset the whole sampler.
1286     */
1287    String LSCPServer::ResetSampler() {
1288        dmsg(2,("LSCPServer: ResetSampler()\n"));
1289        pSampler->Reset();
1290        LSCPResultSet result;
1291        return result.Produce();
1292    }
1293    
1294    /**
1295   * 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
1296   * server for receiving event messages.   * server for receiving event messages.
1297   */   */
# Line 1276  String LSCPServer::UnsubscribeNotificati Line 1317  String LSCPServer::UnsubscribeNotificati
1317      return result.Produce();      return result.Produce();
1318  }  }
1319    
1320    /**
1321     * Will be called by the parser to enable or disable echo mode; if echo
1322     * mode is enabled, all commands from the client will (immediately) be
1323     * echoed back to the client.
1324     */
1325    String LSCPServer::SetEcho(yyparse_param_t* pSession, double boolean_value) {
1326        dmsg(2,("LSCPServer: SetEcho(val=%f)\n", boolean_value));
1327        LSCPResultSet result;
1328        try {
1329            if      (boolean_value == 0) pSession->bVerbose = false;
1330            else if (boolean_value == 1) pSession->bVerbose = true;
1331            else throw LinuxSamplerException("Not a boolean value, must either be 0 or 1");
1332        }
1333        catch (LinuxSamplerException e) {
1334             result.Error(e);
1335        }
1336        return result.Produce();
1337    }
1338    
1339  // Instrument loader constructor.  // Instrument loader constructor.
1340  LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)  LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)
Legend:
Removed from v.185  
changed lines
  Added in v.221
  ViewVC Help
Powered by ViewVC