/[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 1774 by iliev, Thu Sep 11 18:11:06 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 21  Line 21 
21   *   MA  02111-1307  USA                                                   *   *   MA  02111-1307  USA                                                   *
22   ***************************************************************************/   ***************************************************************************/
23    
24    #include <algorithm>
25    #include <string>
26    
27  #include "lscpserver.h"  #include "lscpserver.h"
28  #include "lscpresultset.h"  #include "lscpresultset.h"
29  #include "lscpevent.h"  #include "lscpevent.h"
30    
31    #if defined(WIN32)
32    #include <windows.h>
33    #else
34  #include <fcntl.h>  #include <fcntl.h>
35    #endif
36    
37  #if ! HAVE_SQLITE3  #if ! HAVE_SQLITE3
38  #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 43 
43  #include "../drivers/audio/AudioOutputDeviceFactory.h"  #include "../drivers/audio/AudioOutputDeviceFactory.h"
44  #include "../drivers/midi/MidiInputDeviceFactory.h"  #include "../drivers/midi/MidiInputDeviceFactory.h"
45    
46    namespace LinuxSampler {
47    
48    /**
49     * Returns a copy of the given string where all special characters are
50     * replaced by LSCP escape sequences ("\xHH"). This function shall be used
51     * to escape LSCP response fields in case the respective response field is
52     * actually defined as using escape sequences in the LSCP specs.
53     *
54     * @e Caution: DO NOT use this function for escaping path based responses,
55     * use the Path class (src/common/Path.h) for this instead!
56     */
57    static String _escapeLscpResponse(String txt) {
58        for (int i = 0; i < txt.length(); i++) {
59            const char c = txt.c_str()[i];
60            if (
61                !(c >= '0' && c <= '9') &&
62                !(c >= 'a' && c <= 'z') &&
63                !(c >= 'A' && c <= 'Z') &&
64                !(c == ' ') && !(c == '!') && !(c == '#') && !(c == '$') &&
65                !(c == '%') && !(c == '&') && !(c == '(') && !(c == ')') &&
66                !(c == '*') && !(c == '+') && !(c == ',') && !(c == '-') &&
67                !(c == '.') && !(c == '/') && !(c == ':') && !(c == ';') &&
68                !(c == '<') && !(c == '=') && !(c == '>') && !(c == '?') &&
69                !(c == '@') && !(c == '[') && !(c == ']') &&
70                !(c == '^') && !(c == '_') && !(c == '`') && !(c == '{') &&
71                !(c == '|') && !(c == '}') && !(c == '~')
72            ) {
73                // convert the "special" character into a "\xHH" LSCP escape sequence
74                char buf[5];
75                snprintf(buf, sizeof(buf), "\\x%02x", static_cast<unsigned char>(c));
76                txt.replace(i, 1, buf);
77                i += 3;
78            }
79        }
80        return txt;
81    }
82    
83  /**  /**
84   * Below are a few static members of the LSCPServer class.   * Below are a few static members of the LSCPServer class.
85   * 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 96 
96  fd_set LSCPServer::fdSet;  fd_set LSCPServer::fdSet;
97  int LSCPServer::currentSocket = -1;  int LSCPServer::currentSocket = -1;
98  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();
99    std::vector<yyparse_param_t>::iterator itCurrentSession = std::vector<yyparse_param_t>::iterator();
100  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();
101  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();
102  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 60  Mutex LSCPServer::NotifyBufferMutex = Mu Line 105  Mutex LSCPServer::NotifyBufferMutex = Mu
105  Mutex LSCPServer::SubscriptionMutex = Mutex();  Mutex LSCPServer::SubscriptionMutex = Mutex();
106  Mutex LSCPServer::RTNotifyMutex = Mutex();  Mutex LSCPServer::RTNotifyMutex = Mutex();
107    
108  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) {
109      SocketAddress.sin_family      = AF_INET;      SocketAddress.sin_family      = AF_INET;
110      SocketAddress.sin_addr.s_addr = addr;      SocketAddress.sin_addr.s_addr = addr;
111      SocketAddress.sin_port        = port;      SocketAddress.sin_port        = port;
# Line 86  LSCPServer::LSCPServer(Sampler* pSampler Line 131  LSCPServer::LSCPServer(Sampler* pSampler
131      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");
132      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instrs_job_info, "DB_INSTRUMENTS_JOB_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instrs_job_info, "DB_INSTRUMENTS_JOB_INFO");
133      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
134        LSCPEvent::RegisterEvent(LSCPEvent::event_total_stream_count, "TOTAL_STREAM_COUNT");
135      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");
136      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");
137        LSCPEvent::RegisterEvent(LSCPEvent::event_channel_midi, "CHANNEL_MIDI");
138        LSCPEvent::RegisterEvent(LSCPEvent::event_device_midi, "DEVICE_MIDI");
139      hSocket = -1;      hSocket = -1;
140  }  }
141    
142  LSCPServer::~LSCPServer() {  LSCPServer::~LSCPServer() {
143    #if defined(WIN32)
144        if (hSocket >= 0) closesocket(hSocket);
145    #else
146      if (hSocket >= 0) close(hSocket);      if (hSocket >= 0) close(hSocket);
147    #endif
148    }
149    
150    LSCPServer::EventHandler::EventHandler(LSCPServer* pParent) {
151        this->pParent = pParent;
152    }
153    
154    LSCPServer::EventHandler::~EventHandler() {
155        std::vector<midi_listener_entry> l = channelMidiListeners;
156        channelMidiListeners.clear();
157        for (int i = 0; i < l.size(); i++)
158            delete l[i].pMidiListener;
159  }  }
160    
161  void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {  void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {
162      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, NewCount));
163  }  }
164    
165    void LSCPServer::EventHandler::ChannelAdded(SamplerChannel* pChannel) {
166        pChannel->AddEngineChangeListener(this);
167    }
168    
169    void LSCPServer::EventHandler::ChannelToBeRemoved(SamplerChannel* pChannel) {
170        if (!pChannel->GetEngineChannel()) return;
171        EngineToBeChanged(pChannel->Index());
172    }
173    
174    void LSCPServer::EventHandler::EngineToBeChanged(int ChannelId) {
175        SamplerChannel* pSamplerChannel =
176            pParent->pSampler->GetSamplerChannel(ChannelId);
177        if (!pSamplerChannel) return;
178        EngineChannel* pEngineChannel =
179            pSamplerChannel->GetEngineChannel();
180        if (!pEngineChannel) return;
181        for (std::vector<midi_listener_entry>::iterator iter = channelMidiListeners.begin(); iter != channelMidiListeners.end(); ++iter) {
182            if ((*iter).pEngineChannel == pEngineChannel) {
183                VirtualMidiDevice* pMidiListener = (*iter).pMidiListener;
184                pEngineChannel->Disconnect(pMidiListener);
185                channelMidiListeners.erase(iter);
186                delete pMidiListener;
187                return;
188            }
189        }
190    }
191    
192    void LSCPServer::EventHandler::EngineChanged(int ChannelId) {
193        SamplerChannel* pSamplerChannel =
194            pParent->pSampler->GetSamplerChannel(ChannelId);
195        if (!pSamplerChannel) return;
196        EngineChannel* pEngineChannel =
197            pSamplerChannel->GetEngineChannel();
198        if (!pEngineChannel) return;
199        VirtualMidiDevice* pMidiListener = new VirtualMidiDevice;
200        pEngineChannel->Connect(pMidiListener);
201        midi_listener_entry entry = {
202            pSamplerChannel, pEngineChannel, pMidiListener
203        };
204        channelMidiListeners.push_back(entry);
205    }
206    
207  void LSCPServer::EventHandler::AudioDeviceCountChanged(int NewCount) {  void LSCPServer::EventHandler::AudioDeviceCountChanged(int NewCount) {
208      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_audio_device_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_audio_device_count, NewCount));
209  }  }
# Line 107  void LSCPServer::EventHandler::MidiDevic Line 212  void LSCPServer::EventHandler::MidiDevic
212      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_device_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_device_count, NewCount));
213  }  }
214    
215    void LSCPServer::EventHandler::MidiDeviceToBeDestroyed(MidiInputDevice* pDevice) {
216        pDevice->RemoveMidiPortCountListener(this);
217        for (int i = 0; i < pDevice->PortCount(); ++i)
218            MidiPortToBeRemoved(pDevice->GetPort(i));
219    }
220    
221    void LSCPServer::EventHandler::MidiDeviceCreated(MidiInputDevice* pDevice) {
222        pDevice->AddMidiPortCountListener(this);
223        for (int i = 0; i < pDevice->PortCount(); ++i)
224            MidiPortAdded(pDevice->GetPort(i));
225    }
226    
227    void LSCPServer::EventHandler::MidiPortCountChanged(int NewCount) {
228        // yet unused
229    }
230    
231    void LSCPServer::EventHandler::MidiPortToBeRemoved(MidiInputPort* pPort) {
232        for (std::vector<device_midi_listener_entry>::iterator iter = deviceMidiListeners.begin(); iter != deviceMidiListeners.end(); ++iter) {
233            if ((*iter).pPort == pPort) {
234                VirtualMidiDevice* pMidiListener = (*iter).pMidiListener;
235                pPort->Disconnect(pMidiListener);
236                deviceMidiListeners.erase(iter);
237                delete pMidiListener;
238                return;
239            }
240        }
241    }
242    
243    void LSCPServer::EventHandler::MidiPortAdded(MidiInputPort* pPort) {
244        // find out the device ID
245        std::map<uint, MidiInputDevice*> devices =
246            pParent->pSampler->GetMidiInputDevices();
247        for (
248            std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
249            iter != devices.end(); ++iter
250        ) {
251            if (iter->second == pPort->GetDevice()) { // found
252                VirtualMidiDevice* pMidiListener = new VirtualMidiDevice;
253                pPort->Connect(pMidiListener);
254                device_midi_listener_entry entry = {
255                    pPort, pMidiListener, iter->first
256                };
257                deviceMidiListeners.push_back(entry);
258                return;
259            }
260        }
261    }
262    
263  void LSCPServer::EventHandler::MidiInstrumentCountChanged(int MapId, int NewCount) {  void LSCPServer::EventHandler::MidiInstrumentCountChanged(int MapId, int NewCount) {
264      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_count, MapId, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_count, MapId, NewCount));
265  }  }
# Line 143  void LSCPServer::EventHandler::TotalVoic Line 296  void LSCPServer::EventHandler::TotalVoic
296      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_voice_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_voice_count, NewCount));
297  }  }
298    
299    void LSCPServer::EventHandler::TotalStreamCountChanged(int NewCount) {
300        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_stream_count, NewCount));
301    }
302    
303  #if HAVE_SQLITE3  #if HAVE_SQLITE3
304  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {
305      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, Dir));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, InstrumentsDb::toEscapedPath(Dir)));
306  }  }
307    
308  void LSCPServer::DbInstrumentsEventHandler::DirectoryInfoChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryInfoChanged(String Dir) {
309      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, Dir));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, InstrumentsDb::toEscapedPath(Dir)));
310  }  }
311    
312  void LSCPServer::DbInstrumentsEventHandler::DirectoryNameChanged(String Dir, String NewName) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryNameChanged(String Dir, String NewName) {
313      Dir = "'" + Dir + "'";      Dir = "'" + InstrumentsDb::toEscapedPath(Dir) + "'";
314      NewName = "'" + NewName + "'";      NewName = "'" + InstrumentsDb::toEscapedPath(NewName) + "'";
315      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, "NAME", Dir, NewName));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, "NAME", Dir, NewName));
316  }  }
317    
318  void LSCPServer::DbInstrumentsEventHandler::InstrumentCountChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentCountChanged(String Dir) {
319      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_count, Dir));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_count, InstrumentsDb::toEscapedPath(Dir)));
320  }  }
321    
322  void LSCPServer::DbInstrumentsEventHandler::InstrumentInfoChanged(String Instr) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentInfoChanged(String Instr) {
323      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, Instr));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, InstrumentsDb::toEscapedPath(Instr)));
324  }  }
325    
326  void LSCPServer::DbInstrumentsEventHandler::InstrumentNameChanged(String Instr, String NewName) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentNameChanged(String Instr, String NewName) {
327      Instr = "'" + Instr + "'";      Instr = "'" + InstrumentsDb::toEscapedPath(Instr) + "'";
328      NewName = "'" + NewName + "'";      NewName = "'" + InstrumentsDb::toEscapedPath(NewName) + "'";
329      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, "NAME", Instr, NewName));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, "NAME", Instr, NewName));
330  }  }
331    
# Line 193  int LSCPServer::WaitUntilInitialized(lon Line 350  int LSCPServer::WaitUntilInitialized(lon
350  }  }
351    
352  int LSCPServer::Main() {  int LSCPServer::Main() {
353            #if defined(WIN32)
354            WSADATA wsaData;
355            int iResult;
356            iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
357            if (iResult != 0) {
358                    std::cerr << "LSCPServer: WSAStartup failed: " << iResult << "\n";
359                    exit(EXIT_FAILURE);
360            }
361            #endif
362      hSocket = socket(AF_INET, SOCK_STREAM, 0);      hSocket = socket(AF_INET, SOCK_STREAM, 0);
363      if (hSocket < 0) {      if (hSocket < 0) {
364          std::cerr << "LSCPServer: Could not create server socket." << std::endl;          std::cerr << "LSCPServer: Could not create server socket." << std::endl;
# Line 206  int LSCPServer::Main() { Line 372  int LSCPServer::Main() {
372              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
373                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {
374                      std::cerr << "gave up!" << std::endl;                      std::cerr << "gave up!" << std::endl;
375                        #if defined(WIN32)
376                        closesocket(hSocket);
377                        #else
378                      close(hSocket);                      close(hSocket);
379                        #endif
380                      //return -1;                      //return -1;
381                      exit(EXIT_FAILURE);                      exit(EXIT_FAILURE);
382                  }                  }
# Line 218  int LSCPServer::Main() { Line 388  int LSCPServer::Main() {
388    
389      listen(hSocket, 1);      listen(hSocket, 1);
390      Initialized.Set(true);      Initialized.Set(true);
391        
392      // Registering event listeners      // Registering event listeners
393      pSampler->AddChannelCountListener(&eventHandler);      pSampler->AddChannelCountListener(&eventHandler);
394      pSampler->AddAudioDeviceCountListener(&eventHandler);      pSampler->AddAudioDeviceCountListener(&eventHandler);
# Line 226  int LSCPServer::Main() { Line 396  int LSCPServer::Main() {
396      pSampler->AddVoiceCountListener(&eventHandler);      pSampler->AddVoiceCountListener(&eventHandler);
397      pSampler->AddStreamCountListener(&eventHandler);      pSampler->AddStreamCountListener(&eventHandler);
398      pSampler->AddBufferFillListener(&eventHandler);      pSampler->AddBufferFillListener(&eventHandler);
399        pSampler->AddTotalStreamCountListener(&eventHandler);
400      pSampler->AddTotalVoiceCountListener(&eventHandler);      pSampler->AddTotalVoiceCountListener(&eventHandler);
401      pSampler->AddFxSendCountListener(&eventHandler);      pSampler->AddFxSendCountListener(&eventHandler);
402      MidiInstrumentMapper::AddMidiInstrumentCountListener(&eventHandler);      MidiInstrumentMapper::AddMidiInstrumentCountListener(&eventHandler);
# Line 245  int LSCPServer::Main() { Line 416  int LSCPServer::Main() {
416      timeval timeout;      timeval timeout;
417    
418      while (true) {      while (true) {
419            #if CONFIG_PTHREAD_TESTCANCEL
420                    TestCancel();
421            #endif
422          // 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
423          {          {
424              std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();              std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();
# Line 252  int LSCPServer::Main() { Line 426  int LSCPServer::Main() {
426              std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();              std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();
427              for (; itEngineChannel != itEnd; ++itEngineChannel) {              for (; itEngineChannel != itEnd; ++itEngineChannel) {
428                  if ((*itEngineChannel)->StatusChanged()) {                  if ((*itEngineChannel)->StatusChanged()) {
429                      SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_info, (*itEngineChannel)->iSamplerChannelIndex));                      SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_info, (*itEngineChannel)->GetSamplerChannel()->Index()));
430                  }                  }
431    
432                  for (int i = 0; i < (*itEngineChannel)->GetFxSendCount(); i++) {                  for (int i = 0; i < (*itEngineChannel)->GetFxSendCount(); i++) {
433                      FxSend* fxs = (*itEngineChannel)->GetFxSend(i);                      FxSend* fxs = (*itEngineChannel)->GetFxSend(i);
434                      if(fxs != NULL && fxs->IsInfoChanged()) {                      if(fxs != NULL && fxs->IsInfoChanged()) {
435                          int chn = (*itEngineChannel)->iSamplerChannelIndex;                          int chn = (*itEngineChannel)->GetSamplerChannel()->Index();
436                          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, chn, fxs->Id()));                          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, chn, fxs->Id()));
437                          fxs->SetInfoChanged(false);                          fxs->SetInfoChanged(false);
438                      }                      }
# Line 266  int LSCPServer::Main() { Line 440  int LSCPServer::Main() {
440              }              }
441          }          }
442    
443            // check if MIDI data arrived on some engine channel
444            for (int i = 0; i < eventHandler.channelMidiListeners.size(); ++i) {
445                const EventHandler::midi_listener_entry entry =
446                    eventHandler.channelMidiListeners[i];
447                VirtualMidiDevice* pMidiListener = entry.pMidiListener;
448                if (pMidiListener->NotesChanged()) {
449                    for (int iNote = 0; iNote < 128; iNote++) {
450                        if (pMidiListener->NoteChanged(iNote)) {
451                            const bool bActive = pMidiListener->NoteIsActive(iNote);
452                            LSCPServer::SendLSCPNotify(
453                                LSCPEvent(
454                                    LSCPEvent::event_channel_midi,
455                                    entry.pSamplerChannel->Index(),
456                                    std::string(bActive ? "NOTE_ON" : "NOTE_OFF"),
457                                    iNote,
458                                    bActive ? pMidiListener->NoteOnVelocity(iNote)
459                                            : pMidiListener->NoteOffVelocity(iNote)
460                                )
461                            );
462                        }
463                    }
464                }
465            }
466    
467            // check if MIDI data arrived on some MIDI device
468            for (int i = 0; i < eventHandler.deviceMidiListeners.size(); ++i) {
469                const EventHandler::device_midi_listener_entry entry =
470                    eventHandler.deviceMidiListeners[i];
471                VirtualMidiDevice* pMidiListener = entry.pMidiListener;
472                if (pMidiListener->NotesChanged()) {
473                    for (int iNote = 0; iNote < 128; iNote++) {
474                        if (pMidiListener->NoteChanged(iNote)) {
475                            const bool bActive = pMidiListener->NoteIsActive(iNote);
476                            LSCPServer::SendLSCPNotify(
477                                LSCPEvent(
478                                    LSCPEvent::event_device_midi,
479                                    entry.uiDeviceID,
480                                    entry.pPort->GetPortNumber(),
481                                    std::string(bActive ? "NOTE_ON" : "NOTE_OFF"),
482                                    iNote,
483                                    bActive ? pMidiListener->NoteOnVelocity(iNote)
484                                            : pMidiListener->NoteOffVelocity(iNote)
485                                )
486                            );
487                        }
488                    }
489                }
490            }
491    
492          //Now let's deliver late notifies (if any)          //Now let's deliver late notifies (if any)
493          NotifyBufferMutex.Lock();          NotifyBufferMutex.Lock();
494          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 288  int LSCPServer::Main() { Line 511  int LSCPServer::Main() {
511                  continue; //Nothing try again                  continue; //Nothing try again
512          if (retval == -1) {          if (retval == -1) {
513                  std::cerr << "LSCPServer: Socket select error." << std::endl;                  std::cerr << "LSCPServer: Socket select error." << std::endl;
514                    #if defined(WIN32)
515                    closesocket(hSocket);
516                    #else
517                  close(hSocket);                  close(hSocket);
518                    #endif
519                  exit(EXIT_FAILURE);                  exit(EXIT_FAILURE);
520          }          }
521    
# Line 300  int LSCPServer::Main() { Line 527  int LSCPServer::Main() {
527                          exit(EXIT_FAILURE);                          exit(EXIT_FAILURE);
528                  }                  }
529    
530                    #if defined(WIN32)
531                    u_long nonblock_io = 1;
532                    if( ioctlsocket(socket, FIONBIO, &nonblock_io) ) {
533                      std::cerr << "LSCPServer: ioctlsocket: set FIONBIO failed. Error " << WSAGetLastError() << std::endl;
534                      exit(EXIT_FAILURE);
535                    }
536            #else
537                  if (fcntl(socket, F_SETFL, O_NONBLOCK)) {                  if (fcntl(socket, F_SETFL, O_NONBLOCK)) {
538                          std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;                          std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;
539                          exit(EXIT_FAILURE);                          exit(EXIT_FAILURE);
540                  }                  }
541                    #endif
542    
543                  // Parser initialization                  // Parser initialization
544                  yyparse_param_t yyparse_param;                  yyparse_param_t yyparse_param;
# Line 327  int LSCPServer::Main() { Line 562  int LSCPServer::Main() {
562                                  int dummy; // just a temporary hack to fulfill the restart() function prototype                                  int dummy; // just a temporary hack to fulfill the restart() function prototype
563                                  restart(NULL, dummy); // restart the 'scanner'                                  restart(NULL, dummy); // restart the 'scanner'
564                                  currentSocket = (*iter).hSession;  //a hack                                  currentSocket = (*iter).hSession;  //a hack
565                                    itCurrentSession = iter; // another hack
566                                  dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));                                  dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));
567                                  if ((*iter).bVerbose) { // if echo mode enabled                                  if ((*iter).bVerbose) { // if echo mode enabled
568                                      AnswerClient(bufferedCommands[currentSocket]);                                      AnswerClient(bufferedCommands[currentSocket]);
569                                  }                                  }
570                                  int result = yyparse(&(*iter));                                  int result = yyparse(&(*iter));
571                                  currentSocket = -1;     //continuation of a hack                                  currentSocket = -1;     //continuation of a hack
572                                    itCurrentSession = Sessions.end(); // hack as well
573                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
574                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?
575                                          CloseConnection(iter);                                          CloseConnection(iter);
# Line 360  void LSCPServer::CloseConnection( std::v Line 597  void LSCPServer::CloseConnection( std::v
597          NotifyMutex.Lock();          NotifyMutex.Lock();
598          bufferedCommands.erase(socket);          bufferedCommands.erase(socket);
599          bufferedNotifies.erase(socket);          bufferedNotifies.erase(socket);
600            #if defined(WIN32)
601            closesocket(socket);
602            #else
603          close(socket);          close(socket);
604            #endif
605          NotifyMutex.Unlock();          NotifyMutex.Unlock();
606  }  }
607    
608    void LSCPServer::LockRTNotify() {
609        RTNotifyMutex.Lock();
610    }
611    
612    void LSCPServer::UnlockRTNotify() {
613        RTNotifyMutex.Unlock();
614    }
615    
616  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {
617          int subs = 0;          int subs = 0;
618          SubscriptionMutex.Lock();          SubscriptionMutex.Lock();
# Line 425  extern int GetLSCPCommand( void *buf, in Line 674  extern int GetLSCPCommand( void *buf, in
674          return command.size();          return command.size();
675  }  }
676    
677    extern yyparse_param_t* GetCurrentYaccSession() {
678        return &(*itCurrentSession);
679    }
680    
681  /**  /**
682   * Will be called to try to read the command from the socket   * Will be called to try to read the command from the socket
683   * 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 435  bool LSCPServer::GetLSCPCommand( std::ve Line 688  bool LSCPServer::GetLSCPCommand( std::ve
688          char c;          char c;
689          int i = 0;          int i = 0;
690          while (true) {          while (true) {
691                    #if defined(WIN32)
692                    int result = recv(socket, (char *)&c, 1, 0); //Read one character at a time for now
693                    #else
694                  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
695                    #endif
696                  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
697                          CloseConnection(iter);                          CloseConnection(iter);
698                          break;                          break;
# Line 450  bool LSCPServer::GetLSCPCommand( std::ve Line 707  bool LSCPServer::GetLSCPCommand( std::ve
707                          }                          }
708                          bufferedCommands[socket] += c;                          bufferedCommands[socket] += c;
709                  }                  }
710                    #if defined(WIN32)
711                    if (result == SOCKET_ERROR) {
712                        int wsa_lasterror = WSAGetLastError();
713                            if (wsa_lasterror == WSAEWOULDBLOCK) //Would block, try again later.
714                                    return false;
715                            dmsg(2,("LSCPScanner: Socket error after recv() Error %d.\n", wsa_lasterror));
716                            CloseConnection(iter);
717                            break;
718                    }
719                    #else
720                  if (result == -1) {                  if (result == -1) {
721                          if (errno == EAGAIN) //Would block, try again later.                          if (errno == EAGAIN) //Would block, try again later.
722                                  return false;                                  return false;
# Line 488  bool LSCPServer::GetLSCPCommand( std::ve Line 755  bool LSCPServer::GetLSCPCommand( std::ve
755                          CloseConnection(iter);                          CloseConnection(iter);
756                          break;                          break;
757                  }                  }
758                    #endif
759          }          }
760          return false;          return false;
761  }  }
# Line 612  EngineChannel* LSCPServer::GetEngineChan Line 880  EngineChannel* LSCPServer::GetEngineChan
880      EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();      EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
881      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");
882    
883      return pEngineChannel;              return pEngineChannel;
884  }  }
885    
886  /**  /**
# Line 761  String LSCPServer::GetEngineInfo(String Line 1029  String LSCPServer::GetEngineInfo(String
1029      LockRTNotify();      LockRTNotify();
1030      try {      try {
1031          Engine* pEngine = EngineFactory::Create(EngineName);          Engine* pEngine = EngineFactory::Create(EngineName);
1032          result.Add("DESCRIPTION", pEngine->Description());          result.Add("DESCRIPTION", _escapeLscpResponse(pEngine->Description()));
1033          result.Add("VERSION",     pEngine->Version());          result.Add("VERSION",     pEngine->Version());
1034          EngineFactory::Destroy(pEngine);          EngineFactory::Destroy(pEngine);
1035      }      }
# Line 834  String LSCPServer::GetChannelInfo(uint u Line 1102  String LSCPServer::GetChannelInfo(uint u
1102          if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");          if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");
1103          else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());          else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
1104    
1105            // convert the filename into the correct encoding as defined for LSCP
1106            // (especially in terms of special characters -> escape sequences)
1107            if (InstrumentFileName != "NONE" && InstrumentFileName != "") {
1108    #if WIN32
1109                InstrumentFileName = Path::fromWindows(InstrumentFileName).toLscp();
1110    #else
1111                // assuming POSIX
1112                InstrumentFileName = Path::fromPosix(InstrumentFileName).toLscp();
1113    #endif
1114            }
1115    
1116          result.Add("INSTRUMENT_FILE", InstrumentFileName);          result.Add("INSTRUMENT_FILE", InstrumentFileName);
1117          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
1118          result.Add("INSTRUMENT_NAME", InstrumentName);          result.Add("INSTRUMENT_NAME", _escapeLscpResponse(InstrumentName));
1119          result.Add("INSTRUMENT_STATUS", InstrumentStatus);          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
1120          result.Add("MUTE", Mute == -1 ? "MUTED_BY_SOLO" : (Mute ? "true" : "false"));          result.Add("MUTE", Mute == -1 ? "MUTED_BY_SOLO" : (Mute ? "true" : "false"));
1121          result.Add("SOLO", Solo);          result.Add("SOLO", Solo);
# Line 856  String LSCPServer::GetVoiceCount(uint ui Line 1135  String LSCPServer::GetVoiceCount(uint ui
1135      dmsg(2,("LSCPServer: GetVoiceCount(SamplerChannel=%d)\n", uiSamplerChannel));      dmsg(2,("LSCPServer: GetVoiceCount(SamplerChannel=%d)\n", uiSamplerChannel));
1136      LSCPResultSet result;      LSCPResultSet result;
1137      try {      try {
1138          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));  
         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();  
         if (!pEngineChannel) throw Exception("No engine loaded on sampler channel");  
1139          if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");          if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
1140          result.Add(pEngineChannel->GetEngine()->VoiceCount());          result.Add(pEngineChannel->GetEngine()->VoiceCount());
1141      }      }
# Line 877  String LSCPServer::GetStreamCount(uint u Line 1153  String LSCPServer::GetStreamCount(uint u
1153      dmsg(2,("LSCPServer: GetStreamCount(SamplerChannel=%d)\n", uiSamplerChannel));      dmsg(2,("LSCPServer: GetStreamCount(SamplerChannel=%d)\n", uiSamplerChannel));
1154      LSCPResultSet result;      LSCPResultSet result;
1155      try {      try {
1156          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));  
         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();  
         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");  
1157          if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");          if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
1158          result.Add(pEngineChannel->GetEngine()->DiskStreamCount());          result.Add(pEngineChannel->GetEngine()->DiskStreamCount());
1159      }      }
# Line 898  String LSCPServer::GetBufferFill(fill_re Line 1171  String LSCPServer::GetBufferFill(fill_re
1171      dmsg(2,("LSCPServer: GetBufferFill(ResponseType=%d, SamplerChannel=%d)\n", ResponseType, uiSamplerChannel));      dmsg(2,("LSCPServer: GetBufferFill(ResponseType=%d, SamplerChannel=%d)\n", ResponseType, uiSamplerChannel));
1172      LSCPResultSet result;      LSCPResultSet result;
1173      try {      try {
1174          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));  
         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();  
         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");  
1175          if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");          if (!pEngineChannel->GetEngine()) throw Exception("No audio output device connected to sampler channel");
1176          if (!pEngineChannel->GetEngine()->DiskStreamSupported()) result.Add("NA");          if (!pEngineChannel->GetEngine()->DiskStreamSupported()) result.Add("NA");
1177          else {          else {
# Line 1579  String LSCPServer::SetVolume(double dVol Line 1849  String LSCPServer::SetVolume(double dVol
1849      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", dVolume, uiSamplerChannel));      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", dVolume, uiSamplerChannel));
1850      LSCPResultSet result;      LSCPResultSet result;
1851      try {      try {
1852          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));  
         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();  
         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");  
1853          pEngineChannel->Volume(dVolume);          pEngineChannel->Volume(dVolume);
1854      }      }
1855      catch (Exception e) {      catch (Exception e) {
# Line 1598  String LSCPServer::SetChannelMute(bool b Line 1865  String LSCPServer::SetChannelMute(bool b
1865      dmsg(2,("LSCPServer: SetChannelMute(bMute=%d,uiSamplerChannel=%d)\n",bMute,uiSamplerChannel));      dmsg(2,("LSCPServer: SetChannelMute(bMute=%d,uiSamplerChannel=%d)\n",bMute,uiSamplerChannel));
1866      LSCPResultSet result;      LSCPResultSet result;
1867      try {      try {
1868          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));  
   
         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();  
         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");  
1869    
1870          if(!bMute) pEngineChannel->SetMute((HasSoloChannel() && !pEngineChannel->GetSolo()) ? -1 : 0);          if(!bMute) pEngineChannel->SetMute((HasSoloChannel() && !pEngineChannel->GetSolo()) ? -1 : 0);
1871          else pEngineChannel->SetMute(1);          else pEngineChannel->SetMute(1);
# Line 1619  String LSCPServer::SetChannelSolo(bool b Line 1882  String LSCPServer::SetChannelSolo(bool b
1882      dmsg(2,("LSCPServer: SetChannelSolo(bSolo=%d,uiSamplerChannel=%d)\n",bSolo,uiSamplerChannel));      dmsg(2,("LSCPServer: SetChannelSolo(bSolo=%d,uiSamplerChannel=%d)\n",bSolo,uiSamplerChannel));
1883      LSCPResultSet result;      LSCPResultSet result;
1884      try {      try {
1885          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));  
   
         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();  
         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");  
1886    
1887          bool oldSolo = pEngineChannel->GetSolo();          bool oldSolo = pEngineChannel->GetSolo();
1888          bool hadSoloChannel = HasSoloChannel();          bool hadSoloChannel = HasSoloChannel();
# Line 1743  String LSCPServer::GetMidiInstrumentMapp Line 2002  String LSCPServer::GetMidiInstrumentMapp
2002      dmsg(2,("LSCPServer: GetMidiInstrumentMappings()\n"));      dmsg(2,("LSCPServer: GetMidiInstrumentMappings()\n"));
2003      LSCPResultSet result;      LSCPResultSet result;
2004      try {      try {
2005          result.Add(MidiInstrumentMapper::Entries(MidiMapID).size());          result.Add(MidiInstrumentMapper::GetInstrumentCount(MidiMapID));
2006      } catch (Exception e) {      } catch (Exception e) {
2007          result.Error(e);          result.Error(e);
2008      }      }
# Line 1754  String LSCPServer::GetMidiInstrumentMapp Line 2013  String LSCPServer::GetMidiInstrumentMapp
2013  String LSCPServer::GetAllMidiInstrumentMappings() {  String LSCPServer::GetAllMidiInstrumentMappings() {
2014      dmsg(2,("LSCPServer: GetAllMidiInstrumentMappings()\n"));      dmsg(2,("LSCPServer: GetAllMidiInstrumentMappings()\n"));
2015      LSCPResultSet result;      LSCPResultSet result;
2016      std::vector<int> maps = MidiInstrumentMapper::Maps();      try {
2017      int totalMappings = 0;          result.Add(MidiInstrumentMapper::GetInstrumentCount());
2018      for (int i = 0; i < maps.size(); i++) {      } catch (Exception e) {
2019          try {          result.Error(e);
             totalMappings += MidiInstrumentMapper::Entries(maps[i]).size();  
         } catch (Exception e) { /*NOOP*/ }  
2020      }      }
     result.Add(totalMappings);  
2021      return result.Produce();      return result.Produce();
2022  }  }
2023    
# Line 1769  String LSCPServer::GetMidiInstrumentMapp Line 2025  String LSCPServer::GetMidiInstrumentMapp
2025      dmsg(2,("LSCPServer: GetMidiIstrumentMapping()\n"));      dmsg(2,("LSCPServer: GetMidiIstrumentMapping()\n"));
2026      LSCPResultSet result;      LSCPResultSet result;
2027      try {      try {
2028          midi_prog_index_t idx;          MidiInstrumentMapper::entry_t entry = MidiInstrumentMapper::GetEntry(MidiMapID, MidiBank, MidiProg);
2029          idx.midi_bank_msb = (MidiBank >> 7) & 0x7f;          // convert the filename into the correct encoding as defined for LSCP
2030          idx.midi_bank_lsb = MidiBank & 0x7f;          // (especially in terms of special characters -> escape sequences)
2031          idx.midi_prog     = MidiProg;  #if WIN32
2032            const String instrumentFileName = Path::fromWindows(entry.InstrumentFile).toLscp();
2033          std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t> mappings = MidiInstrumentMapper::Entries(MidiMapID);  #else
2034          std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t>::iterator iter = mappings.find(idx);          // assuming POSIX
2035          if (iter == mappings.end()) result.Error("there is no map entry with that index");          const String instrumentFileName = Path::fromPosix(entry.InstrumentFile).toLscp();
2036          else { // found  #endif
2037              result.Add("NAME", iter->second.Name);  
2038              result.Add("ENGINE_NAME", iter->second.EngineName);          result.Add("NAME", _escapeLscpResponse(entry.Name));
2039              result.Add("INSTRUMENT_FILE", iter->second.InstrumentFile);          result.Add("ENGINE_NAME", entry.EngineName);
2040              result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);          result.Add("INSTRUMENT_FILE", instrumentFileName);
2041              String instrumentName;          result.Add("INSTRUMENT_NR", (int) entry.InstrumentIndex);
2042              Engine* pEngine = EngineFactory::Create(iter->second.EngineName);          String instrumentName;
2043              if (pEngine) {          Engine* pEngine = EngineFactory::Create(entry.EngineName);
2044                  if (pEngine->GetInstrumentManager()) {          if (pEngine) {
2045                      InstrumentManager::instrument_id_t instrID;              if (pEngine->GetInstrumentManager()) {
2046                      instrID.FileName = iter->second.InstrumentFile;                  InstrumentManager::instrument_id_t instrID;
2047                      instrID.Index    = iter->second.InstrumentIndex;                  instrID.FileName = entry.InstrumentFile;
2048                      instrumentName = pEngine->GetInstrumentManager()->GetInstrumentName(instrID);                  instrID.Index    = entry.InstrumentIndex;
2049                  }                  instrumentName = pEngine->GetInstrumentManager()->GetInstrumentName(instrID);
                 EngineFactory::Destroy(pEngine);  
             }  
             result.Add("INSTRUMENT_NAME", instrumentName);  
             switch (iter->second.LoadMode) {  
                 case MidiInstrumentMapper::ON_DEMAND:  
                     result.Add("LOAD_MODE", "ON_DEMAND");  
                     break;  
                 case MidiInstrumentMapper::ON_DEMAND_HOLD:  
                     result.Add("LOAD_MODE", "ON_DEMAND_HOLD");  
                     break;  
                 case MidiInstrumentMapper::PERSISTENT:  
                     result.Add("LOAD_MODE", "PERSISTENT");  
                     break;  
                 default:  
                     throw Exception("entry reflects invalid LOAD_MODE, consider this as a bug!");  
2050              }              }
2051              result.Add("VOLUME", iter->second.Volume);              EngineFactory::Destroy(pEngine);
2052            }
2053            result.Add("INSTRUMENT_NAME", _escapeLscpResponse(instrumentName));
2054            switch (entry.LoadMode) {
2055                case MidiInstrumentMapper::ON_DEMAND:
2056                    result.Add("LOAD_MODE", "ON_DEMAND");
2057                    break;
2058                case MidiInstrumentMapper::ON_DEMAND_HOLD:
2059                    result.Add("LOAD_MODE", "ON_DEMAND_HOLD");
2060                    break;
2061                case MidiInstrumentMapper::PERSISTENT:
2062                    result.Add("LOAD_MODE", "PERSISTENT");
2063                    break;
2064                default:
2065                    throw Exception("entry reflects invalid LOAD_MODE, consider this as a bug!");
2066          }          }
2067            result.Add("VOLUME", entry.Volume);
2068      } catch (Exception e) {      } catch (Exception e) {
2069          result.Error(e);          result.Error(e);
2070      }      }
# Line 1948  String LSCPServer::GetMidiInstrumentMap( Line 2204  String LSCPServer::GetMidiInstrumentMap(
2204      dmsg(2,("LSCPServer: GetMidiInstrumentMap()\n"));      dmsg(2,("LSCPServer: GetMidiInstrumentMap()\n"));
2205      LSCPResultSet result;      LSCPResultSet result;
2206      try {      try {
2207          result.Add("NAME", MidiInstrumentMapper::MapName(MidiMapID));          result.Add("NAME", _escapeLscpResponse(MidiInstrumentMapper::MapName(MidiMapID)));
2208          result.Add("DEFAULT", MidiInstrumentMapper::GetDefaultMap() == MidiMapID);          result.Add("DEFAULT", MidiInstrumentMapper::GetDefaultMap() == MidiMapID);
2209      } catch (Exception e) {      } catch (Exception e) {
2210          result.Error(e);          result.Error(e);
# Line 1979  String LSCPServer::SetChannelMap(uint ui Line 2235  String LSCPServer::SetChannelMap(uint ui
2235      dmsg(2,("LSCPServer: SetChannelMap()\n"));      dmsg(2,("LSCPServer: SetChannelMap()\n"));
2236      LSCPResultSet result;      LSCPResultSet result;
2237      try {      try {
2238          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));  
   
         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();  
         if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");  
2239    
2240          if      (MidiMapID == -1) pEngineChannel->SetMidiInstrumentMapToNone();          if      (MidiMapID == -1) pEngineChannel->SetMidiInstrumentMapToNone();
2241          else if (MidiMapID == -2) pEngineChannel->SetMidiInstrumentMapToDefault();          else if (MidiMapID == -2) pEngineChannel->SetMidiInstrumentMapToDefault();
# Line 1999  String LSCPServer::CreateFxSend(uint uiS Line 2251  String LSCPServer::CreateFxSend(uint uiS
2251      LSCPResultSet result;      LSCPResultSet result;
2252      try {      try {
2253          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
2254            
2255          FxSend* pFxSend = pEngineChannel->AddFxSend(MidiCtrl, Name);          FxSend* pFxSend = pEngineChannel->AddFxSend(MidiCtrl, Name);
2256          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)");
2257    
# Line 2083  String LSCPServer::GetFxSendInfo(uint ui Line 2335  String LSCPServer::GetFxSendInfo(uint ui
2335      try {      try {
2336          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
2337          FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);          FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);
2338            
2339          // gather audio routing informations          // gather audio routing informations
2340          String AudioRouting;          String AudioRouting;
2341          for (int chan = 0; chan < pEngineChannel->Channels(); chan++) {          for (int chan = 0; chan < pEngineChannel->Channels(); chan++) {
# Line 2092  String LSCPServer::GetFxSendInfo(uint ui Line 2344  String LSCPServer::GetFxSendInfo(uint ui
2344          }          }
2345    
2346          // success          // success
2347          result.Add("NAME", pFxSend->Name());          result.Add("NAME", _escapeLscpResponse(pFxSend->Name()));
2348          result.Add("MIDI_CONTROLLER", pFxSend->MidiController());          result.Add("MIDI_CONTROLLER", pFxSend->MidiController());
2349          result.Add("LEVEL", ToString(pFxSend->Level()));          result.Add("LEVEL", ToString(pFxSend->Level()));
2350          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);
# Line 2158  String LSCPServer::SetFxSendLevel(uint u Line 2410  String LSCPServer::SetFxSendLevel(uint u
2410      return result.Produce();      return result.Produce();
2411  }  }
2412    
2413    String LSCPServer::EditSamplerChannelInstrument(uint uiSamplerChannel) {
2414        dmsg(2,("LSCPServer: EditSamplerChannelInstrument(SamplerChannel=%d)\n", uiSamplerChannel));
2415        LSCPResultSet result;
2416        try {
2417            EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
2418            if (pEngineChannel->InstrumentStatus() < 0) throw Exception("No instrument loaded to sampler channel");
2419            Engine* pEngine = pEngineChannel->GetEngine();
2420            InstrumentManager* pInstrumentManager = pEngine->GetInstrumentManager();
2421            if (!pInstrumentManager) throw Exception("Engine does not provide an instrument manager");
2422            InstrumentManager::instrument_id_t instrumentID;
2423            instrumentID.FileName = pEngineChannel->InstrumentFileName();
2424            instrumentID.Index    = pEngineChannel->InstrumentIndex();
2425            pInstrumentManager->LaunchInstrumentEditor(instrumentID);
2426        } catch (Exception e) {
2427            result.Error(e);
2428        }
2429        return result.Produce();
2430    }
2431    
2432    String LSCPServer::SendChannelMidiData(String MidiMsg, uint uiSamplerChannel, uint Arg1, uint Arg2) {
2433        dmsg(2,("LSCPServer: SendChannelMidiData(MidiMsg=%s,uiSamplerChannel=%d,Arg1=%d,Arg2=%d)\n", MidiMsg.c_str(), uiSamplerChannel, Arg1, Arg2));
2434        LSCPResultSet result;
2435        try {
2436            EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
2437    
2438            if (Arg1 > 127 || Arg2 > 127) {
2439                throw Exception("Invalid MIDI message");
2440            }
2441    
2442            VirtualMidiDevice* pMidiDevice = NULL;
2443            std::vector<EventHandler::midi_listener_entry>::iterator iter = eventHandler.channelMidiListeners.begin();
2444            for (; iter != eventHandler.channelMidiListeners.end(); ++iter) {
2445                if ((*iter).pEngineChannel == pEngineChannel) {
2446                    pMidiDevice = (*iter).pMidiListener;
2447                    break;
2448                }
2449            }
2450            
2451            if(pMidiDevice == NULL) throw Exception("Couldn't find virtual MIDI device");
2452    
2453            if (MidiMsg == "NOTE_ON") {
2454                pMidiDevice->SendNoteOnToDevice(Arg1, Arg2);
2455                bool b = pMidiDevice->SendNoteOnToSampler(Arg1, Arg2);
2456                if (!b) throw Exception("MIDI event failed: " + MidiMsg + " " + ToString(Arg1) + " " + ToString(Arg2));
2457            } else if (MidiMsg == "NOTE_OFF") {
2458                pMidiDevice->SendNoteOffToDevice(Arg1, Arg2);
2459                bool b = pMidiDevice->SendNoteOffToSampler(Arg1, Arg2);
2460                if (!b) throw Exception("MIDI event failed: " + MidiMsg + " " + ToString(Arg1) + " " + ToString(Arg2));
2461            } else {
2462                throw Exception("Unknown MIDI message type: " + MidiMsg);
2463            }
2464        } catch (Exception e) {
2465            result.Error(e);
2466        }
2467        return result.Produce();
2468    }
2469    
2470  /**  /**
2471   * Will be called by the parser to reset a particular sampler channel.   * Will be called by the parser to reset a particular sampler channel.
2472   */   */
# Line 2165  String LSCPServer::ResetChannel(uint uiS Line 2474  String LSCPServer::ResetChannel(uint uiS
2474      dmsg(2,("LSCPServer: ResetChannel(SamplerChannel=%d)\n", uiSamplerChannel));      dmsg(2,("LSCPServer: ResetChannel(SamplerChannel=%d)\n", uiSamplerChannel));
2475      LSCPResultSet result;      LSCPResultSet result;
2476      try {      try {
2477          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
         if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));  
         EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();  
         if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");  
2478          pEngineChannel->Reset();          pEngineChannel->Reset();
2479      }      }
2480      catch (Exception e) {      catch (Exception e) {
# Line 2193  String LSCPServer::ResetSampler() { Line 2499  String LSCPServer::ResetSampler() {
2499   */   */
2500  String LSCPServer::GetServerInfo() {  String LSCPServer::GetServerInfo() {
2501      dmsg(2,("LSCPServer: GetServerInfo()\n"));      dmsg(2,("LSCPServer: GetServerInfo()\n"));
2502        const std::string description =
2503            _escapeLscpResponse("LinuxSampler - modular, streaming capable sampler");
2504      LSCPResultSet result;      LSCPResultSet result;
2505      result.Add("DESCRIPTION", "LinuxSampler - modular, streaming capable sampler");      result.Add("DESCRIPTION", description);
2506      result.Add("VERSION", VERSION);      result.Add("VERSION", VERSION);
2507      result.Add("PROTOCOL_VERSION", ToString(LSCP_RELEASE_MAJOR) + "." + ToString(LSCP_RELEASE_MINOR));      result.Add("PROTOCOL_VERSION", ToString(LSCP_RELEASE_MAJOR) + "." + ToString(LSCP_RELEASE_MINOR));
2508  #if HAVE_SQLITE3  #if HAVE_SQLITE3
# Line 2202  String LSCPServer::GetServerInfo() { Line 2510  String LSCPServer::GetServerInfo() {
2510  #else  #else
2511      result.Add("INSTRUMENTS_DB_SUPPORT", "no");      result.Add("INSTRUMENTS_DB_SUPPORT", "no");
2512  #endif  #endif
2513        
2514        return result.Produce();
2515    }
2516    
2517    /**
2518     * Will be called by the parser to return the current number of all active streams.
2519     */
2520    String LSCPServer::GetTotalStreamCount() {
2521        dmsg(2,("LSCPServer: GetTotalStreamCount()\n"));
2522        LSCPResultSet result;
2523        result.Add(pSampler->GetDiskStreamCount());
2524      return result.Produce();      return result.Produce();
2525  }  }
2526    
# Line 2236  String LSCPServer::SetGlobalVolume(doubl Line 2554  String LSCPServer::SetGlobalVolume(doubl
2554      LSCPResultSet result;      LSCPResultSet result;
2555      try {      try {
2556          if (dVolume < 0) throw Exception("Volume may not be negative");          if (dVolume < 0) throw Exception("Volume may not be negative");
2557          GLOBAL_VOLUME = dVolume; // see common/global.cpp          GLOBAL_VOLUME = dVolume; // see common/global_private.cpp
2558          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "VOLUME", GLOBAL_VOLUME));          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "VOLUME", GLOBAL_VOLUME));
2559      } catch (Exception e) {      } catch (Exception e) {
2560          result.Error(e);          result.Error(e);
# Line 2244  String LSCPServer::SetGlobalVolume(doubl Line 2562  String LSCPServer::SetGlobalVolume(doubl
2562      return result.Produce();      return result.Produce();
2563  }  }
2564    
2565    String LSCPServer::GetFileInstruments(String Filename) {
2566        dmsg(2,("LSCPServer: GetFileInstruments(String Filename=%s)\n",Filename.c_str()));
2567        LSCPResultSet result;
2568        try {
2569            VerifyFile(Filename);
2570        } catch (Exception e) {
2571            result.Error(e);
2572            return result.Produce();
2573        }
2574        // try to find a sampler engine that can handle the file
2575        bool bFound = false;
2576        std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
2577        for (int i = 0; !bFound && i < engineTypes.size(); i++) {
2578            Engine* pEngine = NULL;
2579            try {
2580                pEngine = EngineFactory::Create(engineTypes[i]);
2581                if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
2582                InstrumentManager* pManager = pEngine->GetInstrumentManager();
2583                if (pManager) {
2584                    std::vector<InstrumentManager::instrument_id_t> IDs =
2585                        pManager->GetInstrumentFileContent(Filename);
2586                    // return the amount of instruments in the file
2587                    result.Add(IDs.size());
2588                    // no more need to ask other engine types
2589                    bFound = true;
2590                } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
2591            } catch (Exception e) {
2592                // NOOP, as exception is thrown if engine doesn't support file
2593            }
2594            if (pEngine) EngineFactory::Destroy(pEngine);
2595        }
2596    
2597        if (!bFound) result.Error("Unknown file format");
2598        return result.Produce();
2599    }
2600    
2601    String LSCPServer::ListFileInstruments(String Filename) {
2602        dmsg(2,("LSCPServer: ListFileInstruments(String Filename=%s)\n",Filename.c_str()));
2603        LSCPResultSet result;
2604        try {
2605            VerifyFile(Filename);
2606        } catch (Exception e) {
2607            result.Error(e);
2608            return result.Produce();
2609        }
2610        // try to find a sampler engine that can handle the file
2611        bool bFound = false;
2612        std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
2613        for (int i = 0; !bFound && i < engineTypes.size(); i++) {
2614            Engine* pEngine = NULL;
2615            try {
2616                pEngine = EngineFactory::Create(engineTypes[i]);
2617                if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
2618                InstrumentManager* pManager = pEngine->GetInstrumentManager();
2619                if (pManager) {
2620                    std::vector<InstrumentManager::instrument_id_t> IDs =
2621                        pManager->GetInstrumentFileContent(Filename);
2622                    // return a list of IDs of the instruments in the file
2623                    String s;
2624                    for (int j = 0; j < IDs.size(); j++) {
2625                        if (s.size()) s += ",";
2626                        s += ToString(IDs[j].Index);
2627                    }
2628                    result.Add(s);
2629                    // no more need to ask other engine types
2630                    bFound = true;
2631                } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
2632            } catch (Exception e) {
2633                // NOOP, as exception is thrown if engine doesn't support file
2634            }
2635            if (pEngine) EngineFactory::Destroy(pEngine);
2636        }
2637    
2638        if (!bFound) result.Error("Unknown file format");
2639        return result.Produce();
2640    }
2641    
2642    String LSCPServer::GetFileInstrumentInfo(String Filename, uint InstrumentID) {
2643        dmsg(2,("LSCPServer: GetFileInstrumentInfo(String Filename=%s, InstrumentID=%d)\n",Filename.c_str(),InstrumentID));
2644        LSCPResultSet result;
2645        try {
2646            VerifyFile(Filename);
2647        } catch (Exception e) {
2648            result.Error(e);
2649            return result.Produce();
2650        }
2651        InstrumentManager::instrument_id_t id;
2652        id.FileName = Filename;
2653        id.Index    = InstrumentID;
2654        // try to find a sampler engine that can handle the file
2655        bool bFound = false;
2656        bool bFatalErr = false;
2657        std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
2658        for (int i = 0; !bFound && !bFatalErr && i < engineTypes.size(); i++) {
2659            Engine* pEngine = NULL;
2660            try {
2661                pEngine = EngineFactory::Create(engineTypes[i]);
2662                if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
2663                InstrumentManager* pManager = pEngine->GetInstrumentManager();
2664                if (pManager) {
2665                    // check if the instrument index is valid
2666                    // FIXME: this won't work if an engine only supports parts of the instrument file
2667                    std::vector<InstrumentManager::instrument_id_t> IDs =
2668                        pManager->GetInstrumentFileContent(Filename);
2669                    if (std::find(IDs.begin(), IDs.end(), id) == IDs.end()) {
2670                        std::stringstream ss;
2671                        ss << "Invalid instrument index " << InstrumentID << " for instrument file '" << Filename << "'";
2672                        bFatalErr = true;
2673                        throw Exception(ss.str());
2674                    }
2675                    // get the info of the requested instrument
2676                    InstrumentManager::instrument_info_t info =
2677                        pManager->GetInstrumentInfo(id);
2678                    // return detailed informations about the file
2679                    result.Add("NAME", info.InstrumentName);
2680                    result.Add("FORMAT_FAMILY", engineTypes[i]);
2681                    result.Add("FORMAT_VERSION", info.FormatVersion);
2682                    result.Add("PRODUCT", info.Product);
2683                    result.Add("ARTISTS", info.Artists);
2684    
2685                    std::stringstream ss;
2686                    bool b = false;
2687                    for (int i = 0; i < 128; i++) {
2688                        if (info.KeyBindings[i]) {
2689                            if (b) ss << ',';
2690                            ss << i; b = true;
2691                        }
2692                    }
2693                    result.Add("KEY_BINDINGS", ss.str());
2694    
2695                    b = false;
2696                    std::stringstream ss2;
2697                    for (int i = 0; i < 128; i++) {
2698                        if (info.KeySwitchBindings[i]) {
2699                            if (b) ss2 << ',';
2700                            ss2 << i; b = true;
2701                        }
2702                    }
2703                    result.Add("KEYSWITCH_BINDINGS", ss2.str());
2704                    // no more need to ask other engine types
2705                    bFound = true;
2706                } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
2707            } catch (Exception e) {
2708                // usually NOOP, as exception is thrown if engine doesn't support file
2709                if (bFatalErr) result.Error(e);
2710            }
2711            if (pEngine) EngineFactory::Destroy(pEngine);
2712        }
2713    
2714        if (!bFound && !bFatalErr) result.Error("Unknown file format");
2715        return result.Produce();
2716    }
2717    
2718    void LSCPServer::VerifyFile(String Filename) {
2719        #if WIN32
2720        WIN32_FIND_DATA win32FileAttributeData;
2721        BOOL res = GetFileAttributesEx( Filename.c_str(), GetFileExInfoStandard, &win32FileAttributeData );
2722        if (!res) {
2723            std::stringstream ss;
2724            ss << "File does not exist, GetFileAttributesEx failed `" << Filename << "`: Error " << GetLastError();
2725            throw Exception(ss.str());
2726        }
2727        if ( win32FileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) {
2728            throw Exception("Directory is specified");
2729        }
2730        #else
2731        struct stat statBuf;
2732        int res = stat(Filename.c_str(), &statBuf);
2733        if (res) {
2734            std::stringstream ss;
2735            ss << "Fail to stat `" << Filename << "`: " << strerror(errno);
2736            throw Exception(ss.str());
2737        }
2738    
2739        if (S_ISDIR(statBuf.st_mode)) {
2740            throw Exception("Directory is specified");
2741        }
2742        #endif
2743    }
2744    
2745  /**  /**
2746   * 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
2747   * server for receiving event messages.   * server for receiving event messages.
# Line 2325  String LSCPServer::GetDbInstrumentDirect Line 2823  String LSCPServer::GetDbInstrumentDirect
2823    
2824          for (int i = 0; i < dirs->size(); i++) {          for (int i = 0; i < dirs->size(); i++) {
2825              if (list != "") list += ",";              if (list != "") list += ",";
2826              list += "'" + dirs->at(i) + "'";              list += "'" + InstrumentsDb::toEscapedPath(dirs->at(i)) + "'";
2827          }          }
2828    
2829          result.Add(list);          result.Add(list);
# Line 2345  String LSCPServer::GetDbInstrumentDirect Line 2843  String LSCPServer::GetDbInstrumentDirect
2843      try {      try {
2844          DbDirectory info = InstrumentsDb::GetInstrumentsDb()->GetDirectoryInfo(Dir);          DbDirectory info = InstrumentsDb::GetInstrumentsDb()->GetDirectoryInfo(Dir);
2845    
2846          result.Add("DESCRIPTION", info.Description);          result.Add("DESCRIPTION", _escapeLscpResponse(info.Description));
2847          result.Add("CREATED", info.Created);          result.Add("CREATED", info.Created);
2848          result.Add("MODIFIED", info.Modified);          result.Add("MODIFIED", info.Modified);
2849      } catch (Exception e) {      } catch (Exception e) {
# Line 2451  String LSCPServer::AddDbInstruments(Stri Line 2949  String LSCPServer::AddDbInstruments(Stri
2949          } else {          } else {
2950              throw Exception("Unknown scan mode: " + ScanMode);              throw Exception("Unknown scan mode: " + ScanMode);
2951          }          }
2952            
2953          if (bBackground) result = id;          if (bBackground) result = id;
2954      } catch (Exception e) {      } catch (Exception e) {
2955           result.Error(e);           result.Error(e);
# Line 2502  String LSCPServer::GetDbInstruments(Stri Line 3000  String LSCPServer::GetDbInstruments(Stri
3000    
3001          for (int i = 0; i < instrs->size(); i++) {          for (int i = 0; i < instrs->size(); i++) {
3002              if (list != "") list += ",";              if (list != "") list += ",";
3003              list += "'" + instrs->at(i) + "'";              list += "'" + InstrumentsDb::toEscapedPath(instrs->at(i)) + "'";
3004          }          }
3005    
3006          result.Add(list);          result.Add(list);
# Line 2529  String LSCPServer::GetDbInstrumentInfo(S Line 3027  String LSCPServer::GetDbInstrumentInfo(S
3027          result.Add("SIZE", (int)info.Size);          result.Add("SIZE", (int)info.Size);
3028          result.Add("CREATED", info.Created);          result.Add("CREATED", info.Created);
3029          result.Add("MODIFIED", info.Modified);          result.Add("MODIFIED", info.Modified);
3030          result.Add("DESCRIPTION", FilterEndlines(info.Description));          result.Add("DESCRIPTION", _escapeLscpResponse(info.Description));
3031          result.Add("IS_DRUM", info.IsDrum);          result.Add("IS_DRUM", info.IsDrum);
3032          result.Add("PRODUCT", FilterEndlines(info.Product));          result.Add("PRODUCT", _escapeLscpResponse(info.Product));
3033          result.Add("ARTISTS", FilterEndlines(info.Artists));          result.Add("ARTISTS", _escapeLscpResponse(info.Artists));
3034          result.Add("KEYWORDS", FilterEndlines(info.Keywords));          result.Add("KEYWORDS", _escapeLscpResponse(info.Keywords));
3035      } catch (Exception e) {      } catch (Exception e) {
3036           result.Error(e);           result.Error(e);
3037      }      }
# Line 2623  String LSCPServer::SetDbInstrumentDescri Line 3121  String LSCPServer::SetDbInstrumentDescri
3121      return result.Produce();      return result.Produce();
3122  }  }
3123    
3124    String LSCPServer::SetDbInstrumentFilePath(String OldPath, String NewPath) {
3125        dmsg(2,("LSCPServer: SetDbInstrumentFilePath(OldPath=%s,NewPath=%s)\n", OldPath.c_str(), NewPath.c_str()));
3126        LSCPResultSet result;
3127    #if HAVE_SQLITE3
3128        try {
3129            InstrumentsDb::GetInstrumentsDb()->SetInstrumentFilePath(OldPath, NewPath);
3130        } catch (Exception e) {
3131             result.Error(e);
3132        }
3133    #else
3134        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
3135    #endif
3136        return result.Produce();
3137    }
3138    
3139    String LSCPServer::FindLostDbInstrumentFiles() {
3140        dmsg(2,("LSCPServer: FindLostDbInstrumentFiles()\n"));
3141        LSCPResultSet result;
3142    #if HAVE_SQLITE3
3143        try {
3144            String list;
3145            StringListPtr pLostFiles = InstrumentsDb::GetInstrumentsDb()->FindLostInstrumentFiles();
3146    
3147            for (int i = 0; i < pLostFiles->size(); i++) {
3148                if (list != "") list += ",";
3149                list += "'" + pLostFiles->at(i) + "'";
3150            }
3151    
3152            result.Add(list);
3153        } catch (Exception e) {
3154             result.Error(e);
3155        }
3156    #else
3157        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
3158    #endif
3159        return result.Produce();
3160    }
3161    
3162  String LSCPServer::FindDbInstrumentDirectories(String Dir, std::map<String,String> Parameters, bool Recursive) {  String LSCPServer::FindDbInstrumentDirectories(String Dir, std::map<String,String> Parameters, bool Recursive) {
3163      dmsg(2,("LSCPServer: FindDbInstrumentDirectories(Dir=%s)\n", Dir.c_str()));      dmsg(2,("LSCPServer: FindDbInstrumentDirectories(Dir=%s)\n", Dir.c_str()));
3164      LSCPResultSet result;      LSCPResultSet result;
# Line 2650  String LSCPServer::FindDbInstrumentDirec Line 3186  String LSCPServer::FindDbInstrumentDirec
3186    
3187          for (int i = 0; i < pDirectories->size(); i++) {          for (int i = 0; i < pDirectories->size(); i++) {
3188              if (list != "") list += ",";              if (list != "") list += ",";
3189              list += "'" + pDirectories->at(i) + "'";              list += "'" + InstrumentsDb::toEscapedPath(pDirectories->at(i)) + "'";
3190          }          }
3191    
3192          result.Add(list);          result.Add(list);
# Line 2706  String LSCPServer::FindDbInstruments(Str Line 3242  String LSCPServer::FindDbInstruments(Str
3242    
3243          for (int i = 0; i < pInstruments->size(); i++) {          for (int i = 0; i < pInstruments->size(); i++) {
3244              if (list != "") list += ",";              if (list != "") list += ",";
3245              list += "'" + pInstruments->at(i) + "'";              list += "'" + InstrumentsDb::toEscapedPath(pInstruments->at(i)) + "'";
3246          }          }
3247    
3248          result.Add(list);          result.Add(list);
# Line 2719  String LSCPServer::FindDbInstruments(Str Line 3255  String LSCPServer::FindDbInstruments(Str
3255      return result.Produce();      return result.Produce();
3256  }  }
3257    
3258    String LSCPServer::FormatInstrumentsDb() {
3259        dmsg(2,("LSCPServer: FormatInstrumentsDb()\n"));
3260        LSCPResultSet result;
3261    #if HAVE_SQLITE3
3262        try {
3263            InstrumentsDb::GetInstrumentsDb()->Format();
3264        } catch (Exception e) {
3265             result.Error(e);
3266        }
3267    #else
3268        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
3269    #endif
3270        return result.Produce();
3271    }
3272    
3273    
3274  /**  /**
3275   * 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 2739  String LSCPServer::SetEcho(yyparse_param Line 3290  String LSCPServer::SetEcho(yyparse_param
3290      return result.Produce();      return result.Produce();
3291  }  }
3292    
 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;  
3293  }  }
Legend:
Removed from v.1200  
changed lines
  Added in v.1774
  ViewVC Help
Powered by ViewVC