/[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 1537 by senoner, Mon Dec 3 18:30:47 2007 UTC revision 1850 by persson, Sun Mar 1 16:33:22 2009 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 - 2009 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 "../common/File.h"
28  #include "lscpserver.h"  #include "lscpserver.h"
29  #include "lscpresultset.h"  #include "lscpresultset.h"
30  #include "lscpevent.h"  #include "lscpevent.h"
# Line 40  Line 44 
44  #include "../drivers/audio/AudioOutputDeviceFactory.h"  #include "../drivers/audio/AudioOutputDeviceFactory.h"
45  #include "../drivers/midi/MidiInputDeviceFactory.h"  #include "../drivers/midi/MidiInputDeviceFactory.h"
46    
47    namespace LinuxSampler {
48    
49  /**  /**
50   * Returns a copy of the given string where all special characters are   * Returns a copy of the given string where all special characters are
# Line 101  Mutex LSCPServer::NotifyBufferMutex = Mu Line 106  Mutex LSCPServer::NotifyBufferMutex = Mu
106  Mutex LSCPServer::SubscriptionMutex = Mutex();  Mutex LSCPServer::SubscriptionMutex = Mutex();
107  Mutex LSCPServer::RTNotifyMutex = Mutex();  Mutex LSCPServer::RTNotifyMutex = Mutex();
108    
109  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) {
110      SocketAddress.sin_family      = AF_INET;      SocketAddress.sin_family      = AF_INET;
111      SocketAddress.sin_addr.s_addr = addr;      SocketAddress.sin_addr.s_addr = addr;
112      SocketAddress.sin_port        = port;      SocketAddress.sin_port        = port;
# Line 127  LSCPServer::LSCPServer(Sampler* pSampler Line 132  LSCPServer::LSCPServer(Sampler* pSampler
132      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");
133      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instrs_job_info, "DB_INSTRUMENTS_JOB_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instrs_job_info, "DB_INSTRUMENTS_JOB_INFO");
134      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
135        LSCPEvent::RegisterEvent(LSCPEvent::event_total_stream_count, "TOTAL_STREAM_COUNT");
136      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");
137      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");
138        LSCPEvent::RegisterEvent(LSCPEvent::event_channel_midi, "CHANNEL_MIDI");
139        LSCPEvent::RegisterEvent(LSCPEvent::event_device_midi, "DEVICE_MIDI");
140      hSocket = -1;      hSocket = -1;
141  }  }
142    
143  LSCPServer::~LSCPServer() {  LSCPServer::~LSCPServer() {
144        CloseAllConnections();
145        InstrumentManager::StopBackgroundThread();
146  #if defined(WIN32)  #if defined(WIN32)
147      if (hSocket >= 0) closesocket(hSocket);      if (hSocket >= 0) closesocket(hSocket);
148  #else  #else
# Line 140  LSCPServer::~LSCPServer() { Line 150  LSCPServer::~LSCPServer() {
150  #endif  #endif
151  }  }
152    
153    LSCPServer::EventHandler::EventHandler(LSCPServer* pParent) {
154        this->pParent = pParent;
155    }
156    
157    LSCPServer::EventHandler::~EventHandler() {
158        std::vector<midi_listener_entry> l = channelMidiListeners;
159        channelMidiListeners.clear();
160        for (int i = 0; i < l.size(); i++)
161            delete l[i].pMidiListener;
162    }
163    
164  void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {  void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {
165      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_count, NewCount));
166  }  }
167    
168    void LSCPServer::EventHandler::ChannelAdded(SamplerChannel* pChannel) {
169        pChannel->AddEngineChangeListener(this);
170    }
171    
172    void LSCPServer::EventHandler::ChannelToBeRemoved(SamplerChannel* pChannel) {
173        if (!pChannel->GetEngineChannel()) return;
174        EngineToBeChanged(pChannel->Index());
175    }
176    
177    void LSCPServer::EventHandler::EngineToBeChanged(int ChannelId) {
178        SamplerChannel* pSamplerChannel =
179            pParent->pSampler->GetSamplerChannel(ChannelId);
180        if (!pSamplerChannel) return;
181        EngineChannel* pEngineChannel =
182            pSamplerChannel->GetEngineChannel();
183        if (!pEngineChannel) return;
184        for (std::vector<midi_listener_entry>::iterator iter = channelMidiListeners.begin(); iter != channelMidiListeners.end(); ++iter) {
185            if ((*iter).pEngineChannel == pEngineChannel) {
186                VirtualMidiDevice* pMidiListener = (*iter).pMidiListener;
187                pEngineChannel->Disconnect(pMidiListener);
188                channelMidiListeners.erase(iter);
189                delete pMidiListener;
190                return;
191            }
192        }
193    }
194    
195    void LSCPServer::EventHandler::EngineChanged(int ChannelId) {
196        SamplerChannel* pSamplerChannel =
197            pParent->pSampler->GetSamplerChannel(ChannelId);
198        if (!pSamplerChannel) return;
199        EngineChannel* pEngineChannel =
200            pSamplerChannel->GetEngineChannel();
201        if (!pEngineChannel) return;
202        VirtualMidiDevice* pMidiListener = new VirtualMidiDevice;
203        pEngineChannel->Connect(pMidiListener);
204        midi_listener_entry entry = {
205            pSamplerChannel, pEngineChannel, pMidiListener
206        };
207        channelMidiListeners.push_back(entry);
208    }
209    
210  void LSCPServer::EventHandler::AudioDeviceCountChanged(int NewCount) {  void LSCPServer::EventHandler::AudioDeviceCountChanged(int NewCount) {
211      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_audio_device_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_audio_device_count, NewCount));
212  }  }
# Line 152  void LSCPServer::EventHandler::MidiDevic Line 215  void LSCPServer::EventHandler::MidiDevic
215      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_device_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_device_count, NewCount));
216  }  }
217    
218    void LSCPServer::EventHandler::MidiDeviceToBeDestroyed(MidiInputDevice* pDevice) {
219        pDevice->RemoveMidiPortCountListener(this);
220        for (int i = 0; i < pDevice->PortCount(); ++i)
221            MidiPortToBeRemoved(pDevice->GetPort(i));
222    }
223    
224    void LSCPServer::EventHandler::MidiDeviceCreated(MidiInputDevice* pDevice) {
225        pDevice->AddMidiPortCountListener(this);
226        for (int i = 0; i < pDevice->PortCount(); ++i)
227            MidiPortAdded(pDevice->GetPort(i));
228    }
229    
230    void LSCPServer::EventHandler::MidiPortCountChanged(int NewCount) {
231        // yet unused
232    }
233    
234    void LSCPServer::EventHandler::MidiPortToBeRemoved(MidiInputPort* pPort) {
235        for (std::vector<device_midi_listener_entry>::iterator iter = deviceMidiListeners.begin(); iter != deviceMidiListeners.end(); ++iter) {
236            if ((*iter).pPort == pPort) {
237                VirtualMidiDevice* pMidiListener = (*iter).pMidiListener;
238                pPort->Disconnect(pMidiListener);
239                deviceMidiListeners.erase(iter);
240                delete pMidiListener;
241                return;
242            }
243        }
244    }
245    
246    void LSCPServer::EventHandler::MidiPortAdded(MidiInputPort* pPort) {
247        // find out the device ID
248        std::map<uint, MidiInputDevice*> devices =
249            pParent->pSampler->GetMidiInputDevices();
250        for (
251            std::map<uint, MidiInputDevice*>::iterator iter = devices.begin();
252            iter != devices.end(); ++iter
253        ) {
254            if (iter->second == pPort->GetDevice()) { // found
255                VirtualMidiDevice* pMidiListener = new VirtualMidiDevice;
256                pPort->Connect(pMidiListener);
257                device_midi_listener_entry entry = {
258                    pPort, pMidiListener, iter->first
259                };
260                deviceMidiListeners.push_back(entry);
261                return;
262            }
263        }
264    }
265    
266  void LSCPServer::EventHandler::MidiInstrumentCountChanged(int MapId, int NewCount) {  void LSCPServer::EventHandler::MidiInstrumentCountChanged(int MapId, int NewCount) {
267      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_count, MapId, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_midi_instr_count, MapId, NewCount));
268  }  }
# Line 188  void LSCPServer::EventHandler::TotalVoic Line 299  void LSCPServer::EventHandler::TotalVoic
299      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_voice_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_voice_count, NewCount));
300  }  }
301    
302    void LSCPServer::EventHandler::TotalStreamCountChanged(int NewCount) {
303        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_stream_count, NewCount));
304    }
305    
306  #if HAVE_SQLITE3  #if HAVE_SQLITE3
307  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {
308      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, InstrumentsDb::toEscapedPath(Dir)));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, InstrumentsDb::toEscapedPath(Dir)));
# Line 222  void LSCPServer::DbInstrumentsEventHandl Line 337  void LSCPServer::DbInstrumentsEventHandl
337  }  }
338  #endif // HAVE_SQLITE3  #endif // HAVE_SQLITE3
339    
340    void LSCPServer::RemoveListeners() {
341        pSampler->RemoveChannelCountListener(&eventHandler);
342        pSampler->RemoveAudioDeviceCountListener(&eventHandler);
343        pSampler->RemoveMidiDeviceCountListener(&eventHandler);
344        pSampler->RemoveVoiceCountListener(&eventHandler);
345        pSampler->RemoveStreamCountListener(&eventHandler);
346        pSampler->RemoveBufferFillListener(&eventHandler);
347        pSampler->RemoveTotalStreamCountListener(&eventHandler);
348        pSampler->RemoveTotalVoiceCountListener(&eventHandler);
349        pSampler->RemoveFxSendCountListener(&eventHandler);
350        MidiInstrumentMapper::RemoveMidiInstrumentCountListener(&eventHandler);
351        MidiInstrumentMapper::RemoveMidiInstrumentInfoListener(&eventHandler);
352        MidiInstrumentMapper::RemoveMidiInstrumentMapCountListener(&eventHandler);
353        MidiInstrumentMapper::RemoveMidiInstrumentMapInfoListener(&eventHandler);
354    #if HAVE_SQLITE3
355        InstrumentsDb::GetInstrumentsDb()->RemoveInstrumentsDbListener(&dbInstrumentsEventHandler);
356    #endif
357    }
358    
359  /**  /**
360   * Blocks the calling thread until the LSCP Server is initialized and   * Blocks the calling thread until the LSCP Server is initialized and
# Line 284  int LSCPServer::Main() { Line 417  int LSCPServer::Main() {
417      pSampler->AddVoiceCountListener(&eventHandler);      pSampler->AddVoiceCountListener(&eventHandler);
418      pSampler->AddStreamCountListener(&eventHandler);      pSampler->AddStreamCountListener(&eventHandler);
419      pSampler->AddBufferFillListener(&eventHandler);      pSampler->AddBufferFillListener(&eventHandler);
420        pSampler->AddTotalStreamCountListener(&eventHandler);
421      pSampler->AddTotalVoiceCountListener(&eventHandler);      pSampler->AddTotalVoiceCountListener(&eventHandler);
422      pSampler->AddFxSendCountListener(&eventHandler);      pSampler->AddFxSendCountListener(&eventHandler);
423      MidiInstrumentMapper::AddMidiInstrumentCountListener(&eventHandler);      MidiInstrumentMapper::AddMidiInstrumentCountListener(&eventHandler);
# Line 303  int LSCPServer::Main() { Line 437  int LSCPServer::Main() {
437      timeval timeout;      timeval timeout;
438    
439      while (true) {      while (true) {
440            #if CONFIG_PTHREAD_TESTCANCEL
441                    TestCancel();
442            #endif
443          // 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
444          {          {
445              std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();              std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();
# Line 310  int LSCPServer::Main() { Line 447  int LSCPServer::Main() {
447              std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();              std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();
448              for (; itEngineChannel != itEnd; ++itEngineChannel) {              for (; itEngineChannel != itEnd; ++itEngineChannel) {
449                  if ((*itEngineChannel)->StatusChanged()) {                  if ((*itEngineChannel)->StatusChanged()) {
450                      SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_info, (*itEngineChannel)->iSamplerChannelIndex));                      SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_info, (*itEngineChannel)->GetSamplerChannel()->Index()));
451                  }                  }
452    
453                  for (int i = 0; i < (*itEngineChannel)->GetFxSendCount(); i++) {                  for (int i = 0; i < (*itEngineChannel)->GetFxSendCount(); i++) {
454                      FxSend* fxs = (*itEngineChannel)->GetFxSend(i);                      FxSend* fxs = (*itEngineChannel)->GetFxSend(i);
455                      if(fxs != NULL && fxs->IsInfoChanged()) {                      if(fxs != NULL && fxs->IsInfoChanged()) {
456                          int chn = (*itEngineChannel)->iSamplerChannelIndex;                          int chn = (*itEngineChannel)->GetSamplerChannel()->Index();
457                          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, chn, fxs->Id()));                          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_send_info, chn, fxs->Id()));
458                          fxs->SetInfoChanged(false);                          fxs->SetInfoChanged(false);
459                      }                      }
# Line 324  int LSCPServer::Main() { Line 461  int LSCPServer::Main() {
461              }              }
462          }          }
463    
464            // check if MIDI data arrived on some engine channel
465            for (int i = 0; i < eventHandler.channelMidiListeners.size(); ++i) {
466                const EventHandler::midi_listener_entry entry =
467                    eventHandler.channelMidiListeners[i];
468                VirtualMidiDevice* pMidiListener = entry.pMidiListener;
469                if (pMidiListener->NotesChanged()) {
470                    for (int iNote = 0; iNote < 128; iNote++) {
471                        if (pMidiListener->NoteChanged(iNote)) {
472                            const bool bActive = pMidiListener->NoteIsActive(iNote);
473                            LSCPServer::SendLSCPNotify(
474                                LSCPEvent(
475                                    LSCPEvent::event_channel_midi,
476                                    entry.pSamplerChannel->Index(),
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            // check if MIDI data arrived on some MIDI device
489            for (int i = 0; i < eventHandler.deviceMidiListeners.size(); ++i) {
490                const EventHandler::device_midi_listener_entry entry =
491                    eventHandler.deviceMidiListeners[i];
492                VirtualMidiDevice* pMidiListener = entry.pMidiListener;
493                if (pMidiListener->NotesChanged()) {
494                    for (int iNote = 0; iNote < 128; iNote++) {
495                        if (pMidiListener->NoteChanged(iNote)) {
496                            const bool bActive = pMidiListener->NoteIsActive(iNote);
497                            LSCPServer::SendLSCPNotify(
498                                LSCPEvent(
499                                    LSCPEvent::event_device_midi,
500                                    entry.uiDeviceID,
501                                    entry.pPort->GetPortNumber(),
502                                    std::string(bActive ? "NOTE_ON" : "NOTE_OFF"),
503                                    iNote,
504                                    bActive ? pMidiListener->NoteOnVelocity(iNote)
505                                            : pMidiListener->NoteOffVelocity(iNote)
506                                )
507                            );
508                        }
509                    }
510                }
511            }
512    
513          //Now let's deliver late notifies (if any)          //Now let's deliver late notifies (if any)
514          NotifyBufferMutex.Lock();          NotifyBufferMutex.Lock();
515          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 342  int LSCPServer::Main() { Line 528  int LSCPServer::Main() {
528    
529          int retval = select(maxSessions+1, &selectSet, NULL, NULL, &timeout);          int retval = select(maxSessions+1, &selectSet, NULL, NULL, &timeout);
530    
531          if (retval == 0)          if (retval == 0 || (retval == -1 && errno == EINTR))
532                  continue; //Nothing try again                  continue; //Nothing try again
533          if (retval == -1) {          if (retval == -1) {
534                  std::cerr << "LSCPServer: Socket select error." << std::endl;                  std::cerr << "LSCPServer: Socket select error." << std::endl;
# Line 440  void LSCPServer::CloseConnection( std::v Line 626  void LSCPServer::CloseConnection( std::v
626          NotifyMutex.Unlock();          NotifyMutex.Unlock();
627  }  }
628    
629    void LSCPServer::CloseAllConnections() {
630        std::vector<yyparse_param_t>::iterator iter = Sessions.begin();
631        while(iter != Sessions.end()) {
632            CloseConnection(iter);
633            iter = Sessions.begin();
634        }
635    }
636    
637    void LSCPServer::LockRTNotify() {
638        RTNotifyMutex.Lock();
639    }
640    
641    void LSCPServer::UnlockRTNotify() {
642        RTNotifyMutex.Unlock();
643    }
644    
645  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {
646          int subs = 0;          int subs = 0;
647          SubscriptionMutex.Lock();          SubscriptionMutex.Lock();
# Line 962  String LSCPServer::GetVoiceCount(uint ui Line 1164  String LSCPServer::GetVoiceCount(uint ui
1164      dmsg(2,("LSCPServer: GetVoiceCount(SamplerChannel=%d)\n", uiSamplerChannel));      dmsg(2,("LSCPServer: GetVoiceCount(SamplerChannel=%d)\n", uiSamplerChannel));
1165      LSCPResultSet result;      LSCPResultSet result;
1166      try {      try {
1167          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");  
1168          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");
1169          result.Add(pEngineChannel->GetEngine()->VoiceCount());          result.Add(pEngineChannel->GetEngine()->VoiceCount());
1170      }      }
# Line 983  String LSCPServer::GetStreamCount(uint u Line 1182  String LSCPServer::GetStreamCount(uint u
1182      dmsg(2,("LSCPServer: GetStreamCount(SamplerChannel=%d)\n", uiSamplerChannel));      dmsg(2,("LSCPServer: GetStreamCount(SamplerChannel=%d)\n", uiSamplerChannel));
1183      LSCPResultSet result;      LSCPResultSet result;
1184      try {      try {
1185          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");  
1186          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");
1187          result.Add(pEngineChannel->GetEngine()->DiskStreamCount());          result.Add(pEngineChannel->GetEngine()->DiskStreamCount());
1188      }      }
# Line 1004  String LSCPServer::GetBufferFill(fill_re Line 1200  String LSCPServer::GetBufferFill(fill_re
1200      dmsg(2,("LSCPServer: GetBufferFill(ResponseType=%d, SamplerChannel=%d)\n", ResponseType, uiSamplerChannel));      dmsg(2,("LSCPServer: GetBufferFill(ResponseType=%d, SamplerChannel=%d)\n", ResponseType, uiSamplerChannel));
1201      LSCPResultSet result;      LSCPResultSet result;
1202      try {      try {
1203          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");  
1204          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");
1205          if (!pEngineChannel->GetEngine()->DiskStreamSupported()) result.Add("NA");          if (!pEngineChannel->GetEngine()->DiskStreamSupported()) result.Add("NA");
1206          else {          else {
# Line 1095  String LSCPServer::GetMidiInputDriverInf Line 1288  String LSCPServer::GetMidiInputDriverInf
1288              for (;iter != parameters.end(); iter++) {              for (;iter != parameters.end(); iter++) {
1289                  if (s != "") s += ",";                  if (s != "") s += ",";
1290                  s += iter->first;                  s += iter->first;
1291                    delete iter->second;
1292              }              }
1293              result.Add("PARAMETERS", s);              result.Add("PARAMETERS", s);
1294          }          }
# Line 1119  String LSCPServer::GetAudioOutputDriverI Line 1313  String LSCPServer::GetAudioOutputDriverI
1313              for (;iter != parameters.end(); iter++) {              for (;iter != parameters.end(); iter++) {
1314                  if (s != "") s += ",";                  if (s != "") s += ",";
1315                  s += iter->first;                  s += iter->first;
1316                    delete iter->second;
1317              }              }
1318              result.Add("PARAMETERS", s);              result.Add("PARAMETERS", s);
1319          }          }
# Line 1149  String LSCPServer::GetMidiInputDriverPar Line 1344  String LSCPServer::GetMidiInputDriverPar
1344          if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);          if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
1345          if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);          if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
1346          if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);          if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
1347            delete pParameter;
1348      }      }
1349      catch (Exception e) {      catch (Exception e) {
1350          result.Error(e);          result.Error(e);
# Line 1176  String LSCPServer::GetAudioOutputDriverP Line 1372  String LSCPServer::GetAudioOutputDriverP
1372          if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);          if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
1373          if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);          if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
1374          if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);          if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
1375            delete pParameter;
1376      }      }
1377      catch (Exception e) {      catch (Exception e) {
1378          result.Error(e);          result.Error(e);
# Line 1685  String LSCPServer::SetVolume(double dVol Line 1882  String LSCPServer::SetVolume(double dVol
1882      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", dVolume, uiSamplerChannel));      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", dVolume, 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          pEngineChannel->Volume(dVolume);          pEngineChannel->Volume(dVolume);
1887      }      }
1888      catch (Exception e) {      catch (Exception e) {
# Line 1704  String LSCPServer::SetChannelMute(bool b Line 1898  String LSCPServer::SetChannelMute(bool b
1898      dmsg(2,("LSCPServer: SetChannelMute(bMute=%d,uiSamplerChannel=%d)\n",bMute,uiSamplerChannel));      dmsg(2,("LSCPServer: SetChannelMute(bMute=%d,uiSamplerChannel=%d)\n",bMute,uiSamplerChannel));
1899      LSCPResultSet result;      LSCPResultSet result;
1900      try {      try {
1901          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");  
1902    
1903          if(!bMute) pEngineChannel->SetMute((HasSoloChannel() && !pEngineChannel->GetSolo()) ? -1 : 0);          if(!bMute) pEngineChannel->SetMute((HasSoloChannel() && !pEngineChannel->GetSolo()) ? -1 : 0);
1904          else pEngineChannel->SetMute(1);          else pEngineChannel->SetMute(1);
# Line 1725  String LSCPServer::SetChannelSolo(bool b Line 1915  String LSCPServer::SetChannelSolo(bool b
1915      dmsg(2,("LSCPServer: SetChannelSolo(bSolo=%d,uiSamplerChannel=%d)\n",bSolo,uiSamplerChannel));      dmsg(2,("LSCPServer: SetChannelSolo(bSolo=%d,uiSamplerChannel=%d)\n",bSolo,uiSamplerChannel));
1916      LSCPResultSet result;      LSCPResultSet result;
1917      try {      try {
1918          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");  
1919    
1920          bool oldSolo = pEngineChannel->GetSolo();          bool oldSolo = pEngineChannel->GetSolo();
1921          bool hadSoloChannel = HasSoloChannel();          bool hadSoloChannel = HasSoloChannel();
# Line 1849  String LSCPServer::GetMidiInstrumentMapp Line 2035  String LSCPServer::GetMidiInstrumentMapp
2035      dmsg(2,("LSCPServer: GetMidiInstrumentMappings()\n"));      dmsg(2,("LSCPServer: GetMidiInstrumentMappings()\n"));
2036      LSCPResultSet result;      LSCPResultSet result;
2037      try {      try {
2038          result.Add(MidiInstrumentMapper::Entries(MidiMapID).size());          result.Add(MidiInstrumentMapper::GetInstrumentCount(MidiMapID));
2039      } catch (Exception e) {      } catch (Exception e) {
2040          result.Error(e);          result.Error(e);
2041      }      }
# Line 1860  String LSCPServer::GetMidiInstrumentMapp Line 2046  String LSCPServer::GetMidiInstrumentMapp
2046  String LSCPServer::GetAllMidiInstrumentMappings() {  String LSCPServer::GetAllMidiInstrumentMappings() {
2047      dmsg(2,("LSCPServer: GetAllMidiInstrumentMappings()\n"));      dmsg(2,("LSCPServer: GetAllMidiInstrumentMappings()\n"));
2048      LSCPResultSet result;      LSCPResultSet result;
2049      std::vector<int> maps = MidiInstrumentMapper::Maps();      try {
2050      int totalMappings = 0;          result.Add(MidiInstrumentMapper::GetInstrumentCount());
2051      for (int i = 0; i < maps.size(); i++) {      } catch (Exception e) {
2052          try {          result.Error(e);
             totalMappings += MidiInstrumentMapper::Entries(maps[i]).size();  
         } catch (Exception e) { /*NOOP*/ }  
2053      }      }
     result.Add(totalMappings);  
2054      return result.Produce();      return result.Produce();
2055  }  }
2056    
# Line 1875  String LSCPServer::GetMidiInstrumentMapp Line 2058  String LSCPServer::GetMidiInstrumentMapp
2058      dmsg(2,("LSCPServer: GetMidiIstrumentMapping()\n"));      dmsg(2,("LSCPServer: GetMidiIstrumentMapping()\n"));
2059      LSCPResultSet result;      LSCPResultSet result;
2060      try {      try {
2061          midi_prog_index_t idx;          MidiInstrumentMapper::entry_t entry = MidiInstrumentMapper::GetEntry(MidiMapID, MidiBank, MidiProg);
2062          idx.midi_bank_msb = (MidiBank >> 7) & 0x7f;          // convert the filename into the correct encoding as defined for LSCP
2063          idx.midi_bank_lsb = MidiBank & 0x7f;          // (especially in terms of special characters -> escape sequences)
         idx.midi_prog     = MidiProg;  
   
         std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t> mappings = MidiInstrumentMapper::Entries(MidiMapID);  
         std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t>::iterator iter = mappings.find(idx);  
         if (iter == mappings.end()) result.Error("there is no map entry with that index");  
         else { // found  
   
             // convert the filename into the correct encoding as defined for LSCP  
             // (especially in terms of special characters -> escape sequences)  
2064  #if WIN32  #if WIN32
2065              const String instrumentFileName = Path::fromWindows(iter->second.InstrumentFile).toLscp();          const String instrumentFileName = Path::fromWindows(entry.InstrumentFile).toLscp();
2066  #else  #else
2067              // assuming POSIX          // assuming POSIX
2068              const String instrumentFileName = Path::fromPosix(iter->second.InstrumentFile).toLscp();          const String instrumentFileName = Path::fromPosix(entry.InstrumentFile).toLscp();
2069  #endif  #endif
2070    
2071              result.Add("NAME", _escapeLscpResponse(iter->second.Name));          result.Add("NAME", _escapeLscpResponse(entry.Name));
2072              result.Add("ENGINE_NAME", iter->second.EngineName);          result.Add("ENGINE_NAME", entry.EngineName);
2073              result.Add("INSTRUMENT_FILE", instrumentFileName);          result.Add("INSTRUMENT_FILE", instrumentFileName);
2074              result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);          result.Add("INSTRUMENT_NR", (int) entry.InstrumentIndex);
2075              String instrumentName;          String instrumentName;
2076              Engine* pEngine = EngineFactory::Create(iter->second.EngineName);          Engine* pEngine = EngineFactory::Create(entry.EngineName);
2077              if (pEngine) {          if (pEngine) {
2078                  if (pEngine->GetInstrumentManager()) {              if (pEngine->GetInstrumentManager()) {
2079                      InstrumentManager::instrument_id_t instrID;                  InstrumentManager::instrument_id_t instrID;
2080                      instrID.FileName = iter->second.InstrumentFile;                  instrID.FileName = entry.InstrumentFile;
2081                      instrID.Index    = iter->second.InstrumentIndex;                  instrID.Index    = entry.InstrumentIndex;
2082                      instrumentName = pEngine->GetInstrumentManager()->GetInstrumentName(instrID);                  instrumentName = pEngine->GetInstrumentManager()->GetInstrumentName(instrID);
                 }  
                 EngineFactory::Destroy(pEngine);  
2083              }              }
2084              result.Add("INSTRUMENT_NAME", _escapeLscpResponse(instrumentName));              EngineFactory::Destroy(pEngine);
2085              switch (iter->second.LoadMode) {          }
2086                  case MidiInstrumentMapper::ON_DEMAND:          result.Add("INSTRUMENT_NAME", _escapeLscpResponse(instrumentName));
2087                      result.Add("LOAD_MODE", "ON_DEMAND");          switch (entry.LoadMode) {
2088                      break;              case MidiInstrumentMapper::ON_DEMAND:
2089                  case MidiInstrumentMapper::ON_DEMAND_HOLD:                  result.Add("LOAD_MODE", "ON_DEMAND");
2090                      result.Add("LOAD_MODE", "ON_DEMAND_HOLD");                  break;
2091                      break;              case MidiInstrumentMapper::ON_DEMAND_HOLD:
2092                  case MidiInstrumentMapper::PERSISTENT:                  result.Add("LOAD_MODE", "ON_DEMAND_HOLD");
2093                      result.Add("LOAD_MODE", "PERSISTENT");                  break;
2094                      break;              case MidiInstrumentMapper::PERSISTENT:
2095                  default:                  result.Add("LOAD_MODE", "PERSISTENT");
2096                      throw Exception("entry reflects invalid LOAD_MODE, consider this as a bug!");                  break;
2097              }              default:
2098              result.Add("VOLUME", iter->second.Volume);                  throw Exception("entry reflects invalid LOAD_MODE, consider this as a bug!");
2099          }          }
2100            result.Add("VOLUME", entry.Volume);
2101      } catch (Exception e) {      } catch (Exception e) {
2102          result.Error(e);          result.Error(e);
2103      }      }
# Line 2095  String LSCPServer::SetChannelMap(uint ui Line 2268  String LSCPServer::SetChannelMap(uint ui
2268      dmsg(2,("LSCPServer: SetChannelMap()\n"));      dmsg(2,("LSCPServer: SetChannelMap()\n"));
2269      LSCPResultSet result;      LSCPResultSet result;
2270      try {      try {
2271          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");  
2272    
2273          if      (MidiMapID == -1) pEngineChannel->SetMidiInstrumentMapToNone();          if      (MidiMapID == -1) pEngineChannel->SetMidiInstrumentMapToNone();
2274          else if (MidiMapID == -2) pEngineChannel->SetMidiInstrumentMapToDefault();          else if (MidiMapID == -2) pEngineChannel->SetMidiInstrumentMapToDefault();
# Line 2278  String LSCPServer::EditSamplerChannelIns Line 2447  String LSCPServer::EditSamplerChannelIns
2447      dmsg(2,("LSCPServer: EditSamplerChannelInstrument(SamplerChannel=%d)\n", uiSamplerChannel));      dmsg(2,("LSCPServer: EditSamplerChannelInstrument(SamplerChannel=%d)\n", uiSamplerChannel));
2448      LSCPResultSet result;      LSCPResultSet result;
2449      try {      try {
2450          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");  
2451          if (pEngineChannel->InstrumentStatus() < 0) throw Exception("No instrument loaded to sampler channel");          if (pEngineChannel->InstrumentStatus() < 0) throw Exception("No instrument loaded to sampler channel");
2452          Engine* pEngine = pEngineChannel->GetEngine();          Engine* pEngine = pEngineChannel->GetEngine();
2453          InstrumentManager* pInstrumentManager = pEngine->GetInstrumentManager();          InstrumentManager* pInstrumentManager = pEngine->GetInstrumentManager();
# Line 2296  String LSCPServer::EditSamplerChannelIns Line 2462  String LSCPServer::EditSamplerChannelIns
2462      return result.Produce();      return result.Produce();
2463  }  }
2464    
2465    String LSCPServer::SendChannelMidiData(String MidiMsg, uint uiSamplerChannel, uint Arg1, uint Arg2) {
2466        dmsg(2,("LSCPServer: SendChannelMidiData(MidiMsg=%s,uiSamplerChannel=%d,Arg1=%d,Arg2=%d)\n", MidiMsg.c_str(), uiSamplerChannel, Arg1, Arg2));
2467        LSCPResultSet result;
2468        try {
2469            EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
2470    
2471            if (Arg1 > 127 || Arg2 > 127) {
2472                throw Exception("Invalid MIDI message");
2473            }
2474    
2475            VirtualMidiDevice* pMidiDevice = NULL;
2476            std::vector<EventHandler::midi_listener_entry>::iterator iter = eventHandler.channelMidiListeners.begin();
2477            for (; iter != eventHandler.channelMidiListeners.end(); ++iter) {
2478                if ((*iter).pEngineChannel == pEngineChannel) {
2479                    pMidiDevice = (*iter).pMidiListener;
2480                    break;
2481                }
2482            }
2483            
2484            if(pMidiDevice == NULL) throw Exception("Couldn't find virtual MIDI device");
2485    
2486            if (MidiMsg == "NOTE_ON") {
2487                pMidiDevice->SendNoteOnToDevice(Arg1, Arg2);
2488                bool b = pMidiDevice->SendNoteOnToSampler(Arg1, Arg2);
2489                if (!b) throw Exception("MIDI event failed: " + MidiMsg + " " + ToString(Arg1) + " " + ToString(Arg2));
2490            } else if (MidiMsg == "NOTE_OFF") {
2491                pMidiDevice->SendNoteOffToDevice(Arg1, Arg2);
2492                bool b = pMidiDevice->SendNoteOffToSampler(Arg1, Arg2);
2493                if (!b) throw Exception("MIDI event failed: " + MidiMsg + " " + ToString(Arg1) + " " + ToString(Arg2));
2494            } else {
2495                throw Exception("Unknown MIDI message type: " + MidiMsg);
2496            }
2497        } catch (Exception e) {
2498            result.Error(e);
2499        }
2500        return result.Produce();
2501    }
2502    
2503  /**  /**
2504   * Will be called by the parser to reset a particular sampler channel.   * Will be called by the parser to reset a particular sampler channel.
2505   */   */
# Line 2303  String LSCPServer::ResetChannel(uint uiS Line 2507  String LSCPServer::ResetChannel(uint uiS
2507      dmsg(2,("LSCPServer: ResetChannel(SamplerChannel=%d)\n", uiSamplerChannel));      dmsg(2,("LSCPServer: ResetChannel(SamplerChannel=%d)\n", uiSamplerChannel));
2508      LSCPResultSet result;      LSCPResultSet result;
2509      try {      try {
2510          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");  
2511          pEngineChannel->Reset();          pEngineChannel->Reset();
2512      }      }
2513      catch (Exception e) {      catch (Exception e) {
# Line 2347  String LSCPServer::GetServerInfo() { Line 2548  String LSCPServer::GetServerInfo() {
2548  }  }
2549    
2550  /**  /**
2551     * Will be called by the parser to return the current number of all active streams.
2552     */
2553    String LSCPServer::GetTotalStreamCount() {
2554        dmsg(2,("LSCPServer: GetTotalStreamCount()\n"));
2555        LSCPResultSet result;
2556        result.Add(pSampler->GetDiskStreamCount());
2557        return result.Produce();
2558    }
2559    
2560    /**
2561   * 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.
2562   */   */
2563  String LSCPServer::GetTotalVoiceCount() {  String LSCPServer::GetTotalVoiceCount() {
# Line 2362  String LSCPServer::GetTotalVoiceCount() Line 2573  String LSCPServer::GetTotalVoiceCount()
2573  String LSCPServer::GetTotalVoiceCountMax() {  String LSCPServer::GetTotalVoiceCountMax() {
2574      dmsg(2,("LSCPServer: GetTotalVoiceCountMax()\n"));      dmsg(2,("LSCPServer: GetTotalVoiceCountMax()\n"));
2575      LSCPResultSet result;      LSCPResultSet result;
2576      result.Add(EngineFactory::EngineInstances().size() * CONFIG_MAX_VOICES);      result.Add(EngineFactory::EngineInstances().size() * GLOBAL_MAX_VOICES);
2577        return result.Produce();
2578    }
2579    
2580    /**
2581     * Will be called by the parser to return the sampler global maximum
2582     * allowed number of voices.
2583     */
2584    String LSCPServer::GetGlobalMaxVoices() {
2585        dmsg(2,("LSCPServer: GetGlobalMaxVoices()\n"));
2586        LSCPResultSet result;
2587        result.Add(GLOBAL_MAX_VOICES);
2588        return result.Produce();
2589    }
2590    
2591    /**
2592     * Will be called by the parser to set the sampler global maximum number of
2593     * voices.
2594     */
2595    String LSCPServer::SetGlobalMaxVoices(int iVoices) {
2596        dmsg(2,("LSCPServer: SetGlobalMaxVoices(%d)\n", iVoices));
2597        LSCPResultSet result;
2598        try {
2599            if (iVoices < 1) throw Exception("Maximum voices may not be less than 1");
2600            GLOBAL_MAX_VOICES = iVoices; // see common/global_private.cpp
2601            const std::set<Engine*>& engines = EngineFactory::EngineInstances();
2602            if (engines.size() > 0) {
2603                std::set<Engine*>::iterator iter = engines.begin();
2604                std::set<Engine*>::iterator end  = engines.end();
2605                for (; iter != end; ++iter) {
2606                    (*iter)->SetMaxVoices(iVoices);
2607                }
2608            }
2609            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "VOICES", GLOBAL_MAX_VOICES));
2610        } catch (Exception e) {
2611            result.Error(e);
2612        }
2613        return result.Produce();
2614    }
2615    
2616    /**
2617     * Will be called by the parser to return the sampler global maximum
2618     * allowed number of disk streams.
2619     */
2620    String LSCPServer::GetGlobalMaxStreams() {
2621        dmsg(2,("LSCPServer: GetGlobalMaxStreams()\n"));
2622        LSCPResultSet result;
2623        result.Add(GLOBAL_MAX_STREAMS);
2624        return result.Produce();
2625    }
2626    
2627    /**
2628     * Will be called by the parser to set the sampler global maximum number of
2629     * disk streams.
2630     */
2631    String LSCPServer::SetGlobalMaxStreams(int iStreams) {
2632        dmsg(2,("LSCPServer: SetGlobalMaxStreams(%d)\n", iStreams));
2633        LSCPResultSet result;
2634        try {
2635            if (iStreams < 0) throw Exception("Maximum disk streams may not be negative");
2636            GLOBAL_MAX_STREAMS = iStreams; // see common/global_private.cpp
2637            const std::set<Engine*>& engines = EngineFactory::EngineInstances();
2638            if (engines.size() > 0) {
2639                std::set<Engine*>::iterator iter = engines.begin();
2640                std::set<Engine*>::iterator end  = engines.end();
2641                for (; iter != end; ++iter) {
2642                    (*iter)->SetMaxDiskStreams(iStreams);
2643                }
2644            }
2645            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "STREAMS", GLOBAL_MAX_STREAMS));
2646        } catch (Exception e) {
2647            result.Error(e);
2648        }
2649      return result.Produce();      return result.Produce();
2650  }  }
2651    
# Line 2376  String LSCPServer::SetGlobalVolume(doubl Line 2659  String LSCPServer::SetGlobalVolume(doubl
2659      LSCPResultSet result;      LSCPResultSet result;
2660      try {      try {
2661          if (dVolume < 0) throw Exception("Volume may not be negative");          if (dVolume < 0) throw Exception("Volume may not be negative");
2662          GLOBAL_VOLUME = dVolume; // see common/global.cpp          GLOBAL_VOLUME = dVolume; // see common/global_private.cpp
2663          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "VOLUME", GLOBAL_VOLUME));          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "VOLUME", GLOBAL_VOLUME));
2664      } catch (Exception e) {      } catch (Exception e) {
2665          result.Error(e);          result.Error(e);
# Line 2503  String LSCPServer::GetFileInstrumentInfo Line 2786  String LSCPServer::GetFileInstrumentInfo
2786                  result.Add("FORMAT_VERSION", info.FormatVersion);                  result.Add("FORMAT_VERSION", info.FormatVersion);
2787                  result.Add("PRODUCT", info.Product);                  result.Add("PRODUCT", info.Product);
2788                  result.Add("ARTISTS", info.Artists);                  result.Add("ARTISTS", info.Artists);
2789    
2790                    std::stringstream ss;
2791                    bool b = false;
2792                    for (int i = 0; i < 128; i++) {
2793                        if (info.KeyBindings[i]) {
2794                            if (b) ss << ',';
2795                            ss << i; b = true;
2796                        }
2797                    }
2798                    result.Add("KEY_BINDINGS", ss.str());
2799    
2800                    b = false;
2801                    std::stringstream ss2;
2802                    for (int i = 0; i < 128; i++) {
2803                        if (info.KeySwitchBindings[i]) {
2804                            if (b) ss2 << ',';
2805                            ss2 << i; b = true;
2806                        }
2807                    }
2808                    result.Add("KEYSWITCH_BINDINGS", ss2.str());
2809                  // no more need to ask other engine types                  // no more need to ask other engine types
2810                  bFound = true;                  bFound = true;
2811              } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));              } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
# Line 2529  void LSCPServer::VerifyFile(String Filen Line 2832  void LSCPServer::VerifyFile(String Filen
2832      if ( win32FileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) {      if ( win32FileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) {
2833          throw Exception("Directory is specified");          throw Exception("Directory is specified");
2834      }      }
2835      #else          #else
2836      struct stat statBuf;      File f(Filename);
2837      int res = stat(Filename.c_str(), &statBuf);      if(!f.Exist()) throw Exception(f.GetErrorMsg());
2838      if (res) {      if (f.IsDirectory()) throw Exception("Directory is specified");
         std::stringstream ss;  
         ss << "Fail to stat `" << Filename << "`: " << strerror(errno);  
         throw Exception(ss.str());  
     }  
   
     if (S_ISDIR(statBuf.st_mode)) {  
         throw Exception("Directory is specified");  
     }  
2839      #endif      #endif
2840  }  }
2841    
# Line 2735  String LSCPServer::AddDbInstruments(Stri Line 3030  String LSCPServer::AddDbInstruments(Stri
3030      return result.Produce();      return result.Produce();
3031  }  }
3032    
3033  String LSCPServer::AddDbInstruments(String ScanMode, String DbDir, String FsDir, bool bBackground) {  String LSCPServer::AddDbInstruments(String ScanMode, String DbDir, String FsDir, bool bBackground, bool insDir) {
3034      dmsg(2,("LSCPServer: AddDbInstruments(ScanMode=%s,DbDir=%s,FsDir=%s,bBackground=%d)\n", ScanMode.c_str(), DbDir.c_str(), FsDir.c_str(), bBackground));      dmsg(2,("LSCPServer: AddDbInstruments(ScanMode=%s,DbDir=%s,FsDir=%s,bBackground=%d,insDir=%d)\n", ScanMode.c_str(), DbDir.c_str(), FsDir.c_str(), bBackground, insDir));
3035      LSCPResultSet result;      LSCPResultSet result;
3036  #if HAVE_SQLITE3  #if HAVE_SQLITE3
3037      try {      try {
3038          int id;          int id;
3039          InstrumentsDb* db = InstrumentsDb::GetInstrumentsDb();          InstrumentsDb* db = InstrumentsDb::GetInstrumentsDb();
3040          if (ScanMode.compare("RECURSIVE") == 0) {          if (ScanMode.compare("RECURSIVE") == 0) {
3041             id = db->AddInstruments(RECURSIVE, DbDir, FsDir, bBackground);              id = db->AddInstruments(RECURSIVE, DbDir, FsDir, bBackground, insDir);
3042          } else if (ScanMode.compare("NON_RECURSIVE") == 0) {          } else if (ScanMode.compare("NON_RECURSIVE") == 0) {
3043             id = db->AddInstruments(NON_RECURSIVE, DbDir, FsDir, bBackground);              id = db->AddInstruments(NON_RECURSIVE, DbDir, FsDir, bBackground, insDir);
3044          } else if (ScanMode.compare("FLAT") == 0) {          } else if (ScanMode.compare("FLAT") == 0) {
3045             id = db->AddInstruments(FLAT, DbDir, FsDir, bBackground);              id = db->AddInstruments(FLAT, DbDir, FsDir, bBackground, insDir);
3046          } else {          } else {
3047              throw Exception("Unknown scan mode: " + ScanMode);              throw Exception("Unknown scan mode: " + ScanMode);
3048          }          }
# Line 2923  String LSCPServer::SetDbInstrumentDescri Line 3218  String LSCPServer::SetDbInstrumentDescri
3218      return result.Produce();      return result.Produce();
3219  }  }
3220    
3221    String LSCPServer::SetDbInstrumentFilePath(String OldPath, String NewPath) {
3222        dmsg(2,("LSCPServer: SetDbInstrumentFilePath(OldPath=%s,NewPath=%s)\n", OldPath.c_str(), NewPath.c_str()));
3223        LSCPResultSet result;
3224    #if HAVE_SQLITE3
3225        try {
3226            InstrumentsDb::GetInstrumentsDb()->SetInstrumentFilePath(OldPath, NewPath);
3227        } catch (Exception e) {
3228             result.Error(e);
3229        }
3230    #else
3231        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
3232    #endif
3233        return result.Produce();
3234    }
3235    
3236    String LSCPServer::FindLostDbInstrumentFiles() {
3237        dmsg(2,("LSCPServer: FindLostDbInstrumentFiles()\n"));
3238        LSCPResultSet result;
3239    #if HAVE_SQLITE3
3240        try {
3241            String list;
3242            StringListPtr pLostFiles = InstrumentsDb::GetInstrumentsDb()->FindLostInstrumentFiles();
3243    
3244            for (int i = 0; i < pLostFiles->size(); i++) {
3245                if (list != "") list += ",";
3246                list += "'" + pLostFiles->at(i) + "'";
3247            }
3248    
3249            result.Add(list);
3250        } catch (Exception e) {
3251             result.Error(e);
3252        }
3253    #else
3254        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
3255    #endif
3256        return result.Produce();
3257    }
3258    
3259  String LSCPServer::FindDbInstrumentDirectories(String Dir, std::map<String,String> Parameters, bool Recursive) {  String LSCPServer::FindDbInstrumentDirectories(String Dir, std::map<String,String> Parameters, bool Recursive) {
3260      dmsg(2,("LSCPServer: FindDbInstrumentDirectories(Dir=%s)\n", Dir.c_str()));      dmsg(2,("LSCPServer: FindDbInstrumentDirectories(Dir=%s)\n", Dir.c_str()));
3261      LSCPResultSet result;      LSCPResultSet result;
# Line 3053  String LSCPServer::SetEcho(yyparse_param Line 3386  String LSCPServer::SetEcho(yyparse_param
3386      }      }
3387      return result.Produce();      return result.Produce();
3388  }  }
3389    
3390    }
Legend:
Removed from v.1537  
changed lines
  Added in v.1850
  ViewVC Help
Powered by ViewVC