/[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 880 by schoenebeck, Tue Jun 27 22:57:37 2006 UTC revision 942 by schoenebeck, Sat Nov 25 18:07:34 2006 UTC
# Line 322  bool LSCPServer::GetLSCPCommand( std::ve Line 322  bool LSCPServer::GetLSCPCommand( std::ve
322                                  continue; //Ignore CR                                  continue; //Ignore CR
323                          if (c == '\n') {                          if (c == '\n') {
324                                  LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));                                  LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));
325                                  bufferedCommands[socket] += "\n";                                  bufferedCommands[socket] += "\r\n";
326                                  return true; //Complete command was read                                  return true; //Complete command was read
327                          }                          }
328                          bufferedCommands[socket] += c;                          bufferedCommands[socket] += c;
# Line 588  String LSCPServer::RemoveChannel(uint ui Line 588  String LSCPServer::RemoveChannel(uint ui
588   */   */
589  String LSCPServer::GetAvailableEngines() {  String LSCPServer::GetAvailableEngines() {
590      dmsg(2,("LSCPServer: GetAvailableEngines()\n"));      dmsg(2,("LSCPServer: GetAvailableEngines()\n"));
591      LSCPResultSet result("1");      LSCPResultSet result;
592        try {
593            int n = EngineFactory::AvailableEngineTypes().size();
594            result.Add(n);
595        }
596        catch (Exception e) {
597            result.Error(e);
598        }
599      return result.Produce();      return result.Produce();
600  }  }
601    
# Line 597  String LSCPServer::GetAvailableEngines() Line 604  String LSCPServer::GetAvailableEngines()
604   */   */
605  String LSCPServer::ListAvailableEngines() {  String LSCPServer::ListAvailableEngines() {
606      dmsg(2,("LSCPServer: ListAvailableEngines()\n"));      dmsg(2,("LSCPServer: ListAvailableEngines()\n"));
607      LSCPResultSet result("\'GIG\'");      LSCPResultSet result;
608        try {
609            String s = EngineFactory::AvailableEngineTypesAsString();
610            result.Add(s);
611        }
612        catch (Exception e) {
613            result.Error(e);
614        }
615      return result.Produce();      return result.Produce();
616  }  }
617    
# Line 1568  String LSCPServer::GetServerInfo() { Line 1582  String LSCPServer::GetServerInfo() {
1582      LSCPResultSet result;      LSCPResultSet result;
1583      result.Add("DESCRIPTION", "LinuxSampler - modular, streaming capable sampler");      result.Add("DESCRIPTION", "LinuxSampler - modular, streaming capable sampler");
1584      result.Add("VERSION", VERSION);      result.Add("VERSION", VERSION);
1585      result.Add("PROTOCOL_VERSION", "1.0");      result.Add("PROTOCOL_VERSION", "1.1");
1586      return result.Produce();      return result.Produce();
1587  }  }
1588    
Legend:
Removed from v.880  
changed lines
  Added in v.942
  ViewVC Help
Powered by ViewVC