/[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 1337 by iliev, Sun Sep 9 23:27:23 2007 UTC revision 1695 by schoenebeck, Sat Feb 16 01:09:33 2008 UTC
# Line 3  Line 3 
3   *   LinuxSampler - modular, streaming capable sampler                     *   *   LinuxSampler - modular, streaming capable sampler                     *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
6   *   Copyright (C) 2005 - 2007 Christian Schoenebeck                       *   *   Copyright (C) 2005 - 2008 Christian Schoenebeck                       *
7   *                                                                         *   *                                                                         *
8   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
9   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 25  Line 25 
25  #include "lscpresultset.h"  #include "lscpresultset.h"
26  #include "lscpevent.h"  #include "lscpevent.h"
27    
28    #if defined(WIN32)
29    #include <windows.h>
30    #else
31  #include <fcntl.h>  #include <fcntl.h>
32    #endif
33    
34  #if ! HAVE_SQLITE3  #if ! HAVE_SQLITE3
35  #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 40 
40  #include "../drivers/audio/AudioOutputDeviceFactory.h"  #include "../drivers/audio/AudioOutputDeviceFactory.h"
41  #include "../drivers/midi/MidiInputDeviceFactory.h"  #include "../drivers/midi/MidiInputDeviceFactory.h"
42    
43    
44    /**
45     * Returns a copy of the given string where all special characters are
46     * replaced by LSCP escape sequences ("\xHH"). This function shall be used
47     * to escape LSCP response fields in case the respective response field is
48     * actually defined as using escape sequences in the LSCP specs.
49     *
50     * @e Caution: DO NOT use this function for escaping path based responses,
51     * use the Path class (src/common/Path.h) for this instead!
52     */
53    static String _escapeLscpResponse(String txt) {
54        for (int i = 0; i < txt.length(); i++) {
55            const char c = txt.c_str()[i];
56            if (
57                !(c >= '0' && c <= '9') &&
58                !(c >= 'a' && c <= 'z') &&
59                !(c >= 'A' && c <= 'Z') &&
60                !(c == ' ') && !(c == '!') && !(c == '#') && !(c == '$') &&
61                !(c == '%') && !(c == '&') && !(c == '(') && !(c == ')') &&
62                !(c == '*') && !(c == '+') && !(c == ',') && !(c == '-') &&
63                !(c == '.') && !(c == '/') && !(c == ':') && !(c == ';') &&
64                !(c == '<') && !(c == '=') && !(c == '>') && !(c == '?') &&
65                !(c == '@') && !(c == '[') && !(c == ']') &&
66                !(c == '^') && !(c == '_') && !(c == '`') && !(c == '{') &&
67                !(c == '|') && !(c == '}') && !(c == '~')
68            ) {
69                // convert the "special" character into a "\xHH" LSCP escape sequence
70                char buf[5];
71                snprintf(buf, sizeof(buf), "\\x%02x", static_cast<unsigned char>(c));
72                txt.replace(i, 1, buf);
73                i += 3;
74            }
75        }
76        return txt;
77    }
78    
79  /**  /**
80   * Below are a few static members of the LSCPServer class.   * Below are a few static members of the LSCPServer class.
81   * 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 61  Mutex LSCPServer::NotifyBufferMutex = Mu Line 101  Mutex LSCPServer::NotifyBufferMutex = Mu
101  Mutex LSCPServer::SubscriptionMutex = Mutex();  Mutex LSCPServer::SubscriptionMutex = Mutex();
102  Mutex LSCPServer::RTNotifyMutex = Mutex();  Mutex LSCPServer::RTNotifyMutex = Mutex();
103    
104  LSCPServer::LSCPServer(Sampler* pSampler, long int addr, short int port) : Thread(true, false, 0, -4) {  LSCPServer::LSCPServer(Sampler* pSampler, long int addr, short int port) : Thread(true, false, 0, -4), eventHandler(this) {
105      SocketAddress.sin_family      = AF_INET;      SocketAddress.sin_family      = AF_INET;
106      SocketAddress.sin_addr.s_addr = addr;      SocketAddress.sin_addr.s_addr = addr;
107      SocketAddress.sin_port        = port;      SocketAddress.sin_port        = port;
# Line 87  LSCPServer::LSCPServer(Sampler* pSampler Line 127  LSCPServer::LSCPServer(Sampler* pSampler
127      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");
128      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instrs_job_info, "DB_INSTRUMENTS_JOB_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instrs_job_info, "DB_INSTRUMENTS_JOB_INFO");
129      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
130        LSCPEvent::RegisterEvent(LSCPEvent::event_total_stream_count, "TOTAL_STREAM_COUNT");
131      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");
132      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");
133        LSCPEvent::RegisterEvent(LSCPEvent::event_channel_midi, "CHANNEL_MIDI");
134        LSCPEvent::RegisterEvent(LSCPEvent::event_device_midi, "DEVICE_MIDI");
135      hSocket = -1;      hSocket = -1;
136  }  }
137    
138  LSCPServer::~LSCPServer() {  LSCPServer::~LSCPServer() {
139    #if defined(WIN32)
140        if (hSocket >= 0) closesocket(hSocket);
141    #else
142      if (hSocket >= 0) close(hSocket);      if (hSocket >= 0) close(hSocket);
143    #endif
144    }
145    
146    LSCPServer::EventHandler::EventHandler(LSCPServer* pParent) {
147        this->pParent = pParent;
148    }
149    
150    LSCPServer::EventHandler::~EventHandler() {
151        std::vector<midi_listener_entry> l = channelMidiListeners;
152        channelMidiListeners.clear();
153        for (int i = 0; i < l.size(); i++)
154            delete l[i].pMidiListener;
155  }  }
156    
157  void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {  void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {
158      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, NewCount));
159  }  }
160    
161    void LSCPServer::EventHandler::ChannelAdded(SamplerChannel* pChannel) {
162        pChannel->AddEngineChangeListener(this);
163    }
164    
165    void LSCPServer::EventHandler::ChannelToBeRemoved(SamplerChannel* pChannel) {
166        if (!pChannel->GetEngineChannel()) return;
167        EngineToBeChanged(pChannel->Index());
168    }
169    
170    void LSCPServer::EventHandler::EngineToBeChanged(int ChannelId) {
171        SamplerChannel* pSamplerChannel =
172            pParent->pSampler->GetSamplerChannel(ChannelId);
173        if (!pSamplerChannel) return;
174        EngineChannel* pEngineChannel =
175            pSamplerChannel->GetEngineChannel();
176        if (!pEngineChannel) return;
177        for (std::vector<midi_listener_entry>::iterator iter = channelMidiListeners.begin(); iter != channelMidiListeners.end(); ++iter) {
178            if ((*iter).pEngineChannel == pEngineChannel) {
179                VirtualMidiDevice* pMidiListener = (*iter).pMidiListener;
180                pEngineChannel->Disconnect(pMidiListener);
181                channelMidiListeners.erase(iter);
182                delete pMidiListener;
183                return;
184            }
185        }
186    }
187    
188    void LSCPServer::EventHandler::EngineChanged(int ChannelId) {
189        SamplerChannel* pSamplerChannel =
190            pParent->pSampler->GetSamplerChannel(ChannelId);
191        if (!pSamplerChannel) return;
192        EngineChannel* pEngineChannel =
193            pSamplerChannel->GetEngineChannel();
194        if (!pEngineChannel) return;
195        VirtualMidiDevice* pMidiListener = new VirtualMidiDevice;
196        pEngineChannel->Connect(pMidiListener);
197        midi_listener_entry entry = {
198            pSamplerChannel, pEngineChannel, pMidiListener
199        };
200        channelMidiListeners.push_back(entry);
201    }
202    
203  void LSCPServer::EventHandler::AudioDeviceCountChanged(int NewCount) {  void LSCPServer::EventHandler::AudioDeviceCountChanged(int NewCount) {
204      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_audio_device_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_audio_device_count, NewCount));
205  }  }
# Line 108  void LSCPServer::EventHandler::MidiDevic Line 208  void LSCPServer::EventHandler::MidiDevic
208      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_device_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_device_count, NewCount));
209  }  }
210    
211    void LSCPServer::EventHandler::MidiDeviceToBeDestroyed(MidiInputDevice* pDevice) {
212        pDevice->RemoveMidiPortCountListener(this);
213        for (int i = 0; i < pDevice->PortCount(); ++i)
214            MidiPortToBeRemoved(pDevice->GetPort(i));
215    }
216    
217    void LSCPServer::EventHandler::MidiDeviceCreated(MidiInputDevice* pDevice) {
218        pDevice->AddMidiPortCountListener(this);
219        for (int i = 0; i < pDevice->PortCount(); ++i)
220            MidiPortAdded(pDevice->GetPort(i));
221    }
222    
223    void LSCPServer::EventHandler::MidiPortCountChanged(int NewCount) {
224        // yet unused
225    }
226    
227    void LSCPServer::EventHandler::MidiPortToBeRemoved(MidiInputPort* pPort) {
228        for (std::vector<device_midi_listener_entry>::iterator iter = deviceMidiListeners.begin(); iter != deviceMidiListeners.end(); ++iter) {
229            if ((*iter).pPort == pPort) {
230                VirtualMidiDevice* pMidiListener = (*iter).pMidiListener;
231                pPort->Disconnect(pMidiListener);
232                deviceMidiListeners.erase(iter);
233                delete pMidiListener;
234                return;
235            }
236        }
237    }
238    
239    void LSCPServer::EventHandler::MidiPortAdded(MidiInputPort* pPort) {
240        // find out the device ID
241        std::map<uint, MidiInputDevice*> devices =
242            pParent->pSampler->GetMidiInputDevices();
243        for (
244            std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
245            iter != devices.end(); ++iter
246        ) {
247            if (iter->second == pPort->GetDevice()) { // found
248                VirtualMidiDevice* pMidiListener = new VirtualMidiDevice;
249                pPort->Connect(pMidiListener);
250                device_midi_listener_entry entry = {
251                    pPort, pMidiListener, iter->first
252                };
253                deviceMidiListeners.push_back(entry);
254                return;
255            }
256        }
257    }
258    
259  void LSCPServer::EventHandler::MidiInstrumentCountChanged(int MapId, int NewCount) {  void LSCPServer::EventHandler::MidiInstrumentCountChanged(int MapId, int NewCount) {
260      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_count, MapId, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_count, MapId, NewCount));
261  }  }
# Line 144  void LSCPServer::EventHandler::TotalVoic Line 292  void LSCPServer::EventHandler::TotalVoic
292      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_voice_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_voice_count, NewCount));
293  }  }
294    
295    void LSCPServer::EventHandler::TotalStreamCountChanged(int NewCount) {
296        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_stream_count, NewCount));
297    }
298    
299  #if HAVE_SQLITE3  #if HAVE_SQLITE3
300  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {
301      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, Dir));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, InstrumentsDb::toEscapedPath(Dir)));
302  }  }
303    
304  void LSCPServer::DbInstrumentsEventHandler::DirectoryInfoChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryInfoChanged(String Dir) {
305      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, Dir));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, InstrumentsDb::toEscapedPath(Dir)));
306  }  }
307    
308  void LSCPServer::DbInstrumentsEventHandler::DirectoryNameChanged(String Dir, String NewName) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryNameChanged(String Dir, String NewName) {
309      Dir = "'" + Dir + "'";      Dir = "'" + InstrumentsDb::toEscapedPath(Dir) + "'";
310      NewName = "'" + NewName + "'";      NewName = "'" + InstrumentsDb::toEscapedPath(NewName) + "'";
311      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, "NAME", Dir, NewName));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, "NAME", Dir, NewName));
312  }  }
313    
314  void LSCPServer::DbInstrumentsEventHandler::InstrumentCountChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentCountChanged(String Dir) {
315      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_count, Dir));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_count, InstrumentsDb::toEscapedPath(Dir)));
316  }  }
317    
318  void LSCPServer::DbInstrumentsEventHandler::InstrumentInfoChanged(String Instr) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentInfoChanged(String Instr) {
319      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, Instr));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, InstrumentsDb::toEscapedPath(Instr)));
320  }  }
321    
322  void LSCPServer::DbInstrumentsEventHandler::InstrumentNameChanged(String Instr, String NewName) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentNameChanged(String Instr, String NewName) {
323      Instr = "'" + Instr + "'";      Instr = "'" + InstrumentsDb::toEscapedPath(Instr) + "'";
324      NewName = "'" + NewName + "'";      NewName = "'" + InstrumentsDb::toEscapedPath(NewName) + "'";
325      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, "NAME", Instr, NewName));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, "NAME", Instr, NewName));
326  }  }
327    
# Line 194  int LSCPServer::WaitUntilInitialized(lon Line 346  int LSCPServer::WaitUntilInitialized(lon
346  }  }
347    
348  int LSCPServer::Main() {  int LSCPServer::Main() {
349            #if defined(WIN32)
350            WSADATA wsaData;
351            int iResult;
352            iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
353            if (iResult != 0) {
354                    std::cerr << "LSCPServer: WSAStartup failed: " << iResult << "\n";
355                    exit(EXIT_FAILURE);
356            }
357            #endif
358      hSocket = socket(AF_INET, SOCK_STREAM, 0);      hSocket = socket(AF_INET, SOCK_STREAM, 0);
359      if (hSocket < 0) {      if (hSocket < 0) {
360          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 368  int LSCPServer::Main() {
368              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
369                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {
370                      std::cerr << "gave up!" << std::endl;                      std::cerr << "gave up!" << std::endl;
371                        #if defined(WIN32)
372                        closesocket(hSocket);
373                        #else
374                      close(hSocket);                      close(hSocket);
375                        #endif
376                      //return -1;                      //return -1;
377                      exit(EXIT_FAILURE);                      exit(EXIT_FAILURE);
378                  }                  }
# Line 227  int LSCPServer::Main() { Line 392  int LSCPServer::Main() {
392      pSampler->AddVoiceCountListener(&eventHandler);      pSampler->AddVoiceCountListener(&eventHandler);
393      pSampler->AddStreamCountListener(&eventHandler);      pSampler->AddStreamCountListener(&eventHandler);
394      pSampler->AddBufferFillListener(&eventHandler);      pSampler->AddBufferFillListener(&eventHandler);
395        pSampler->AddTotalStreamCountListener(&eventHandler);
396      pSampler->AddTotalVoiceCountListener(&eventHandler);      pSampler->AddTotalVoiceCountListener(&eventHandler);
397      pSampler->AddFxSendCountListener(&eventHandler);      pSampler->AddFxSendCountListener(&eventHandler);
398      MidiInstrumentMapper::AddMidiInstrumentCountListener(&eventHandler);      MidiInstrumentMapper::AddMidiInstrumentCountListener(&eventHandler);
# Line 246  int LSCPServer::Main() { Line 412  int LSCPServer::Main() {
412      timeval timeout;      timeval timeout;
413    
414      while (true) {      while (true) {
415            #if CONFIG_PTHREAD_TESTCANCEL
416                    TestCancel();
417            #endif
418          // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers          // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers
419          {          {
420              std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();              std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();
# Line 267  int LSCPServer::Main() { Line 436  int LSCPServer::Main() {
436              }              }
437          }          }
438    
439            // check if MIDI data arrived on some engine channel
440            for (int i = 0; i < eventHandler.channelMidiListeners.size(); ++i) {
441                const EventHandler::midi_listener_entry entry =
442                    eventHandler.channelMidiListeners[i];
443                VirtualMidiDevice* pMidiListener = entry.pMidiListener;
444                if (pMidiListener->NotesChanged()) {
445                    for (int iNote = 0; iNote < 128; iNote++) {
446                        if (pMidiListener->NoteChanged(iNote)) {
447                            const bool bActive = pMidiListener->NoteIsActive(iNote);
448                            LSCPServer::SendLSCPNotify(
449                                LSCPEvent(
450                                    LSCPEvent::event_channel_midi,
451                                    entry.pSamplerChannel->Index(),
452                                    std::string(bActive ? "NOTE_ON" : "NOTE_OFF"),
453                                    iNote,
454                                    bActive ? pMidiListener->NoteOnVelocity(iNote)
455                                            : pMidiListener->NoteOffVelocity(iNote)
456                                )
457                            );
458                        }
459                    }
460                }
461            }
462    
463            // check if MIDI data arrived on some MIDI device
464            for (int i = 0; i < eventHandler.deviceMidiListeners.size(); ++i) {
465                const EventHandler::device_midi_listener_entry entry =
466                    eventHandler.deviceMidiListeners[i];
467                VirtualMidiDevice* pMidiListener = entry.pMidiListener;
468                if (pMidiListener->NotesChanged()) {
469                    for (int iNote = 0; iNote < 128; iNote++) {
470                        if (pMidiListener->NoteChanged(iNote)) {
471                            const bool bActive = pMidiListener->NoteIsActive(iNote);
472                            LSCPServer::SendLSCPNotify(
473                                LSCPEvent(
474                                    LSCPEvent::event_device_midi,
475                                    entry.uiDeviceID,
476                                    entry.pPort->GetPortNumber(),
477                                    std::string(bActive ? "NOTE_ON" : "NOTE_OFF"),
478                                    iNote,
479                                    bActive ? pMidiListener->NoteOnVelocity(iNote)
480                                            : pMidiListener->NoteOffVelocity(iNote)
481                                )
482                            );
483                        }
484                    }
485                }
486            }
487    
488          //Now let's deliver late notifies (if any)          //Now let's deliver late notifies (if any)
489          NotifyBufferMutex.Lock();          NotifyBufferMutex.Lock();
490          for (std::map<int,String>::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) {          for (std::map<int,String>::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) {
# Line 289  int LSCPServer::Main() { Line 507  int LSCPServer::Main() {
507                  continue; //Nothing try again                  continue; //Nothing try again
508          if (retval == -1) {          if (retval == -1) {
509                  std::cerr << "LSCPServer: Socket select error." << std::endl;                  std::cerr << "LSCPServer: Socket select error." << std::endl;
510                    #if defined(WIN32)
511                    closesocket(hSocket);
512                    #else
513                  close(hSocket);                  close(hSocket);
514                    #endif
515                  exit(EXIT_FAILURE);                  exit(EXIT_FAILURE);
516          }          }
517    
# Line 301  int LSCPServer::Main() { Line 523  int LSCPServer::Main() {
523                          exit(EXIT_FAILURE);                          exit(EXIT_FAILURE);
524                  }                  }
525    
526                    #if defined(WIN32)
527                    u_long nonblock_io = 1;
528                    if( ioctlsocket(socket, FIONBIO, &nonblock_io) ) {
529                      std::cerr << "LSCPServer: ioctlsocket: set FIONBIO failed. Error " << WSAGetLastError() << std::endl;
530                      exit(EXIT_FAILURE);
531                    }
532            #else
533                  if (fcntl(socket, F_SETFL, O_NONBLOCK)) {                  if (fcntl(socket, F_SETFL, O_NONBLOCK)) {
534                          std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;                          std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;
535                          exit(EXIT_FAILURE);                          exit(EXIT_FAILURE);
536                  }                  }
537                    #endif
538    
539                  // Parser initialization                  // Parser initialization
540                  yyparse_param_t yyparse_param;                  yyparse_param_t yyparse_param;
# Line 363  void LSCPServer::CloseConnection( std::v Line 593  void LSCPServer::CloseConnection( std::v
593          NotifyMutex.Lock();          NotifyMutex.Lock();
594          bufferedCommands.erase(socket);          bufferedCommands.erase(socket);
595          bufferedNotifies.erase(socket);          bufferedNotifies.erase(socket);
596            #if defined(WIN32)
597            closesocket(socket);
598            #else
599          close(socket);          close(socket);
600            #endif
601          NotifyMutex.Unlock();          NotifyMutex.Unlock();
602  }  }
603    
604    void LSCPServer::LockRTNotify() {
605        RTNotifyMutex.Lock();
606    }
607    
608    void LSCPServer::UnlockRTNotify() {
609        RTNotifyMutex.Unlock();
610    }
611    
612  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {
613          int subs = 0;          int subs = 0;
614          SubscriptionMutex.Lock();          SubscriptionMutex.Lock();
# Line 442  bool LSCPServer::GetLSCPCommand( std::ve Line 684  bool LSCPServer::GetLSCPCommand( std::ve
684          char c;          char c;
685          int i = 0;          int i = 0;
686          while (true) {          while (true) {
687                    #if defined(WIN32)
688                    int result = recv(socket, (char *)&c, 1, 0); //Read one character at a time for now
689                    #else
690                  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
691                    #endif
692                  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
693                          CloseConnection(iter);                          CloseConnection(iter);
694                          break;                          break;
# Line 457  bool LSCPServer::GetLSCPCommand( std::ve Line 703  bool LSCPServer::GetLSCPCommand( std::ve
703                          }                          }
704                          bufferedCommands[socket] += c;                          bufferedCommands[socket] += c;
705                  }                  }
706                    #if defined(WIN32)
707                    if (result == SOCKET_ERROR) {
708                        int wsa_lasterror = WSAGetLastError();
709                            if (wsa_lasterror == WSAEWOULDBLOCK) //Would block, try again later.
710                                    return false;
711                            dmsg(2,("LSCPScanner: Socket error after recv() Error %d.\n", wsa_lasterror));
712                            CloseConnection(iter);
713                            break;
714                    }
715                    #else
716                  if (result == -1) {                  if (result == -1) {
717                          if (errno == EAGAIN) //Would block, try again later.                          if (errno == EAGAIN) //Would block, try again later.
718                                  return false;                                  return false;
# Line 495  bool LSCPServer::GetLSCPCommand( std::ve Line 751  bool LSCPServer::GetLSCPCommand( std::ve
751                          CloseConnection(iter);                          CloseConnection(iter);
752                          break;                          break;
753                  }                  }
754                    #endif
755          }          }
756          return false;          return false;
757  }  }
# Line 768  String LSCPServer::GetEngineInfo(String Line 1025  String LSCPServer::GetEngineInfo(String
1025      LockRTNotify();      LockRTNotify();
1026      try {      try {
1027          Engine* pEngine = EngineFactory::Create(EngineName);          Engine* pEngine = EngineFactory::Create(EngineName);
1028          result.Add("DESCRIPTION", pEngine->Description());          result.Add("DESCRIPTION", _escapeLscpResponse(pEngine->Description()));
1029          result.Add("VERSION",     pEngine->Version());          result.Add("VERSION",     pEngine->Version());
1030          EngineFactory::Destroy(pEngine);          EngineFactory::Destroy(pEngine);
1031      }      }
# Line 841  String LSCPServer::GetChannelInfo(uint u Line 1098  String LSCPServer::GetChannelInfo(uint u
1098          if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");          if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");
1099          else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());          else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
1100    
1101            // convert the filename into the correct encoding as defined for LSCP
1102            // (especially in terms of special characters -> escape sequences)
1103            if (InstrumentFileName != "NONE" && InstrumentFileName != "") {
1104    #if WIN32
1105                InstrumentFileName = Path::fromWindows(InstrumentFileName).toLscp();
1106    #else
1107                // assuming POSIX
1108                InstrumentFileName = Path::fromPosix(InstrumentFileName).toLscp();
1109    #endif
1110            }
1111    
1112          result.Add("INSTRUMENT_FILE", InstrumentFileName);          result.Add("INSTRUMENT_FILE", InstrumentFileName);
1113          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
1114          result.Add("INSTRUMENT_NAME", InstrumentName);          result.Add("INSTRUMENT_NAME", _escapeLscpResponse(InstrumentName));
1115          result.Add("INSTRUMENT_STATUS", InstrumentStatus);          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
1116          result.Add("MUTE", Mute == -1 ? "MUTED_BY_SOLO" : (Mute ? "true" : "false"));          result.Add("MUTE", Mute == -1 ? "MUTED_BY_SOLO" : (Mute ? "true" : "false"));
1117          result.Add("SOLO", Solo);          result.Add("SOLO", Solo);
# Line 1785  String LSCPServer::GetMidiInstrumentMapp Line 2053  String LSCPServer::GetMidiInstrumentMapp
2053          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);
2054          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");
2055          else { // found          else { // found
2056              result.Add("NAME", iter->second.Name);  
2057                // convert the filename into the correct encoding as defined for LSCP
2058                // (especially in terms of special characters -> escape sequences)
2059    #if WIN32
2060                const String instrumentFileName = Path::fromWindows(iter->second.InstrumentFile).toLscp();
2061    #else
2062                // assuming POSIX
2063                const String instrumentFileName = Path::fromPosix(iter->second.InstrumentFile).toLscp();
2064    #endif
2065    
2066                result.Add("NAME", _escapeLscpResponse(iter->second.Name));
2067              result.Add("ENGINE_NAME", iter->second.EngineName);              result.Add("ENGINE_NAME", iter->second.EngineName);
2068              result.Add("INSTRUMENT_FILE", iter->second.InstrumentFile);              result.Add("INSTRUMENT_FILE", instrumentFileName);
2069              result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);              result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);
2070              String instrumentName;              String instrumentName;
2071              Engine* pEngine = EngineFactory::Create(iter->second.EngineName);              Engine* pEngine = EngineFactory::Create(iter->second.EngineName);
# Line 1800  String LSCPServer::GetMidiInstrumentMapp Line 2078  String LSCPServer::GetMidiInstrumentMapp
2078                  }                  }
2079                  EngineFactory::Destroy(pEngine);                  EngineFactory::Destroy(pEngine);
2080              }              }
2081              result.Add("INSTRUMENT_NAME", instrumentName);              result.Add("INSTRUMENT_NAME", _escapeLscpResponse(instrumentName));
2082              switch (iter->second.LoadMode) {              switch (iter->second.LoadMode) {
2083                  case MidiInstrumentMapper::ON_DEMAND:                  case MidiInstrumentMapper::ON_DEMAND:
2084                      result.Add("LOAD_MODE", "ON_DEMAND");                      result.Add("LOAD_MODE", "ON_DEMAND");
# Line 1955  String LSCPServer::GetMidiInstrumentMap( Line 2233  String LSCPServer::GetMidiInstrumentMap(
2233      dmsg(2,("LSCPServer: GetMidiInstrumentMap()\n"));      dmsg(2,("LSCPServer: GetMidiInstrumentMap()\n"));
2234      LSCPResultSet result;      LSCPResultSet result;
2235      try {      try {
2236          result.Add("NAME", MidiInstrumentMapper::MapName(MidiMapID));          result.Add("NAME", _escapeLscpResponse(MidiInstrumentMapper::MapName(MidiMapID)));
2237          result.Add("DEFAULT", MidiInstrumentMapper::GetDefaultMap() == MidiMapID);          result.Add("DEFAULT", MidiInstrumentMapper::GetDefaultMap() == MidiMapID);
2238      } catch (Exception e) {      } catch (Exception e) {
2239          result.Error(e);          result.Error(e);
# Line 2099  String LSCPServer::GetFxSendInfo(uint ui Line 2377  String LSCPServer::GetFxSendInfo(uint ui
2377          }          }
2378    
2379          // success          // success
2380          result.Add("NAME", pFxSend->Name());          result.Add("NAME", _escapeLscpResponse(pFxSend->Name()));
2381          result.Add("MIDI_CONTROLLER", pFxSend->MidiController());          result.Add("MIDI_CONTROLLER", pFxSend->MidiController());
2382          result.Add("LEVEL", ToString(pFxSend->Level()));          result.Add("LEVEL", ToString(pFxSend->Level()));
2383          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);
# Line 2222  String LSCPServer::ResetSampler() { Line 2500  String LSCPServer::ResetSampler() {
2500   */   */
2501  String LSCPServer::GetServerInfo() {  String LSCPServer::GetServerInfo() {
2502      dmsg(2,("LSCPServer: GetServerInfo()\n"));      dmsg(2,("LSCPServer: GetServerInfo()\n"));
2503        const std::string description =
2504            _escapeLscpResponse("LinuxSampler - modular, streaming capable sampler");
2505      LSCPResultSet result;      LSCPResultSet result;
2506      result.Add("DESCRIPTION", "LinuxSampler - modular, streaming capable sampler");      result.Add("DESCRIPTION", description);
2507      result.Add("VERSION", VERSION);      result.Add("VERSION", VERSION);
2508      result.Add("PROTOCOL_VERSION", ToString(LSCP_RELEASE_MAJOR) + "." + ToString(LSCP_RELEASE_MINOR));      result.Add("PROTOCOL_VERSION", ToString(LSCP_RELEASE_MAJOR) + "." + ToString(LSCP_RELEASE_MINOR));
2509  #if HAVE_SQLITE3  #if HAVE_SQLITE3
# Line 2236  String LSCPServer::GetServerInfo() { Line 2516  String LSCPServer::GetServerInfo() {
2516  }  }
2517    
2518  /**  /**
2519     * Will be called by the parser to return the current number of all active streams.
2520     */
2521    String LSCPServer::GetTotalStreamCount() {
2522        dmsg(2,("LSCPServer: GetTotalStreamCount()\n"));
2523        LSCPResultSet result;
2524        result.Add(pSampler->GetDiskStreamCount());
2525        return result.Produce();
2526    }
2527    
2528    /**
2529   * Will be called by the parser to return the current number of all active voices.   * Will be called by the parser to return the current number of all active voices.
2530   */   */
2531  String LSCPServer::GetTotalVoiceCount() {  String LSCPServer::GetTotalVoiceCount() {
# Line 2273  String LSCPServer::SetGlobalVolume(doubl Line 2563  String LSCPServer::SetGlobalVolume(doubl
2563      return result.Produce();      return result.Produce();
2564  }  }
2565    
2566    String LSCPServer::GetFileInstruments(String Filename) {
2567        dmsg(2,("LSCPServer: GetFileInstruments(String Filename=%s)\n",Filename.c_str()));
2568        LSCPResultSet result;
2569        try {
2570            VerifyFile(Filename);
2571        } catch (Exception e) {
2572            result.Error(e);
2573            return result.Produce();
2574        }
2575        // try to find a sampler engine that can handle the file
2576        bool bFound = false;
2577        std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
2578        for (int i = 0; !bFound && i < engineTypes.size(); i++) {
2579            Engine* pEngine = NULL;
2580            try {
2581                pEngine = EngineFactory::Create(engineTypes[i]);
2582                if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
2583                InstrumentManager* pManager = pEngine->GetInstrumentManager();
2584                if (pManager) {
2585                    std::vector<InstrumentManager::instrument_id_t> IDs =
2586                        pManager->GetInstrumentFileContent(Filename);
2587                    // return the amount of instruments in the file
2588                    result.Add(IDs.size());
2589                    // no more need to ask other engine types
2590                    bFound = true;
2591                } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
2592            } catch (Exception e) {
2593                // NOOP, as exception is thrown if engine doesn't support file
2594            }
2595            if (pEngine) EngineFactory::Destroy(pEngine);
2596        }
2597    
2598        if (!bFound) result.Error("Unknown file format");
2599        return result.Produce();
2600    }
2601    
2602    String LSCPServer::ListFileInstruments(String Filename) {
2603        dmsg(2,("LSCPServer: ListFileInstruments(String Filename=%s)\n",Filename.c_str()));
2604        LSCPResultSet result;
2605        try {
2606            VerifyFile(Filename);
2607        } catch (Exception e) {
2608            result.Error(e);
2609            return result.Produce();
2610        }
2611        // try to find a sampler engine that can handle the file
2612        bool bFound = false;
2613        std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
2614        for (int i = 0; !bFound && i < engineTypes.size(); i++) {
2615            Engine* pEngine = NULL;
2616            try {
2617                pEngine = EngineFactory::Create(engineTypes[i]);
2618                if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
2619                InstrumentManager* pManager = pEngine->GetInstrumentManager();
2620                if (pManager) {
2621                    std::vector<InstrumentManager::instrument_id_t> IDs =
2622                        pManager->GetInstrumentFileContent(Filename);
2623                    // return a list of IDs of the instruments in the file
2624                    String s;
2625                    for (int j = 0; j < IDs.size(); j++) {
2626                        if (s.size()) s += ",";
2627                        s += ToString(IDs[j].Index);
2628                    }
2629                    result.Add(s);
2630                    // no more need to ask other engine types
2631                    bFound = true;
2632                } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
2633            } catch (Exception e) {
2634                // NOOP, as exception is thrown if engine doesn't support file
2635            }
2636            if (pEngine) EngineFactory::Destroy(pEngine);
2637        }
2638    
2639        if (!bFound) result.Error("Unknown file format");
2640        return result.Produce();
2641    }
2642    
2643    String LSCPServer::GetFileInstrumentInfo(String Filename, uint InstrumentID) {
2644        dmsg(2,("LSCPServer: GetFileInstrumentInfo(String Filename=%s, InstrumentID=%d)\n",Filename.c_str(),InstrumentID));
2645        LSCPResultSet result;
2646        try {
2647            VerifyFile(Filename);
2648        } catch (Exception e) {
2649            result.Error(e);
2650            return result.Produce();
2651        }
2652        InstrumentManager::instrument_id_t id;
2653        id.FileName = Filename;
2654        id.Index    = InstrumentID;
2655        // try to find a sampler engine that can handle the file
2656        bool bFound = false;
2657        bool bFatalErr = false;
2658        std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
2659        for (int i = 0; !bFound && !bFatalErr && i < engineTypes.size(); i++) {
2660            Engine* pEngine = NULL;
2661            try {
2662                pEngine = EngineFactory::Create(engineTypes[i]);
2663                if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
2664                InstrumentManager* pManager = pEngine->GetInstrumentManager();
2665                if (pManager) {
2666                    // check if the instrument index is valid
2667                    // FIXME: this won't work if an engine only supports parts of the instrument file
2668                    std::vector<InstrumentManager::instrument_id_t> IDs =
2669                        pManager->GetInstrumentFileContent(Filename);
2670                    if (std::find(IDs.begin(), IDs.end(), id) == IDs.end()) {
2671                        std::stringstream ss;
2672                        ss << "Invalid instrument index " << InstrumentID << " for instrument file '" << Filename << "'";
2673                        bFatalErr = true;
2674                        throw Exception(ss.str());
2675                    }
2676                    // get the info of the requested instrument
2677                    InstrumentManager::instrument_info_t info =
2678                        pManager->GetInstrumentInfo(id);
2679                    // return detailed informations about the file
2680                    result.Add("NAME", info.InstrumentName);
2681                    result.Add("FORMAT_FAMILY", engineTypes[i]);
2682                    result.Add("FORMAT_VERSION", info.FormatVersion);
2683                    result.Add("PRODUCT", info.Product);
2684                    result.Add("ARTISTS", info.Artists);
2685                    // no more need to ask other engine types
2686                    bFound = true;
2687                } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
2688            } catch (Exception e) {
2689                // usually NOOP, as exception is thrown if engine doesn't support file
2690                if (bFatalErr) result.Error(e);
2691            }
2692            if (pEngine) EngineFactory::Destroy(pEngine);
2693        }
2694    
2695        if (!bFound && !bFatalErr) result.Error("Unknown file format");
2696        return result.Produce();
2697    }
2698    
2699    void LSCPServer::VerifyFile(String Filename) {
2700        #if WIN32
2701        WIN32_FIND_DATA win32FileAttributeData;
2702        BOOL res = GetFileAttributesEx( Filename.c_str(), GetFileExInfoStandard, &win32FileAttributeData );
2703        if (!res) {
2704            std::stringstream ss;
2705            ss << "File does not exist, GetFileAttributesEx failed `" << Filename << "`: Error " << GetLastError();
2706            throw Exception(ss.str());
2707        }
2708        if ( win32FileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) {
2709            throw Exception("Directory is specified");
2710        }
2711        #else
2712        struct stat statBuf;
2713        int res = stat(Filename.c_str(), &statBuf);
2714        if (res) {
2715            std::stringstream ss;
2716            ss << "Fail to stat `" << Filename << "`: " << strerror(errno);
2717            throw Exception(ss.str());
2718        }
2719    
2720        if (S_ISDIR(statBuf.st_mode)) {
2721            throw Exception("Directory is specified");
2722        }
2723        #endif
2724    }
2725    
2726  /**  /**
2727   * 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
2728   * server for receiving event messages.   * server for receiving event messages.
# Line 2354  String LSCPServer::GetDbInstrumentDirect Line 2804  String LSCPServer::GetDbInstrumentDirect
2804    
2805          for (int i = 0; i < dirs->size(); i++) {          for (int i = 0; i < dirs->size(); i++) {
2806              if (list != "") list += ",";              if (list != "") list += ",";
2807              list += "'" + dirs->at(i) + "'";              list += "'" + InstrumentsDb::toEscapedPath(dirs->at(i)) + "'";
2808          }          }
2809    
2810          result.Add(list);          result.Add(list);
# Line 2374  String LSCPServer::GetDbInstrumentDirect Line 2824  String LSCPServer::GetDbInstrumentDirect
2824      try {      try {
2825          DbDirectory info = InstrumentsDb::GetInstrumentsDb()->GetDirectoryInfo(Dir);          DbDirectory info = InstrumentsDb::GetInstrumentsDb()->GetDirectoryInfo(Dir);
2826    
2827          result.Add("DESCRIPTION", info.Description);          result.Add("DESCRIPTION", _escapeLscpResponse(info.Description));
2828          result.Add("CREATED", info.Created);          result.Add("CREATED", info.Created);
2829          result.Add("MODIFIED", info.Modified);          result.Add("MODIFIED", info.Modified);
2830      } catch (Exception e) {      } catch (Exception e) {
# Line 2531  String LSCPServer::GetDbInstruments(Stri Line 2981  String LSCPServer::GetDbInstruments(Stri
2981    
2982          for (int i = 0; i < instrs->size(); i++) {          for (int i = 0; i < instrs->size(); i++) {
2983              if (list != "") list += ",";              if (list != "") list += ",";
2984              list += "'" + instrs->at(i) + "'";              list += "'" + InstrumentsDb::toEscapedPath(instrs->at(i)) + "'";
2985          }          }
2986    
2987          result.Add(list);          result.Add(list);
# Line 2558  String LSCPServer::GetDbInstrumentInfo(S Line 3008  String LSCPServer::GetDbInstrumentInfo(S
3008          result.Add("SIZE", (int)info.Size);          result.Add("SIZE", (int)info.Size);
3009          result.Add("CREATED", info.Created);          result.Add("CREATED", info.Created);
3010          result.Add("MODIFIED", info.Modified);          result.Add("MODIFIED", info.Modified);
3011          result.Add("DESCRIPTION", FilterEndlines(info.Description));          result.Add("DESCRIPTION", _escapeLscpResponse(info.Description));
3012          result.Add("IS_DRUM", info.IsDrum);          result.Add("IS_DRUM", info.IsDrum);
3013          result.Add("PRODUCT", FilterEndlines(info.Product));          result.Add("PRODUCT", _escapeLscpResponse(info.Product));
3014          result.Add("ARTISTS", FilterEndlines(info.Artists));          result.Add("ARTISTS", _escapeLscpResponse(info.Artists));
3015          result.Add("KEYWORDS", FilterEndlines(info.Keywords));          result.Add("KEYWORDS", _escapeLscpResponse(info.Keywords));
3016      } catch (Exception e) {      } catch (Exception e) {
3017           result.Error(e);           result.Error(e);
3018      }      }
# Line 2679  String LSCPServer::FindDbInstrumentDirec Line 3129  String LSCPServer::FindDbInstrumentDirec
3129    
3130          for (int i = 0; i < pDirectories->size(); i++) {          for (int i = 0; i < pDirectories->size(); i++) {
3131              if (list != "") list += ",";              if (list != "") list += ",";
3132              list += "'" + pDirectories->at(i) + "'";              list += "'" + InstrumentsDb::toEscapedPath(pDirectories->at(i)) + "'";
3133          }          }
3134    
3135          result.Add(list);          result.Add(list);
# Line 2735  String LSCPServer::FindDbInstruments(Str Line 3185  String LSCPServer::FindDbInstruments(Str
3185    
3186          for (int i = 0; i < pInstruments->size(); i++) {          for (int i = 0; i < pInstruments->size(); i++) {
3187              if (list != "") list += ",";              if (list != "") list += ",";
3188              list += "'" + pInstruments->at(i) + "'";              list += "'" + InstrumentsDb::toEscapedPath(pInstruments->at(i)) + "'";
3189          }          }
3190    
3191          result.Add(list);          result.Add(list);
# Line 2748  String LSCPServer::FindDbInstruments(Str Line 3198  String LSCPServer::FindDbInstruments(Str
3198      return result.Produce();      return result.Produce();
3199  }  }
3200    
3201    String LSCPServer::FormatInstrumentsDb() {
3202        dmsg(2,("LSCPServer: FormatInstrumentsDb()\n"));
3203        LSCPResultSet result;
3204    #if HAVE_SQLITE3
3205        try {
3206            InstrumentsDb::GetInstrumentsDb()->Format();
3207        } catch (Exception e) {
3208             result.Error(e);
3209        }
3210    #else
3211        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
3212    #endif
3213        return result.Produce();
3214    }
3215    
3216    
3217  /**  /**
3218   * 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 2767  String LSCPServer::SetEcho(yyparse_param Line 3232  String LSCPServer::SetEcho(yyparse_param
3232      }      }
3233      return result.Produce();      return result.Produce();
3234  }  }
   
 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.1337  
changed lines
  Added in v.1695
  ViewVC Help
Powered by ViewVC