/[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 1350 by iliev, Sun Sep 16 23:06:10 2007 UTC revision 1525 by schoenebeck, Sun Nov 25 17:47:46 2007 UTC
# Line 25  Line 25 
25  #include "lscpresultset.h"  #include "lscpresultset.h"
26  #include "lscpevent.h"  #include "lscpevent.h"
27    
28    #if defined(WIN32)
29    #else
30  #include <fcntl.h>  #include <fcntl.h>
31    #endif
32    
33  #if ! HAVE_SQLITE3  #if ! HAVE_SQLITE3
34  #define DOESNT_HAVE_SQLITE3 "No database support. SQLITE3 was not installed when linuxsampler was built."  #define DOESNT_HAVE_SQLITE3 "No database support. SQLITE3 was not installed when linuxsampler was built."
# Line 36  Line 39 
39  #include "../drivers/audio/AudioOutputDeviceFactory.h"  #include "../drivers/audio/AudioOutputDeviceFactory.h"
40  #include "../drivers/midi/MidiInputDeviceFactory.h"  #include "../drivers/midi/MidiInputDeviceFactory.h"
41    
42    
43    /**
44     * Returns a copy of the given string where all special characters are
45     * replaced by LSCP escape sequences ("\xHH"). This function shall be used
46     * to escape LSCP response fields in case the respective response field is
47     * actually defined as using escape sequences in the LSCP specs.
48     *
49     * @e Caution: DO NOT use this function for escaping path based responses,
50     * use the Path class (src/common/Path.h) for this instead!
51     */
52    static String _escapeLscpResponse(String txt) {
53        for (int i = 0; i < txt.length(); i++) {
54            const char c = txt.c_str()[i];
55            if (
56                !(c >= '0' && c <= '9') &&
57                !(c >= 'a' && c <= 'z') &&
58                !(c >= 'A' && c <= 'Z') &&
59                !(c == ' ') && !(c == '!') && !(c == '#') && !(c == '$') &&
60                !(c == '%') && !(c == '&') && !(c == '(') && !(c == ')') &&
61                !(c == '*') && !(c == '+') && !(c == ',') && !(c == '-') &&
62                !(c == '.') && !(c == '/') && !(c == ':') && !(c == ';') &&
63                !(c == '<') && !(c == '=') && !(c == '>') && !(c == '?') &&
64                !(c == '@') && !(c == '[') && !(c == ']') &&
65                !(c == '^') && !(c == '_') && !(c == '`') && !(c == '{') &&
66                !(c == '|') && !(c == '}') && !(c == '~')
67            ) {
68                // convert the "special" character into a "\xHH" LSCP escape sequence
69                char buf[5];
70                snprintf(buf, sizeof(buf), "\\x%02x", static_cast<unsigned char>(c));
71                txt.replace(i, 1, buf);
72                i += 3;
73            }
74        }
75        return txt;
76    }
77    
78  /**  /**
79   * Below are a few static members of the LSCPServer class.   * Below are a few static members of the LSCPServer class.
80   * 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 93  LSCPServer::LSCPServer(Sampler* pSampler Line 132  LSCPServer::LSCPServer(Sampler* pSampler
132  }  }
133    
134  LSCPServer::~LSCPServer() {  LSCPServer::~LSCPServer() {
135    #if defined(WIN32)
136        if (hSocket >= 0) closesocket(hSocket);
137    #else
138      if (hSocket >= 0) close(hSocket);      if (hSocket >= 0) close(hSocket);
139    #endif
140  }  }
141    
142  void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {  void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {
# Line 194  int LSCPServer::WaitUntilInitialized(lon Line 237  int LSCPServer::WaitUntilInitialized(lon
237  }  }
238    
239  int LSCPServer::Main() {  int LSCPServer::Main() {
240            #if defined(WIN32)
241            WSADATA wsaData;
242            int iResult;
243            iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
244            if (iResult != 0) {
245                    std::cerr << "LSCPServer: WSAStartup failed: " << iResult << "\n";
246                    exit(EXIT_FAILURE);
247            }
248            #endif
249      hSocket = socket(AF_INET, SOCK_STREAM, 0);      hSocket = socket(AF_INET, SOCK_STREAM, 0);
250      if (hSocket < 0) {      if (hSocket < 0) {
251          std::cerr << "LSCPServer: Could not create server socket." << std::endl;          std::cerr << "LSCPServer: Could not create server socket." << std::endl;
# Line 207  int LSCPServer::Main() { Line 259  int LSCPServer::Main() {
259              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
260                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {
261                      std::cerr << "gave up!" << std::endl;                      std::cerr << "gave up!" << std::endl;
262                        #if defined(WIN32)
263                        closesocket(hSocket);
264                        #else
265                      close(hSocket);                      close(hSocket);
266                        #endif
267                      //return -1;                      //return -1;
268                      exit(EXIT_FAILURE);                      exit(EXIT_FAILURE);
269                  }                  }
# Line 289  int LSCPServer::Main() { Line 345  int LSCPServer::Main() {
345                  continue; //Nothing try again                  continue; //Nothing try again
346          if (retval == -1) {          if (retval == -1) {
347                  std::cerr << "LSCPServer: Socket select error." << std::endl;                  std::cerr << "LSCPServer: Socket select error." << std::endl;
348                    #if defined(WIN32)
349                    closesocket(hSocket);
350                    #else
351                  close(hSocket);                  close(hSocket);
352                    #endif
353                  exit(EXIT_FAILURE);                  exit(EXIT_FAILURE);
354          }          }
355    
# Line 301  int LSCPServer::Main() { Line 361  int LSCPServer::Main() {
361                          exit(EXIT_FAILURE);                          exit(EXIT_FAILURE);
362                  }                  }
363    
364                    #if defined(WIN32)
365                    u_long nonblock_io = 1;
366                    if( ioctlsocket(socket, FIONBIO, &nonblock_io) ) {
367                      std::cerr << "LSCPServer: ioctlsocket: set FIONBIO failed. Error " << WSAGetLastError() << std::endl;
368                      exit(EXIT_FAILURE);
369                    }
370            #else          
371                  if (fcntl(socket, F_SETFL, O_NONBLOCK)) {                  if (fcntl(socket, F_SETFL, O_NONBLOCK)) {
372                          std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;                          std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;
373                          exit(EXIT_FAILURE);                          exit(EXIT_FAILURE);
374                  }                  }
375                    #endif
376    
377                  // Parser initialization                  // Parser initialization
378                  yyparse_param_t yyparse_param;                  yyparse_param_t yyparse_param;
# Line 363  void LSCPServer::CloseConnection( std::v Line 431  void LSCPServer::CloseConnection( std::v
431          NotifyMutex.Lock();          NotifyMutex.Lock();
432          bufferedCommands.erase(socket);          bufferedCommands.erase(socket);
433          bufferedNotifies.erase(socket);          bufferedNotifies.erase(socket);
434            #if defined(WIN32)
435            closesocket(socket);
436            #else
437          close(socket);          close(socket);
438            #endif
439          NotifyMutex.Unlock();          NotifyMutex.Unlock();
440  }  }
441    
# Line 442  bool LSCPServer::GetLSCPCommand( std::ve Line 514  bool LSCPServer::GetLSCPCommand( std::ve
514          char c;          char c;
515          int i = 0;          int i = 0;
516          while (true) {          while (true) {
517                    #if defined(WIN32)
518                    int result = recv(socket, (char *)&c, 1, 0); //Read one character at a time for now
519                    #else
520                  int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now                  int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now
521                    #endif
522                  if (result == 0) { //socket was selected, so 0 here means client has closed the connection                  if (result == 0) { //socket was selected, so 0 here means client has closed the connection
523                          CloseConnection(iter);                          CloseConnection(iter);
524                          break;                          break;
# Line 457  bool LSCPServer::GetLSCPCommand( std::ve Line 533  bool LSCPServer::GetLSCPCommand( std::ve
533                          }                          }
534                          bufferedCommands[socket] += c;                          bufferedCommands[socket] += c;
535                  }                  }
536                    #if defined(WIN32)
537                    if (result == SOCKET_ERROR) {
538                        int wsa_lasterror = WSAGetLastError();
539                            if (wsa_lasterror == WSAEWOULDBLOCK) //Would block, try again later.
540                                    return false;
541                            dmsg(2,("LSCPScanner: Socket error after recv() Error %d.\n", wsa_lasterror));  
542                            CloseConnection(iter);
543                            break;
544                    }
545                    #else
546                  if (result == -1) {                  if (result == -1) {
547                          if (errno == EAGAIN) //Would block, try again later.                          if (errno == EAGAIN) //Would block, try again later.
548                                  return false;                                  return false;
# Line 495  bool LSCPServer::GetLSCPCommand( std::ve Line 581  bool LSCPServer::GetLSCPCommand( std::ve
581                          CloseConnection(iter);                          CloseConnection(iter);
582                          break;                          break;
583                  }                  }
584                    #endif
585          }          }
586          return false;          return false;
587  }  }
# Line 768  String LSCPServer::GetEngineInfo(String Line 855  String LSCPServer::GetEngineInfo(String
855      LockRTNotify();      LockRTNotify();
856      try {      try {
857          Engine* pEngine = EngineFactory::Create(EngineName);          Engine* pEngine = EngineFactory::Create(EngineName);
858          result.Add("DESCRIPTION", pEngine->Description());          result.Add("DESCRIPTION", _escapeLscpResponse(pEngine->Description()));
859          result.Add("VERSION",     pEngine->Version());          result.Add("VERSION",     pEngine->Version());
860          EngineFactory::Destroy(pEngine);          EngineFactory::Destroy(pEngine);
861      }      }
# Line 841  String LSCPServer::GetChannelInfo(uint u Line 928  String LSCPServer::GetChannelInfo(uint u
928          if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");          if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");
929          else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());          else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
930    
931            // convert the filename into the correct encoding as defined for LSCP
932            // (especially in terms of special characters -> escape sequences)
933            if (InstrumentFileName != "NONE" && InstrumentFileName != "") {
934    #if WIN32
935                InstrumentFileName = Path::fromWindows(InstrumentFileName).toLscp();
936    #else
937                // assuming POSIX
938                InstrumentFileName = Path::fromPosix(InstrumentFileName).toLscp();
939    #endif
940            }
941    
942          result.Add("INSTRUMENT_FILE", InstrumentFileName);          result.Add("INSTRUMENT_FILE", InstrumentFileName);
943          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
944          result.Add("INSTRUMENT_NAME", InstrumentName);          result.Add("INSTRUMENT_NAME", _escapeLscpResponse(InstrumentName));
945          result.Add("INSTRUMENT_STATUS", InstrumentStatus);          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
946          result.Add("MUTE", Mute == -1 ? "MUTED_BY_SOLO" : (Mute ? "true" : "false"));          result.Add("MUTE", Mute == -1 ? "MUTED_BY_SOLO" : (Mute ? "true" : "false"));
947          result.Add("SOLO", Solo);          result.Add("SOLO", Solo);
# Line 1785  String LSCPServer::GetMidiInstrumentMapp Line 1883  String LSCPServer::GetMidiInstrumentMapp
1883          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);
1884          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");
1885          else { // found          else { // found
1886              result.Add("NAME", iter->second.Name);  
1887                // convert the filename into the correct encoding as defined for LSCP
1888                // (especially in terms of special characters -> escape sequences)
1889    #if WIN32
1890                const String instrumentFileName = Path::fromWindows(iter->second.InstrumentFile).toLscp();
1891    #else
1892                // assuming POSIX
1893                const String instrumentFileName = Path::fromPosix(iter->second.InstrumentFile).toLscp();
1894    #endif
1895    
1896                result.Add("NAME", _escapeLscpResponse(iter->second.Name));
1897              result.Add("ENGINE_NAME", iter->second.EngineName);              result.Add("ENGINE_NAME", iter->second.EngineName);
1898              result.Add("INSTRUMENT_FILE", iter->second.InstrumentFile);              result.Add("INSTRUMENT_FILE", instrumentFileName);
1899              result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);              result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);
1900              String instrumentName;              String instrumentName;
1901              Engine* pEngine = EngineFactory::Create(iter->second.EngineName);              Engine* pEngine = EngineFactory::Create(iter->second.EngineName);
# Line 1800  String LSCPServer::GetMidiInstrumentMapp Line 1908  String LSCPServer::GetMidiInstrumentMapp
1908                  }                  }
1909                  EngineFactory::Destroy(pEngine);                  EngineFactory::Destroy(pEngine);
1910              }              }
1911              result.Add("INSTRUMENT_NAME", instrumentName);              result.Add("INSTRUMENT_NAME", _escapeLscpResponse(instrumentName));
1912              switch (iter->second.LoadMode) {              switch (iter->second.LoadMode) {
1913                  case MidiInstrumentMapper::ON_DEMAND:                  case MidiInstrumentMapper::ON_DEMAND:
1914                      result.Add("LOAD_MODE", "ON_DEMAND");                      result.Add("LOAD_MODE", "ON_DEMAND");
# Line 1955  String LSCPServer::GetMidiInstrumentMap( Line 2063  String LSCPServer::GetMidiInstrumentMap(
2063      dmsg(2,("LSCPServer: GetMidiInstrumentMap()\n"));      dmsg(2,("LSCPServer: GetMidiInstrumentMap()\n"));
2064      LSCPResultSet result;      LSCPResultSet result;
2065      try {      try {
2066          result.Add("NAME", MidiInstrumentMapper::MapName(MidiMapID));          result.Add("NAME", _escapeLscpResponse(MidiInstrumentMapper::MapName(MidiMapID)));
2067          result.Add("DEFAULT", MidiInstrumentMapper::GetDefaultMap() == MidiMapID);          result.Add("DEFAULT", MidiInstrumentMapper::GetDefaultMap() == MidiMapID);
2068      } catch (Exception e) {      } catch (Exception e) {
2069          result.Error(e);          result.Error(e);
# Line 2099  String LSCPServer::GetFxSendInfo(uint ui Line 2207  String LSCPServer::GetFxSendInfo(uint ui
2207          }          }
2208    
2209          // success          // success
2210          result.Add("NAME", pFxSend->Name());          result.Add("NAME", _escapeLscpResponse(pFxSend->Name()));
2211          result.Add("MIDI_CONTROLLER", pFxSend->MidiController());          result.Add("MIDI_CONTROLLER", pFxSend->MidiController());
2212          result.Add("LEVEL", ToString(pFxSend->Level()));          result.Add("LEVEL", ToString(pFxSend->Level()));
2213          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);
# Line 2222  String LSCPServer::ResetSampler() { Line 2330  String LSCPServer::ResetSampler() {
2330   */   */
2331  String LSCPServer::GetServerInfo() {  String LSCPServer::GetServerInfo() {
2332      dmsg(2,("LSCPServer: GetServerInfo()\n"));      dmsg(2,("LSCPServer: GetServerInfo()\n"));
2333        const std::string description =
2334            _escapeLscpResponse("LinuxSampler - modular, streaming capable sampler");
2335      LSCPResultSet result;      LSCPResultSet result;
2336      result.Add("DESCRIPTION", "LinuxSampler - modular, streaming capable sampler");      result.Add("DESCRIPTION", description);
2337      result.Add("VERSION", VERSION);      result.Add("VERSION", VERSION);
2338      result.Add("PROTOCOL_VERSION", ToString(LSCP_RELEASE_MAJOR) + "." + ToString(LSCP_RELEASE_MINOR));      result.Add("PROTOCOL_VERSION", ToString(LSCP_RELEASE_MAJOR) + "." + ToString(LSCP_RELEASE_MINOR));
2339  #if HAVE_SQLITE3  #if HAVE_SQLITE3
# Line 2273  String LSCPServer::SetGlobalVolume(doubl Line 2383  String LSCPServer::SetGlobalVolume(doubl
2383      return result.Produce();      return result.Produce();
2384  }  }
2385    
2386    String LSCPServer::GetFileInstruments(String Filename) {
2387        LSCPResultSet result;
2388        // try to find a sampler engine that can handle the file
2389        bool bFound = false;
2390        std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
2391        for (int i = 0; !bFound && i < engineTypes.size(); i++) {
2392            Engine* pEngine = NULL;
2393            try {
2394                pEngine = EngineFactory::Create(engineTypes[i]);
2395                if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
2396                InstrumentManager* pManager = pEngine->GetInstrumentManager();
2397                if (pManager) {
2398                    std::vector<InstrumentManager::instrument_id_t> IDs =
2399                        pManager->GetInstrumentFileContent(Filename);
2400                    // return the amount of instruments in the file
2401                    result.Add(IDs.size());
2402                    // no more need to ask other engine types
2403                    bFound = true;
2404                } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
2405            } catch (Exception e) {
2406                // NOOP, as exception is thrown if engine doesn't support file
2407            }
2408            if (pEngine) EngineFactory::Destroy(pEngine);
2409        }
2410        return result.Produce();
2411    }
2412    
2413    String LSCPServer::ListFileInstruments(String Filename) {
2414        LSCPResultSet result;
2415        // try to find a sampler engine that can handle the file
2416        bool bFound = false;
2417        std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
2418        for (int i = 0; !bFound && i < engineTypes.size(); i++) {
2419            Engine* pEngine = NULL;
2420            try {
2421                pEngine = EngineFactory::Create(engineTypes[i]);
2422                if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
2423                InstrumentManager* pManager = pEngine->GetInstrumentManager();
2424                if (pManager) {
2425                    std::vector<InstrumentManager::instrument_id_t> IDs =
2426                        pManager->GetInstrumentFileContent(Filename);
2427                    // return a list of IDs of the instruments in the file
2428                    String s;
2429                    for (int j = 0; j < IDs.size(); j++) {
2430                        if (s.size()) s += ",";
2431                        s += ToString(IDs[j].Index);
2432                    }
2433                    result.Add(s);
2434                    // no more need to ask other engine types
2435                    bFound = true;
2436                } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
2437            } catch (Exception e) {
2438                // NOOP, as exception is thrown if engine doesn't support file
2439            }
2440            if (pEngine) EngineFactory::Destroy(pEngine);
2441        }
2442        return result.Produce();
2443    }
2444    
2445    String LSCPServer::GetFileInstrumentInfo(String Filename, uint InstrumentID) {
2446        LSCPResultSet result;
2447        InstrumentManager::instrument_id_t id;
2448        id.FileName = Filename;
2449        id.Index    = InstrumentID;
2450        // try to find a sampler engine that can handle the file
2451        bool bFound = false;
2452        std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
2453        for (int i = 0; !bFound && i < engineTypes.size(); i++) {
2454            Engine* pEngine = NULL;
2455            try {
2456                pEngine = EngineFactory::Create(engineTypes[i]);
2457                if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
2458                InstrumentManager* pManager = pEngine->GetInstrumentManager();
2459                if (pManager) {
2460                    InstrumentManager::instrument_info_t info =
2461                        pManager->GetInstrumentInfo(id);
2462                    // return detailed informations about the file
2463                    result.Add("NAME", info.InstrumentName);
2464                    result.Add("FORMAT_NAME", engineTypes[i]);
2465                    result.Add("FORMAT_VERSION", info.FormatVersion);
2466                    result.Add("PRODUCT", info.Product);
2467                    result.Add("ARTISTS", info.Artists);
2468                    // no more need to ask other engine types
2469                    bFound = true;
2470                } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
2471            } catch (Exception e) {
2472                // NOOP, as exception is thrown if engine doesn't support file
2473            }
2474            if (pEngine) EngineFactory::Destroy(pEngine);
2475        }
2476        return result.Produce();
2477    }
2478    
2479  /**  /**
2480   * 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
2481   * server for receiving event messages.   * server for receiving event messages.
# Line 2374  String LSCPServer::GetDbInstrumentDirect Line 2577  String LSCPServer::GetDbInstrumentDirect
2577      try {      try {
2578          DbDirectory info = InstrumentsDb::GetInstrumentsDb()->GetDirectoryInfo(Dir);          DbDirectory info = InstrumentsDb::GetInstrumentsDb()->GetDirectoryInfo(Dir);
2579    
2580          result.Add("DESCRIPTION", InstrumentsDb::toEscapedText(info.Description));          result.Add("DESCRIPTION", _escapeLscpResponse(info.Description));
2581          result.Add("CREATED", info.Created);          result.Add("CREATED", info.Created);
2582          result.Add("MODIFIED", info.Modified);          result.Add("MODIFIED", info.Modified);
2583      } catch (Exception e) {      } catch (Exception e) {
# Line 2558  String LSCPServer::GetDbInstrumentInfo(S Line 2761  String LSCPServer::GetDbInstrumentInfo(S
2761          result.Add("SIZE", (int)info.Size);          result.Add("SIZE", (int)info.Size);
2762          result.Add("CREATED", info.Created);          result.Add("CREATED", info.Created);
2763          result.Add("MODIFIED", info.Modified);          result.Add("MODIFIED", info.Modified);
2764          result.Add("DESCRIPTION", InstrumentsDb::toEscapedText(info.Description));          result.Add("DESCRIPTION", _escapeLscpResponse(info.Description));
2765          result.Add("IS_DRUM", info.IsDrum);          result.Add("IS_DRUM", info.IsDrum);
2766          result.Add("PRODUCT", InstrumentsDb::toEscapedText(info.Product));          result.Add("PRODUCT", _escapeLscpResponse(info.Product));
2767          result.Add("ARTISTS", InstrumentsDb::toEscapedText(info.Artists));          result.Add("ARTISTS", _escapeLscpResponse(info.Artists));
2768          result.Add("KEYWORDS", InstrumentsDb::toEscapedText(info.Keywords));          result.Add("KEYWORDS", _escapeLscpResponse(info.Keywords));
2769      } catch (Exception e) {      } catch (Exception e) {
2770           result.Error(e);           result.Error(e);
2771      }      }
# Line 2742  String LSCPServer::FindDbInstruments(Str Line 2945  String LSCPServer::FindDbInstruments(Str
2945      } catch (Exception e) {      } catch (Exception e) {
2946           result.Error(e);           result.Error(e);
2947      }      }
2948    #else
2949        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
2950    #endif
2951        return result.Produce();
2952    }
2953    
2954    String LSCPServer::FormatInstrumentsDb() {
2955        dmsg(2,("LSCPServer: FormatInstrumentsDb()\n"));
2956        LSCPResultSet result;
2957    #if HAVE_SQLITE3
2958        try {
2959            InstrumentsDb::GetInstrumentsDb()->Format();
2960        } catch (Exception e) {
2961             result.Error(e);
2962        }
2963  #else  #else
2964      result.Error(String(DOESNT_HAVE_SQLITE3), 0);      result.Error(String(DOESNT_HAVE_SQLITE3), 0);
2965  #endif  #endif
Legend:
Removed from v.1350  
changed lines
  Added in v.1525
  ViewVC Help
Powered by ViewVC