/[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 1200 by iliev, Thu May 24 14:04:18 2007 UTC revision 1399 by schoenebeck, Thu Oct 11 18:53:29 2007 UTC
# Line 36  Line 36 
36  #include "../drivers/audio/AudioOutputDeviceFactory.h"  #include "../drivers/audio/AudioOutputDeviceFactory.h"
37  #include "../drivers/midi/MidiInputDeviceFactory.h"  #include "../drivers/midi/MidiInputDeviceFactory.h"
38    
39    
40    /**
41     * Returns a copy of the given string where all special characters are
42     * replaced by LSCP escape sequences ("\xHH"). This function shall be used
43     * to escape LSCP response fields in case the respective response field is
44     * actually defined as using escape sequences in the LSCP specs.
45     *
46     * @e Caution: DO NOT use this function for escaping path based responses,
47     * use the Path class (src/common/Path.h) for this instead!
48     */
49    static String _escapeLscpResponse(String txt) {
50        for (int i = 0; i < txt.length(); i++) {
51            const char c = txt.c_str()[i];
52            if (
53                !(c >= '0' && c <= '9') &&
54                !(c >= 'a' && c <= 'z') &&
55                !(c >= 'A' && c <= 'Z') &&
56                !(c == ' ') && !(c == '!') && !(c == '#') && !(c == '$') &&
57                !(c == '%') && !(c == '&') && !(c == '(') && !(c == ')') &&
58                !(c == '*') && !(c == '+') && !(c == ',') && !(c == '-') &&
59                !(c == '.') && !(c == '/') && !(c == ':') && !(c == ';') &&
60                !(c == '<') && !(c == '=') && !(c == '>') && !(c == '?') &&
61                !(c == '@') && !(c == '[') && !(c == '\\') && !(c == ']') &&
62                !(c == '^') && !(c == '_') && !(c == '`') && !(c == '{') &&
63                !(c == '|') && !(c == '}') && !(c == '~')
64            ) {
65                // convert the "special" character into a "\xHH" LSCP escape sequence
66                char buf[5];
67                snprintf(buf, sizeof(buf), "\\x%02x", static_cast<unsigned char>(c));
68                txt.replace(i, 1, buf);
69                i += 3;
70            }
71        }
72        return txt;
73    }
74    
75  /**  /**
76   * Below are a few static members of the LSCPServer class.   * Below are a few static members of the LSCPServer class.
77   * The big assumption here is that LSCPServer is going to remain a singleton.   * The big assumption here is that LSCPServer is going to remain a singleton.
# Line 52  Line 88 
88  fd_set LSCPServer::fdSet;  fd_set LSCPServer::fdSet;
89  int LSCPServer::currentSocket = -1;  int LSCPServer::currentSocket = -1;
90  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();
91    std::vector<yyparse_param_t>::iterator itCurrentSession = std::vector<yyparse_param_t>::iterator();
92  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();
93  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();
94  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 145  void LSCPServer::EventHandler::TotalVoic Line 182  void LSCPServer::EventHandler::TotalVoic
182    
183  #if HAVE_SQLITE3  #if HAVE_SQLITE3
184  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {
185      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, Dir));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, InstrumentsDb::toEscapedPath(Dir)));
186  }  }
187    
188  void LSCPServer::DbInstrumentsEventHandler::DirectoryInfoChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryInfoChanged(String Dir) {
189      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, Dir));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, InstrumentsDb::toEscapedPath(Dir)));
190  }  }
191    
192  void LSCPServer::DbInstrumentsEventHandler::DirectoryNameChanged(String Dir, String NewName) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryNameChanged(String Dir, String NewName) {
193      Dir = "'" + Dir + "'";      Dir = "'" + InstrumentsDb::toEscapedPath(Dir) + "'";
194      NewName = "'" + NewName + "'";      NewName = "'" + InstrumentsDb::toEscapedPath(NewName) + "'";
195      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, "NAME", Dir, NewName));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, "NAME", Dir, NewName));
196  }  }
197    
198  void LSCPServer::DbInstrumentsEventHandler::InstrumentCountChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentCountChanged(String Dir) {
199      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_count, Dir));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_count, InstrumentsDb::toEscapedPath(Dir)));
200  }  }
201    
202  void LSCPServer::DbInstrumentsEventHandler::InstrumentInfoChanged(String Instr) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentInfoChanged(String Instr) {
203      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, Instr));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, InstrumentsDb::toEscapedPath(Instr)));
204  }  }
205    
206  void LSCPServer::DbInstrumentsEventHandler::InstrumentNameChanged(String Instr, String NewName) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentNameChanged(String Instr, String NewName) {
207      Instr = "'" + Instr + "'";      Instr = "'" + InstrumentsDb::toEscapedPath(Instr) + "'";
208      NewName = "'" + NewName + "'";      NewName = "'" + InstrumentsDb::toEscapedPath(NewName) + "'";
209      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, "NAME", Instr, NewName));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, "NAME", Instr, NewName));
210  }  }
211    
# Line 218  int LSCPServer::Main() { Line 255  int LSCPServer::Main() {
255    
256      listen(hSocket, 1);      listen(hSocket, 1);
257      Initialized.Set(true);      Initialized.Set(true);
258        
259      // Registering event listeners      // Registering event listeners
260      pSampler->AddChannelCountListener(&eventHandler);      pSampler->AddChannelCountListener(&eventHandler);
261      pSampler->AddAudioDeviceCountListener(&eventHandler);      pSampler->AddAudioDeviceCountListener(&eventHandler);
# Line 327  int LSCPServer::Main() { Line 364  int LSCPServer::Main() {
364                                  int dummy; // just a temporary hack to fulfill the restart() function prototype                                  int dummy; // just a temporary hack to fulfill the restart() function prototype
365                                  restart(NULL, dummy); // restart the 'scanner'                                  restart(NULL, dummy); // restart the 'scanner'
366                                  currentSocket = (*iter).hSession;  //a hack                                  currentSocket = (*iter).hSession;  //a hack
367                                    itCurrentSession = iter; // another hack
368                                  dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));                                  dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));
369                                  if ((*iter).bVerbose) { // if echo mode enabled                                  if ((*iter).bVerbose) { // if echo mode enabled
370                                      AnswerClient(bufferedCommands[currentSocket]);                                      AnswerClient(bufferedCommands[currentSocket]);
371                                  }                                  }
372                                  int result = yyparse(&(*iter));                                  int result = yyparse(&(*iter));
373                                  currentSocket = -1;     //continuation of a hack                                  currentSocket = -1;     //continuation of a hack
374                                    itCurrentSession = Sessions.end(); // hack as well
375                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
376                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?
377                                          CloseConnection(iter);                                          CloseConnection(iter);
# Line 425  extern int GetLSCPCommand( void *buf, in Line 464  extern int GetLSCPCommand( void *buf, in
464          return command.size();          return command.size();
465  }  }
466    
467    extern yyparse_param_t* GetCurrentYaccSession() {
468        return &(*itCurrentSession);
469    }
470    
471  /**  /**
472   * Will be called to try to read the command from the socket   * Will be called to try to read the command from the socket
473   * If command is read, it will return true. Otherwise false is returned.   * If command is read, it will return true. Otherwise false is returned.
# Line 612  EngineChannel* LSCPServer::GetEngineChan Line 655  EngineChannel* LSCPServer::GetEngineChan
655      EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();      EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
656      if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");      if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
657    
658      return pEngineChannel;              return pEngineChannel;
659  }  }
660    
661  /**  /**
# Line 761  String LSCPServer::GetEngineInfo(String Line 804  String LSCPServer::GetEngineInfo(String
804      LockRTNotify();      LockRTNotify();
805      try {      try {
806          Engine* pEngine = EngineFactory::Create(EngineName);          Engine* pEngine = EngineFactory::Create(EngineName);
807          result.Add("DESCRIPTION", pEngine->Description());          result.Add("DESCRIPTION", _escapeLscpResponse(pEngine->Description()));
808          result.Add("VERSION",     pEngine->Version());          result.Add("VERSION",     pEngine->Version());
809          EngineFactory::Destroy(pEngine);          EngineFactory::Destroy(pEngine);
810      }      }
# Line 834  String LSCPServer::GetChannelInfo(uint u Line 877  String LSCPServer::GetChannelInfo(uint u
877          if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");          if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");
878          else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());          else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
879    
880          result.Add("INSTRUMENT_FILE", InstrumentFileName);          result.Add("INSTRUMENT_FILE",
881                       (InstrumentFileName != "NONE" && InstrumentFileName != "") ?
882                            Path::fromPosix(InstrumentFileName).toLscp() : // TODO: assuming POSIX
883                            InstrumentFileName
884            );
885          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
886          result.Add("INSTRUMENT_NAME", InstrumentName);          result.Add("INSTRUMENT_NAME", _escapeLscpResponse(InstrumentName));
887          result.Add("INSTRUMENT_STATUS", InstrumentStatus);          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
888          result.Add("MUTE", Mute == -1 ? "MUTED_BY_SOLO" : (Mute ? "true" : "false"));          result.Add("MUTE", Mute == -1 ? "MUTED_BY_SOLO" : (Mute ? "true" : "false"));
889          result.Add("SOLO", Solo);          result.Add("SOLO", Solo);
# Line 1778  String LSCPServer::GetMidiInstrumentMapp Line 1825  String LSCPServer::GetMidiInstrumentMapp
1825          std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t>::iterator iter = mappings.find(idx);          std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t>::iterator iter = mappings.find(idx);
1826          if (iter == mappings.end()) result.Error("there is no map entry with that index");          if (iter == mappings.end()) result.Error("there is no map entry with that index");
1827          else { // found          else { // found
1828              result.Add("NAME", iter->second.Name);              result.Add("NAME", _escapeLscpResponse(iter->second.Name));
1829              result.Add("ENGINE_NAME", iter->second.EngineName);              result.Add("ENGINE_NAME", iter->second.EngineName);
1830              result.Add("INSTRUMENT_FILE", iter->second.InstrumentFile);              result.Add("INSTRUMENT_FILE", Path::fromPosix(iter->second.InstrumentFile).toLscp()); //TODO: assuming POSIX
1831              result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);              result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);
1832              String instrumentName;              String instrumentName;
1833              Engine* pEngine = EngineFactory::Create(iter->second.EngineName);              Engine* pEngine = EngineFactory::Create(iter->second.EngineName);
# Line 1793  String LSCPServer::GetMidiInstrumentMapp Line 1840  String LSCPServer::GetMidiInstrumentMapp
1840                  }                  }
1841                  EngineFactory::Destroy(pEngine);                  EngineFactory::Destroy(pEngine);
1842              }              }
1843              result.Add("INSTRUMENT_NAME", instrumentName);              result.Add("INSTRUMENT_NAME", _escapeLscpResponse(instrumentName));
1844              switch (iter->second.LoadMode) {              switch (iter->second.LoadMode) {
1845                  case MidiInstrumentMapper::ON_DEMAND:                  case MidiInstrumentMapper::ON_DEMAND:
1846                      result.Add("LOAD_MODE", "ON_DEMAND");                      result.Add("LOAD_MODE", "ON_DEMAND");
# Line 1948  String LSCPServer::GetMidiInstrumentMap( Line 1995  String LSCPServer::GetMidiInstrumentMap(
1995      dmsg(2,("LSCPServer: GetMidiInstrumentMap()\n"));      dmsg(2,("LSCPServer: GetMidiInstrumentMap()\n"));
1996      LSCPResultSet result;      LSCPResultSet result;
1997      try {      try {
1998          result.Add("NAME", MidiInstrumentMapper::MapName(MidiMapID));          result.Add("NAME", _escapeLscpResponse(MidiInstrumentMapper::MapName(MidiMapID)));
1999          result.Add("DEFAULT", MidiInstrumentMapper::GetDefaultMap() == MidiMapID);          result.Add("DEFAULT", MidiInstrumentMapper::GetDefaultMap() == MidiMapID);
2000      } catch (Exception e) {      } catch (Exception e) {
2001          result.Error(e);          result.Error(e);
# Line 1999  String LSCPServer::CreateFxSend(uint uiS Line 2046  String LSCPServer::CreateFxSend(uint uiS
2046      LSCPResultSet result;      LSCPResultSet result;
2047      try {      try {
2048          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
2049            
2050          FxSend* pFxSend = pEngineChannel->AddFxSend(MidiCtrl, Name);          FxSend* pFxSend = pEngineChannel->AddFxSend(MidiCtrl, Name);
2051          if (!pFxSend) throw Exception("Could not add FxSend, don't ask, I don't know why (probably a bug)");          if (!pFxSend) throw Exception("Could not add FxSend, don't ask, I don't know why (probably a bug)");
2052    
# Line 2083  String LSCPServer::GetFxSendInfo(uint ui Line 2130  String LSCPServer::GetFxSendInfo(uint ui
2130      try {      try {
2131          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
2132          FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);          FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);
2133            
2134          // gather audio routing informations          // gather audio routing informations
2135          String AudioRouting;          String AudioRouting;
2136          for (int chan = 0; chan < pEngineChannel->Channels(); chan++) {          for (int chan = 0; chan < pEngineChannel->Channels(); chan++) {
# Line 2092  String LSCPServer::GetFxSendInfo(uint ui Line 2139  String LSCPServer::GetFxSendInfo(uint ui
2139          }          }
2140    
2141          // success          // success
2142          result.Add("NAME", pFxSend->Name());          result.Add("NAME", _escapeLscpResponse(pFxSend->Name()));
2143          result.Add("MIDI_CONTROLLER", pFxSend->MidiController());          result.Add("MIDI_CONTROLLER", pFxSend->MidiController());
2144          result.Add("LEVEL", ToString(pFxSend->Level()));          result.Add("LEVEL", ToString(pFxSend->Level()));
2145          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);
# Line 2158  String LSCPServer::SetFxSendLevel(uint u Line 2205  String LSCPServer::SetFxSendLevel(uint u
2205      return result.Produce();      return result.Produce();
2206  }  }
2207    
2208    String LSCPServer::EditSamplerChannelInstrument(uint uiSamplerChannel) {
2209        dmsg(2,("LSCPServer: EditSamplerChannelInstrument(SamplerChannel=%d)\n", uiSamplerChannel));
2210        LSCPResultSet result;
2211        try {
2212            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
2213            if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
2214            EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
2215            if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
2216            if (pEngineChannel->InstrumentStatus() < 0) throw Exception("No instrument loaded to sampler channel");
2217            Engine* pEngine = pEngineChannel->GetEngine();
2218            InstrumentManager* pInstrumentManager = pEngine->GetInstrumentManager();
2219            if (!pInstrumentManager) throw Exception("Engine does not provide an instrument manager");
2220            InstrumentManager::instrument_id_t instrumentID;
2221            instrumentID.FileName = pEngineChannel->InstrumentFileName();
2222            instrumentID.Index    = pEngineChannel->InstrumentIndex();
2223            pInstrumentManager->LaunchInstrumentEditor(instrumentID);
2224        } catch (Exception e) {
2225            result.Error(e);
2226        }
2227        return result.Produce();
2228    }
2229    
2230  /**  /**
2231   * Will be called by the parser to reset a particular sampler channel.   * Will be called by the parser to reset a particular sampler channel.
2232   */   */
# Line 2193  String LSCPServer::ResetSampler() { Line 2262  String LSCPServer::ResetSampler() {
2262   */   */
2263  String LSCPServer::GetServerInfo() {  String LSCPServer::GetServerInfo() {
2264      dmsg(2,("LSCPServer: GetServerInfo()\n"));      dmsg(2,("LSCPServer: GetServerInfo()\n"));
2265        const std::string description =
2266            _escapeLscpResponse("LinuxSampler - modular, streaming capable sampler");
2267      LSCPResultSet result;      LSCPResultSet result;
2268      result.Add("DESCRIPTION", "LinuxSampler - modular, streaming capable sampler");      result.Add("DESCRIPTION", description);
2269      result.Add("VERSION", VERSION);      result.Add("VERSION", VERSION);
2270      result.Add("PROTOCOL_VERSION", ToString(LSCP_RELEASE_MAJOR) + "." + ToString(LSCP_RELEASE_MINOR));      result.Add("PROTOCOL_VERSION", ToString(LSCP_RELEASE_MAJOR) + "." + ToString(LSCP_RELEASE_MINOR));
2271  #if HAVE_SQLITE3  #if HAVE_SQLITE3
# Line 2202  String LSCPServer::GetServerInfo() { Line 2273  String LSCPServer::GetServerInfo() {
2273  #else  #else
2274      result.Add("INSTRUMENTS_DB_SUPPORT", "no");      result.Add("INSTRUMENTS_DB_SUPPORT", "no");
2275  #endif  #endif
2276        
2277      return result.Produce();      return result.Produce();
2278  }  }
2279    
# Line 2325  String LSCPServer::GetDbInstrumentDirect Line 2396  String LSCPServer::GetDbInstrumentDirect
2396    
2397          for (int i = 0; i < dirs->size(); i++) {          for (int i = 0; i < dirs->size(); i++) {
2398              if (list != "") list += ",";              if (list != "") list += ",";
2399              list += "'" + dirs->at(i) + "'";              list += "'" + InstrumentsDb::toEscapedPath(dirs->at(i)) + "'";
2400          }          }
2401    
2402          result.Add(list);          result.Add(list);
# Line 2345  String LSCPServer::GetDbInstrumentDirect Line 2416  String LSCPServer::GetDbInstrumentDirect
2416      try {      try {
2417          DbDirectory info = InstrumentsDb::GetInstrumentsDb()->GetDirectoryInfo(Dir);          DbDirectory info = InstrumentsDb::GetInstrumentsDb()->GetDirectoryInfo(Dir);
2418    
2419          result.Add("DESCRIPTION", info.Description);          result.Add("DESCRIPTION", InstrumentsDb::toEscapedText(info.Description));
2420          result.Add("CREATED", info.Created);          result.Add("CREATED", info.Created);
2421          result.Add("MODIFIED", info.Modified);          result.Add("MODIFIED", info.Modified);
2422      } catch (Exception e) {      } catch (Exception e) {
# Line 2451  String LSCPServer::AddDbInstruments(Stri Line 2522  String LSCPServer::AddDbInstruments(Stri
2522          } else {          } else {
2523              throw Exception("Unknown scan mode: " + ScanMode);              throw Exception("Unknown scan mode: " + ScanMode);
2524          }          }
2525            
2526          if (bBackground) result = id;          if (bBackground) result = id;
2527      } catch (Exception e) {      } catch (Exception e) {
2528           result.Error(e);           result.Error(e);
# Line 2502  String LSCPServer::GetDbInstruments(Stri Line 2573  String LSCPServer::GetDbInstruments(Stri
2573    
2574          for (int i = 0; i < instrs->size(); i++) {          for (int i = 0; i < instrs->size(); i++) {
2575              if (list != "") list += ",";              if (list != "") list += ",";
2576              list += "'" + instrs->at(i) + "'";              list += "'" + InstrumentsDb::toEscapedPath(instrs->at(i)) + "'";
2577          }          }
2578    
2579          result.Add(list);          result.Add(list);
# Line 2529  String LSCPServer::GetDbInstrumentInfo(S Line 2600  String LSCPServer::GetDbInstrumentInfo(S
2600          result.Add("SIZE", (int)info.Size);          result.Add("SIZE", (int)info.Size);
2601          result.Add("CREATED", info.Created);          result.Add("CREATED", info.Created);
2602          result.Add("MODIFIED", info.Modified);          result.Add("MODIFIED", info.Modified);
2603          result.Add("DESCRIPTION", FilterEndlines(info.Description));          result.Add("DESCRIPTION", InstrumentsDb::toEscapedText(info.Description));
2604          result.Add("IS_DRUM", info.IsDrum);          result.Add("IS_DRUM", info.IsDrum);
2605          result.Add("PRODUCT", FilterEndlines(info.Product));          result.Add("PRODUCT", InstrumentsDb::toEscapedText(info.Product));
2606          result.Add("ARTISTS", FilterEndlines(info.Artists));          result.Add("ARTISTS", InstrumentsDb::toEscapedText(info.Artists));
2607          result.Add("KEYWORDS", FilterEndlines(info.Keywords));          result.Add("KEYWORDS", InstrumentsDb::toEscapedText(info.Keywords));
2608      } catch (Exception e) {      } catch (Exception e) {
2609           result.Error(e);           result.Error(e);
2610      }      }
# Line 2650  String LSCPServer::FindDbInstrumentDirec Line 2721  String LSCPServer::FindDbInstrumentDirec
2721    
2722          for (int i = 0; i < pDirectories->size(); i++) {          for (int i = 0; i < pDirectories->size(); i++) {
2723              if (list != "") list += ",";              if (list != "") list += ",";
2724              list += "'" + pDirectories->at(i) + "'";              list += "'" + InstrumentsDb::toEscapedPath(pDirectories->at(i)) + "'";
2725          }          }
2726    
2727          result.Add(list);          result.Add(list);
# Line 2706  String LSCPServer::FindDbInstruments(Str Line 2777  String LSCPServer::FindDbInstruments(Str
2777    
2778          for (int i = 0; i < pInstruments->size(); i++) {          for (int i = 0; i < pInstruments->size(); i++) {
2779              if (list != "") list += ",";              if (list != "") list += ",";
2780              list += "'" + pInstruments->at(i) + "'";              list += "'" + InstrumentsDb::toEscapedPath(pInstruments->at(i)) + "'";
2781          }          }
2782    
2783          result.Add(list);          result.Add(list);
# Line 2719  String LSCPServer::FindDbInstruments(Str Line 2790  String LSCPServer::FindDbInstruments(Str
2790      return result.Produce();      return result.Produce();
2791  }  }
2792    
2793    String LSCPServer::FormatInstrumentsDb() {
2794        dmsg(2,("LSCPServer: FormatInstrumentsDb()\n"));
2795        LSCPResultSet result;
2796    #if HAVE_SQLITE3
2797        try {
2798            InstrumentsDb::GetInstrumentsDb()->Format();
2799        } catch (Exception e) {
2800             result.Error(e);
2801        }
2802    #else
2803        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
2804    #endif
2805        return result.Produce();
2806    }
2807    
2808    
2809  /**  /**
2810   * Will be called by the parser to enable or disable echo mode; if echo   * Will be called by the parser to enable or disable echo mode; if echo
# Line 2738  String LSCPServer::SetEcho(yyparse_param Line 2824  String LSCPServer::SetEcho(yyparse_param
2824      }      }
2825      return result.Produce();      return result.Produce();
2826  }  }
   
 String LSCPServer::FilterEndlines(String s) {  
     String s2 = s;  
     for (int i = 0; i < s2.length(); i++) {  
         if (s2.at(i) == '\r') s2.at(i) = ' ';  
         else if (s2.at(i) == '\n') s2.at(i) = ' ';  
     }  
       
     return s2;  
 }  
Legend:
Removed from v.1200  
changed lines
  Added in v.1399
  ViewVC Help
Powered by ViewVC