/[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 219 by schoenebeck, Tue Aug 17 20:35:04 2004 UTC revision 556 by schoenebeck, Sat May 21 01:10:12 2005 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 Christian Schoenebeck                              *
7   *                                                                         *   *                                                                         *
8   *   This program 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  *
10   *   the Free Software Foundation; either version 2 of the License, or     *   *   the Free Software Foundation; either version 2 of the License, or     *
11   *   (at your option) any later version.                                   *   *   (at your option) any later version.                                   *
12   *                                                                         *   *                                                                         *
13   *   This program is distributed in the hope that it will be useful,       *   *   This library is distributed in the hope that it will be useful,       *
14   *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *   *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
15   *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *   *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
16   *   GNU General Public License for more details.                          *   *   GNU General Public License for more details.                          *
17   *                                                                         *   *                                                                         *
18   *   You should have received a copy of the GNU General Public License     *   *   You should have received a copy of the GNU General Public License     *
19   *   along with this program; if not, write to the Free Software           *   *   along with this library; if not, write to the Free Software           *
20   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston,                 *   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston,                 *
21   *   MA  02111-1307  USA                                                   *   *   MA  02111-1307  USA                                                   *
22   ***************************************************************************/   ***************************************************************************/
# Line 23  Line 24 
24  #include "lscpserver.h"  #include "lscpserver.h"
25  #include "lscpresultset.h"  #include "lscpresultset.h"
26  #include "lscpevent.h"  #include "lscpevent.h"
27    //#include "../common/global.h"
28    
29  #include "../engines/gig/Engine.h"  #include <fcntl.h>
30    
31    #if HAVE_SQLITE3
32    # include "sqlite3.h"
33    #endif
34    
35    #include "../engines/EngineFactory.h"
36  #include "../drivers/audio/AudioOutputDeviceFactory.h"  #include "../drivers/audio/AudioOutputDeviceFactory.h"
37  #include "../drivers/midi/MidiInputDeviceFactory.h"  #include "../drivers/midi/MidiInputDeviceFactory.h"
38    
# Line 50  std::map< LSCPEvent::event_t, std::list< Line 58  std::map< LSCPEvent::event_t, std::list<
58  Mutex LSCPServer::NotifyMutex = Mutex();  Mutex LSCPServer::NotifyMutex = Mutex();
59  Mutex LSCPServer::NotifyBufferMutex = Mutex();  Mutex LSCPServer::NotifyBufferMutex = Mutex();
60  Mutex LSCPServer::SubscriptionMutex = Mutex();  Mutex LSCPServer::SubscriptionMutex = Mutex();
61    Mutex LSCPServer::RTNotifyMutex = Mutex();
62    
63  LSCPServer::LSCPServer(Sampler* pSampler) : Thread(false, 0, -4) {  LSCPServer::LSCPServer(Sampler* pSampler) : Thread(true, false, 0, -4) {
64      this->pSampler = pSampler;      this->pSampler = pSampler;
65      LSCPEvent::RegisterEvent(LSCPEvent::event_channels, "CHANNELS");      LSCPEvent::RegisterEvent(LSCPEvent::event_channel_count, "CHANNEL_COUNT");
66      LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT");
67      LSCPEvent::RegisterEvent(LSCPEvent::event_stream_count, "STREAM_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_stream_count, "STREAM_COUNT");
68      LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL");      LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL");
69      LSCPEvent::RegisterEvent(LSCPEvent::event_info, "INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_channel_info, "CHANNEL_INFO");
70      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
71        hSocket = -1;
72    }
73    
74    LSCPServer::~LSCPServer() {
75        if (hSocket >= 0) close(hSocket);
76  }  }
77    
78  /**  /**
# Line 76  int LSCPServer::WaitUntilInitialized(lon Line 90  int LSCPServer::WaitUntilInitialized(lon
90  }  }
91    
92  int LSCPServer::Main() {  int LSCPServer::Main() {
93      int hSocket = socket(AF_INET, SOCK_STREAM, 0);      hSocket = socket(AF_INET, SOCK_STREAM, 0);
94      if (hSocket < 0) {      if (hSocket < 0) {
95          std::cerr << "LSCPServer: Could not create server socket." << std::endl;          std::cerr << "LSCPServer: Could not create server socket." << std::endl;
96          //return -1;          //return -1;
# Line 88  int LSCPServer::Main() { Line 102  int LSCPServer::Main() {
102      SocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);      SocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);
103    
104      if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {      if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
105          std::cerr << "LSCPServer: Could not bind server socket." << std::endl;          std::cerr << "LSCPServer: Could not bind server socket, retrying for " << ToString(LSCP_SERVER_BIND_TIMEOUT) << " seconds...";
106          close(hSocket);          for (int trial = 0; true; trial++) { // retry for LSCP_SERVER_BIND_TIMEOUT seconds
107          //return -1;              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
108          exit(EXIT_FAILURE);                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {
109                        std::cerr << "gave up!" << std::endl;
110                        close(hSocket);
111                        //return -1;
112                        exit(EXIT_FAILURE);
113                    }
114                    else sleep(1); // sleep 1s
115                }
116                else break; // success
117            }
118      }      }
119    
120      listen(hSocket, 1);      listen(hSocket, 1);
# Line 150  int LSCPServer::Main() { Line 173  int LSCPServer::Main() {
173                                  int dummy; // just a temporary hack to fulfill the restart() function prototype                                  int dummy; // just a temporary hack to fulfill the restart() function prototype
174                                  restart(NULL, dummy); // restart the 'scanner'                                  restart(NULL, dummy); // restart the 'scanner'
175                                  currentSocket = (*iter).hSession;  //a hack                                  currentSocket = (*iter).hSession;  //a hack
176                                    dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));
177                                  if ((*iter).bVerbose) { // if echo mode enabled                                  if ((*iter).bVerbose) { // if echo mode enabled
178                                      AnswerClient(bufferedCommands[currentSocket]);                                      AnswerClient(bufferedCommands[currentSocket]);
179                                  }                                  }
# Line 194  void LSCPServer::CloseConnection( std::v Line 218  void LSCPServer::CloseConnection( std::v
218          NotifyMutex.Unlock();          NotifyMutex.Unlock();
219  }  }
220    
221    int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {
222            int subs = 0;
223            SubscriptionMutex.Lock();
224            for( std::list<LSCPEvent::event_t>::iterator iter = events.begin();
225                            iter != events.end(); iter++)
226            {
227                    subs += eventSubscriptions.count(*iter);
228            }
229            SubscriptionMutex.Unlock();
230            return subs;
231    }
232    
233  void LSCPServer::SendLSCPNotify( LSCPEvent event ) {  void LSCPServer::SendLSCPNotify( LSCPEvent event ) {
234          SubscriptionMutex.Lock();          SubscriptionMutex.Lock();
235          if (eventSubscriptions.count(event.GetType()) == 0) {          if (eventSubscriptions.count(event.GetType()) == 0) {
# Line 390  String LSCPServer::DestroyAudioOutputDev Line 426  String LSCPServer::DestroyAudioOutputDev
426      LSCPResultSet result;      LSCPResultSet result;
427      try {      try {
428          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
429          if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");          if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
430          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
431          pSampler->DestroyAudioOutputDevice(pDevice);          pSampler->DestroyAudioOutputDevice(pDevice);
432      }      }
# Line 405  String LSCPServer::DestroyMidiInputDevic Line 441  String LSCPServer::DestroyMidiInputDevic
441      LSCPResultSet result;      LSCPResultSet result;
442      try {      try {
443          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
444            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
445          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
         if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");  
446          pSampler->DestroyMidiInputDevice(pDevice);          pSampler->DestroyMidiInputDevice(pDevice);
447      }      }
448      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 423  String LSCPServer::LoadInstrument(String Line 459  String LSCPServer::LoadInstrument(String
459      LSCPResultSet result;      LSCPResultSet result;
460      try {      try {
461          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
462          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
463          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
464          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel yet");
465          if (pSamplerChannel->GetAudioOutputDevice() == NULL)          if (!pSamplerChannel->GetAudioOutputDevice())
466              throw LinuxSamplerException("No audio output device on channel");              throw LinuxSamplerException("No audio output device connected to sampler channel");
467          if (bBackground) {          if (bBackground) {
468              LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument);              InstrumentLoader.StartNewLoad(Filename, uiInstrument, pEngineChannel);
469              pLoadInstrument->StartThread();          }
470            else {
471                // tell the engine channel which instrument to load
472                pEngineChannel->PrepareLoadInstrument(Filename.c_str(), uiInstrument);
473                // actually start to load the instrument (blocks until completed)
474                pEngineChannel->LoadInstrument();
475          }          }
         else pEngine->LoadInstrument(Filename.c_str(), uiInstrument);  
476      }      }
477      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
478           result.Error(e);           result.Error(e);
# Line 441  String LSCPServer::LoadInstrument(String Line 481  String LSCPServer::LoadInstrument(String
481  }  }
482    
483  /**  /**
484   * Will be called by the parser to load and deploy an engine.   * Will be called by the parser to assign a sampler engine type to a
485     * sampler channel.
486   */   */
487  String LSCPServer::LoadEngine(String EngineName, uint uiSamplerChannel) {  String LSCPServer::SetEngineType(String EngineName, uint uiSamplerChannel) {
488      dmsg(2,("LSCPServer: LoadEngine(EngineName=%s,SamplerChannel=%d)\n", EngineName.c_str(), uiSamplerChannel));      dmsg(2,("LSCPServer: LoadEngine(EngineName=%s,SamplerChannel=%d)\n", EngineName.c_str(), uiSamplerChannel));
489      LSCPResultSet result;      LSCPResultSet result;
490      try {      try {
         Engine::type_t type;  
         if ((EngineName == "GigEngine") || (EngineName == "gig")) type = Engine::type_gig;  
         else throw LinuxSamplerException("Unknown engine type");  
491          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
492          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
493          pSamplerChannel->LoadEngine(type);          LockRTNotify();
494            pSamplerChannel->SetEngineType(EngineName);
495            UnlockRTNotify();
496      }      }
497      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
498           result.Error(e);           result.Error(e);
# Line 503  String LSCPServer::AddChannel() { Line 543  String LSCPServer::AddChannel() {
543  String LSCPServer::RemoveChannel(uint uiSamplerChannel) {  String LSCPServer::RemoveChannel(uint uiSamplerChannel) {
544      dmsg(2,("LSCPServer: RemoveChannel(SamplerChannel=%d)\n", uiSamplerChannel));      dmsg(2,("LSCPServer: RemoveChannel(SamplerChannel=%d)\n", uiSamplerChannel));
545      LSCPResultSet result;      LSCPResultSet result;
546        LockRTNotify();
547      pSampler->RemoveSamplerChannel(uiSamplerChannel);      pSampler->RemoveSamplerChannel(uiSamplerChannel);
548        UnlockRTNotify();
549      return result.Produce();      return result.Produce();
550  }  }
551    
552  /**  /**
553   * Will be called by the parser to get all available engines.   * Will be called by the parser to get the amount of all available engines.
554   */   */
555  String LSCPServer::GetAvailableEngines() {  String LSCPServer::GetAvailableEngines() {
556      dmsg(2,("LSCPServer: GetAvailableEngines()\n"));      dmsg(2,("LSCPServer: GetAvailableEngines()\n"));
557      LSCPResultSet result("GigEngine");      LSCPResultSet result("1");
558      return result.Produce();      return result.Produce();
559  }  }
560    
561  /**  /**
562   * Will be called by the parser to get descriptions for a particular engine.   * Will be called by the parser to get a list of all available engines.
563     */
564    String LSCPServer::ListAvailableEngines() {
565        dmsg(2,("LSCPServer: ListAvailableEngines()\n"));
566        LSCPResultSet result("\'GIG\'");
567        return result.Produce();
568    }
569    
570    /**
571     * Will be called by the parser to get descriptions for a particular
572     * sampler engine.
573   */   */
574  String LSCPServer::GetEngineInfo(String EngineName) {  String LSCPServer::GetEngineInfo(String EngineName) {
575      dmsg(2,("LSCPServer: GetEngineInfo(EngineName=%s)\n", EngineName.c_str()));      dmsg(2,("LSCPServer: GetEngineInfo(EngineName=%s)\n", EngineName.c_str()));
576      LSCPResultSet result;      LSCPResultSet result;
577      try {      try {
578          if ((EngineName == "GigEngine") || (EngineName == "gig")) {          Engine* pEngine = EngineFactory::Create(EngineName);
579              Engine* pEngine = new LinuxSampler::gig::Engine;          result.Add("DESCRIPTION", pEngine->Description());
580              result.Add(pEngine->Description());          result.Add("VERSION",     pEngine->Version());
581              result.Add(pEngine->Version());          delete pEngine;
             delete pEngine;  
         }  
         else throw LinuxSamplerException("Unknown engine type");  
582      }      }
583      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
584           result.Error(e);           result.Error(e);
# Line 546  String LSCPServer::GetChannelInfo(uint u Line 595  String LSCPServer::GetChannelInfo(uint u
595      LSCPResultSet result;      LSCPResultSet result;
596      try {      try {
597          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
598          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
599          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
600    
601          //Defaults values          //Defaults values
602          String EngineName = "NONE";          String EngineName = "NONE";
603          float Volume = 0;          float Volume = 0.0f;
604          String InstrumentFileName = "NONE";          String InstrumentFileName = "NONE";
605            String InstrumentName = "NONE";
606          int InstrumentIndex = -1;          int InstrumentIndex = -1;
607          int InstrumentStatus = -1;          int InstrumentStatus = -1;
608            int AudioOutputChannels = 0;
609            String AudioRouting;
610    
611          if (pEngine) {          if (pEngineChannel) {
612              EngineName =  pEngine->EngineName();              EngineName          = pEngineChannel->EngineName();
613              Volume = pEngine->Volume();              AudioOutputChannels = pEngineChannel->Channels();
614              InstrumentStatus = pEngine->InstrumentStatus();              Volume              = pEngineChannel->Volume();
615              InstrumentIndex = pEngine->InstrumentIndex();              InstrumentStatus    = pEngineChannel->InstrumentStatus();
616              if (InstrumentIndex != -1)              InstrumentIndex     = pEngineChannel->InstrumentIndex();
617                  InstrumentFileName = pEngine->InstrumentFileName();              if (InstrumentIndex != -1) {
618                    InstrumentFileName = pEngineChannel->InstrumentFileName();
619                    InstrumentName     = pEngineChannel->InstrumentName();
620                }
621                for (int chan = 0; chan < pEngineChannel->Channels(); chan++) {
622                    if (AudioRouting != "") AudioRouting += ",";
623                    AudioRouting += ToString(pEngineChannel->OutputChannel(chan));
624                }
625          }          }
626    
627          result.Add("ENGINE_NAME", EngineName);          result.Add("ENGINE_NAME", EngineName);
# Line 570  String LSCPServer::GetChannelInfo(uint u Line 629  String LSCPServer::GetChannelInfo(uint u
629    
630          //Some not-so-hardcoded stuff to make GUI look good          //Some not-so-hardcoded stuff to make GUI look good
631          result.Add("AUDIO_OUTPUT_DEVICE", GetAudioOutputDeviceIndex(pSamplerChannel->GetAudioOutputDevice()));          result.Add("AUDIO_OUTPUT_DEVICE", GetAudioOutputDeviceIndex(pSamplerChannel->GetAudioOutputDevice()));
632          result.Add("AUDIO_OUTPUT_CHANNELS", "2");          result.Add("AUDIO_OUTPUT_CHANNELS", AudioOutputChannels);
633          result.Add("AUDIO_OUTPUT_ROUTING", "0,1");          result.Add("AUDIO_OUTPUT_ROUTING", AudioRouting);
634    
635          result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice()));          result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice()));
636          result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());          result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());
637          result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());          if (pSamplerChannel->GetMidiInputChannel() == MidiInputPort::midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");
638            else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
639    
640          result.Add("INSTRUMENT_FILE", InstrumentFileName);          result.Add("INSTRUMENT_FILE", InstrumentFileName);
641          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
642            result.Add("INSTRUMENT_NAME", InstrumentName);
643          result.Add("INSTRUMENT_STATUS", InstrumentStatus);          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
644      }      }
645      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 596  String LSCPServer::GetVoiceCount(uint ui Line 657  String LSCPServer::GetVoiceCount(uint ui
657      LSCPResultSet result;      LSCPResultSet result;
658      try {      try {
659          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
660          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
661          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
662          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine loaded on sampler channel");
663          result.Add(pEngine->VoiceCount());          result.Add(pEngineChannel->GetEngine()->VoiceCount());
664      }      }
665      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
666           result.Error(e);           result.Error(e);
# Line 616  String LSCPServer::GetStreamCount(uint u Line 677  String LSCPServer::GetStreamCount(uint u
677      LSCPResultSet result;      LSCPResultSet result;
678      try {      try {
679          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
680          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
681          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
682          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
683          result.Add(pEngine->DiskStreamCount());          result.Add(pEngineChannel->GetEngine()->DiskStreamCount());
684      }      }
685      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
686           result.Error(e);           result.Error(e);
# Line 636  String LSCPServer::GetBufferFill(fill_re Line 697  String LSCPServer::GetBufferFill(fill_re
697      LSCPResultSet result;      LSCPResultSet result;
698      try {      try {
699          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
700          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
701          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
702          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
703          if (!pEngine->DiskStreamSupported())          if (!pEngineChannel->GetEngine()->DiskStreamSupported()) result.Add("NA");
             result.Add("NA");  
704          else {          else {
705              switch (ResponseType) {              switch (ResponseType) {
706                  case fill_response_bytes:                  case fill_response_bytes:
707                      result.Add(pEngine->DiskStreamBufferFillBytes());                      result.Add(pEngineChannel->GetEngine()->DiskStreamBufferFillBytes());
708                      break;                      break;
709                  case fill_response_percentage:                  case fill_response_percentage:
710                      result.Add(pEngine->DiskStreamBufferFillPercentage());                      result.Add(pEngineChannel->GetEngine()->DiskStreamBufferFillPercentage());
711                      break;                      break;
712                  default:                  default:
713                      throw LinuxSamplerException("Unknown fill response type");                      throw LinuxSamplerException("Unknown fill response type");
714              }              }
# Line 664  String LSCPServer::GetAvailableAudioOutp Line 724  String LSCPServer::GetAvailableAudioOutp
724      dmsg(2,("LSCPServer: GetAvailableAudioOutputDrivers()\n"));      dmsg(2,("LSCPServer: GetAvailableAudioOutputDrivers()\n"));
725      LSCPResultSet result;      LSCPResultSet result;
726      try {      try {
727            int n = AudioOutputDeviceFactory::AvailableDrivers().size();
728            result.Add(n);
729        }
730        catch (LinuxSamplerException e) {
731            result.Error(e);
732        }
733        return result.Produce();
734    }
735    
736    String LSCPServer::ListAvailableAudioOutputDrivers() {
737        dmsg(2,("LSCPServer: ListAvailableAudioOutputDrivers()\n"));
738        LSCPResultSet result;
739        try {
740          String s = AudioOutputDeviceFactory::AvailableDriversAsString();          String s = AudioOutputDeviceFactory::AvailableDriversAsString();
741          result.Add(s);          result.Add(s);
742      }      }
# Line 677  String LSCPServer::GetAvailableMidiInput Line 750  String LSCPServer::GetAvailableMidiInput
750      dmsg(2,("LSCPServer: GetAvailableMidiInputDrivers()\n"));      dmsg(2,("LSCPServer: GetAvailableMidiInputDrivers()\n"));
751      LSCPResultSet result;      LSCPResultSet result;
752      try {      try {
753            int n = MidiInputDeviceFactory::AvailableDrivers().size();
754            result.Add(n);
755        }
756        catch (LinuxSamplerException e) {
757            result.Error(e);
758        }
759        return result.Produce();
760    }
761    
762    String LSCPServer::ListAvailableMidiInputDrivers() {
763        dmsg(2,("LSCPServer: ListAvailableMidiInputDrivers()\n"));
764        LSCPResultSet result;
765        try {
766          String s = MidiInputDeviceFactory::AvailableDriversAsString();          String s = MidiInputDeviceFactory::AvailableDriversAsString();
767          result.Add(s);          result.Add(s);
768      }      }
# Line 735  String LSCPServer::GetAudioOutputDriverI Line 821  String LSCPServer::GetAudioOutputDriverI
821  }  }
822    
823  String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {  String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
824      dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str()));      dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s,DependencyListSize=%d)\n",Driver.c_str(),Parameter.c_str(),DependencyList.size()));
825      LSCPResultSet result;      LSCPResultSet result;
826      try {      try {
827          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);
828          result.Add("TYPE",         pParameter->Type());          result.Add("TYPE",         pParameter->Type());
829          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
830          result.Add("MANDATORY",    (pParameter->Mandatory())    ? "true" : "false");          result.Add("MANDATORY",    pParameter->Mandatory());
831          result.Add("FIX",          (pParameter->Fix())          ? "true" : "false");          result.Add("FIX",          pParameter->Fix());
832          result.Add("MULTIPLICITY", (pParameter->Multiplicity()) ? "true" : "false");          result.Add("MULTIPLICITY", pParameter->Multiplicity());
833          if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());          optional<String> oDepends       = pParameter->Depends();
834          if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());          optional<String> oDefault       = pParameter->Default(DependencyList);
835          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());          optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
836          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());          optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
837          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());          optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
838            if (oDepends)       result.Add("DEPENDS",       *oDepends);
839            if (oDefault)       result.Add("DEFAULT",       *oDefault);
840            if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
841            if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
842            if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
843      }      }
844      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
845          result.Error(e);          result.Error(e);
# Line 757  String LSCPServer::GetMidiInputDriverPar Line 848  String LSCPServer::GetMidiInputDriverPar
848  }  }
849    
850  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
851      dmsg(2,("LSCPServer: GetAudioOutputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str()));      dmsg(2,("LSCPServer: GetAudioOutputDriverParameterInfo(Driver=%s,Parameter=%s,DependencyListSize=%d)\n",Driver.c_str(),Parameter.c_str(),DependencyList.size()));
852      LSCPResultSet result;      LSCPResultSet result;
853      try {      try {
854          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);
855          result.Add("TYPE",         pParameter->Type());          result.Add("TYPE",         pParameter->Type());
856          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
857          result.Add("MANDATORY",    (pParameter->Mandatory())    ? "true" : "false");          result.Add("MANDATORY",    pParameter->Mandatory());
858          result.Add("FIX",          (pParameter->Fix())          ? "true" : "false");          result.Add("FIX",          pParameter->Fix());
859          result.Add("MULTIPLICITY", (pParameter->Multiplicity()) ? "true" : "false");          result.Add("MULTIPLICITY", pParameter->Multiplicity());
860          if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());          optional<String> oDepends       = pParameter->Depends();
861          if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());          optional<String> oDefault       = pParameter->Default(DependencyList);
862          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());          optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
863          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());          optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
864          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());          optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
865            if (oDepends)       result.Add("DEPENDS",       *oDepends);
866            if (oDefault)       result.Add("DEFAULT",       *oDefault);
867            if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
868            if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
869            if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
870      }      }
871      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
872          result.Error(e);          result.Error(e);
# Line 847  String LSCPServer::GetAudioOutputDeviceI Line 943  String LSCPServer::GetAudioOutputDeviceI
943      LSCPResultSet result;      LSCPResultSet result;
944      try {      try {
945          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
946          if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");          if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
947          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
948          result.Add("driver", pDevice->Driver());          result.Add("DRIVER", pDevice->Driver());
949          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
950          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
951          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 867  String LSCPServer::GetMidiInputDeviceInf Line 963  String LSCPServer::GetMidiInputDeviceInf
963      LSCPResultSet result;      LSCPResultSet result;
964      try {      try {
965          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
966            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
967          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
968          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");          result.Add("DRIVER", pDevice->Driver());
         result.Add("driver", pDevice->Driver());  
969          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
970          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();
971          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
# Line 885  String LSCPServer::GetMidiInputPortInfo( Line 981  String LSCPServer::GetMidiInputPortInfo(
981      dmsg(2,("LSCPServer: GetMidiInputPortInfo(DeviceIndex=%d, PortIndex=%d)\n",DeviceIndex, PortIndex));      dmsg(2,("LSCPServer: GetMidiInputPortInfo(DeviceIndex=%d, PortIndex=%d)\n",DeviceIndex, PortIndex));
982      LSCPResultSet result;      LSCPResultSet result;
983      try {      try {
984            // get MIDI input device
985          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
986            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
987          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
988          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");  
989          MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);          // get MIDI port
990          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");          MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
991          std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
992          std::map<String,DeviceCreationParameter*>::iterator iter = parameters.begin();  
993            // return the values of all MIDI port parameters
994            std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
995            std::map<String,DeviceRuntimeParameter*>::iterator iter = parameters.begin();
996          for (; iter != parameters.end(); iter++) {          for (; iter != parameters.end(); iter++) {
997              result.Add(iter->first, iter->second->Value());              result.Add(iter->first, iter->second->Value());
998          }          }
# Line 908  String LSCPServer::GetAudioOutputChannel Line 1009  String LSCPServer::GetAudioOutputChannel
1009      try {      try {
1010          // get audio output device          // get audio output device
1011          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1012          if (!devices[DeviceId]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceId) + ".");          if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceId) + ".");
1013          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
1014    
1015          // get audio channel          // get audio channel
1016          AudioChannel* pChannel = pDevice->Channel(ChannelId);          AudioChannel* pChannel = pDevice->Channel(ChannelId);
1017          if (!pChannel) throw LinuxSamplerException("Audio ouotput device does not have channel " + ToString(ChannelId) + ".");          if (!pChannel) throw LinuxSamplerException("Audio output device does not have audio channel " + ToString(ChannelId) + ".");
1018    
1019          // return the values of all audio channel parameters          // return the values of all audio channel parameters
1020          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
# Line 932  String LSCPServer::GetMidiInputPortParam Line 1033  String LSCPServer::GetMidiInputPortParam
1033      dmsg(2,("LSCPServer: GetMidiInputPortParameterInfo(DeviceId=%d,PortId=%d,ParameterName=%s)\n",DeviceId,PortId,ParameterName.c_str()));      dmsg(2,("LSCPServer: GetMidiInputPortParameterInfo(DeviceId=%d,PortId=%d,ParameterName=%s)\n",DeviceId,PortId,ParameterName.c_str()));
1034      LSCPResultSet result;      LSCPResultSet result;
1035      try {      try {
1036          // get audio output device          // get MIDI input device
1037          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1038          if (!devices[DeviceId]) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");          if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceId) + ".");
1039          MidiInputDevice* pDevice = devices[DeviceId];          MidiInputDevice* pDevice = devices[DeviceId];
1040    
1041          // get midi port          // get midi port
1042          MidiInputDevice::MidiInputPort* pPort = pDevice->GetPort(PortId);          MidiInputPort* pPort = pDevice->GetPort(PortId);
1043          if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");          if (!pPort) throw LinuxSamplerException("Midi input device does not have port " + ToString(PortId) + ".");
1044    
1045          // get desired port parameter          // get desired port parameter
1046          std::map<String,DeviceCreationParameter*> parameters = pPort->DeviceParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pPort->PortParameters();
1047          if (!parameters[ParameterName]) throw LinuxSamplerException("Midi port does not provice a parameters '" + ParameterName + "'.");          if (!parameters.count(ParameterName)) throw LinuxSamplerException("Midi port does not provide a parameter '" + ParameterName + "'.");
1048          DeviceCreationParameter* pParameter = parameters[ParameterName];          DeviceRuntimeParameter* pParameter = parameters[ParameterName];
1049    
1050          // return all fields of this audio channel parameter          // return all fields of this audio channel parameter
1051          result.Add("TYPE",         pParameter->Type());          result.Add("TYPE",         pParameter->Type());
1052          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
1053          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
1054          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
1055          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
1056          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
1057          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
1058      }      }
1059      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1060          result.Error(e);          result.Error(e);
# Line 967  String LSCPServer::GetAudioOutputChannel Line 1068  String LSCPServer::GetAudioOutputChannel
1068      try {      try {
1069          // get audio output device          // get audio output device
1070          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1071          if (!devices[DeviceId]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceId) + ".");          if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceId) + ".");
1072          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
1073    
1074          // get audio channel          // get audio channel
1075          AudioChannel* pChannel = pDevice->Channel(ChannelId);          AudioChannel* pChannel = pDevice->Channel(ChannelId);
1076          if (!pChannel) throw LinuxSamplerException("Audio output device does not have channel " + ToString(ChannelId) + ".");          if (!pChannel) throw LinuxSamplerException("Audio output device does not have audio channel " + ToString(ChannelId) + ".");
1077    
1078          // get desired audio channel parameter          // get desired audio channel parameter
1079          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
1080          if (!parameters[ParameterName]) throw LinuxSamplerException("Audio channel does not provide a parameter '" + ParameterName + "'.");          if (!parameters.count(ParameterName)) throw LinuxSamplerException("Audio channel does not provide a parameter '" + ParameterName + "'.");
1081          DeviceRuntimeParameter* pParameter = parameters[ParameterName];          DeviceRuntimeParameter* pParameter = parameters[ParameterName];
1082    
1083          // return all fields of this audio channel parameter          // return all fields of this audio channel parameter
# Line 984  String LSCPServer::GetAudioOutputChannel Line 1085  String LSCPServer::GetAudioOutputChannel
1085          result.Add("DESCRIPTION",  pParameter->Description());          result.Add("DESCRIPTION",  pParameter->Description());
1086          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
1087          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
1088          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     pParameter->RangeMin());          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
1089          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     pParameter->RangeMax());          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
1090          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities());          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
1091      }      }
1092      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1093          result.Error(e);          result.Error(e);
# Line 1000  String LSCPServer::SetAudioOutputChannel Line 1101  String LSCPServer::SetAudioOutputChannel
1101      try {      try {
1102          // get audio output device          // get audio output device
1103          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1104          if (!devices[DeviceId]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceId) + ".");          if (!devices.count(DeviceId)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceId) + ".");
1105          AudioOutputDevice* pDevice = devices[DeviceId];          AudioOutputDevice* pDevice = devices[DeviceId];
1106    
1107          // get audio channel          // get audio channel
1108          AudioChannel* pChannel = pDevice->Channel(ChannelId);          AudioChannel* pChannel = pDevice->Channel(ChannelId);
1109          if (!pChannel) throw LinuxSamplerException("Audio output device does not have channel " + ToString(ChannelId) + ".");          if (!pChannel) throw LinuxSamplerException("Audio output device does not have audio channel " + ToString(ChannelId) + ".");
1110    
1111          // get desired audio channel parameter          // get desired audio channel parameter
1112          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();          std::map<String,DeviceRuntimeParameter*> parameters = pChannel->ChannelParameters();
1113          if (!parameters[ParamKey]) throw LinuxSamplerException("Audio channel does not provide a parameter '" + ParamKey + "'.");          if (!parameters.count(ParamKey)) throw LinuxSamplerException("Audio channel does not provide a parameter '" + ParamKey + "'.");
1114          DeviceRuntimeParameter* pParameter = parameters[ParamKey];          DeviceRuntimeParameter* pParameter = parameters[ParamKey];
1115    
1116          // set new channel parameter value          // set new channel parameter value
# Line 1026  String LSCPServer::SetAudioOutputDeviceP Line 1127  String LSCPServer::SetAudioOutputDeviceP
1127      LSCPResultSet result;      LSCPResultSet result;
1128      try {      try {
1129          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1130          if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");          if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + ".");
1131          AudioOutputDevice* pDevice = devices[DeviceIndex];          AudioOutputDevice* pDevice = devices[DeviceIndex];
1132          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1133          if (!parameters[ParamKey]) throw LinuxSamplerException("Audio output device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");          if (!parameters.count(ParamKey)) throw LinuxSamplerException("Audio output device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
1134          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1135      }      }
1136      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 1043  String LSCPServer::SetMidiInputDevicePar Line 1144  String LSCPServer::SetMidiInputDevicePar
1144      LSCPResultSet result;      LSCPResultSet result;
1145      try {      try {
1146          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1147          if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");          if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1148          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
1149          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();          std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1150          if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");          if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'");
1151          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1152      }      }
1153      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 1059  String LSCPServer::SetMidiInputPortParam Line 1160  String LSCPServer::SetMidiInputPortParam
1160      dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));      dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str()));
1161      LSCPResultSet result;      LSCPResultSet result;
1162      try {      try {
1163            // get MIDI input device
1164          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint,MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1165            if (!devices.count(DeviceIndex)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");
1166          MidiInputDevice* pDevice = devices[DeviceIndex];          MidiInputDevice* pDevice = devices[DeviceIndex];
1167          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(DeviceIndex) + ".");  
1168          MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);          // get MIDI port
1169          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");          MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex);
1170          std::map<String,DeviceCreationParameter*> parameters = pMidiInputPort->DeviceParameters();          if (!pMidiInputPort) throw LinuxSamplerException("There is no MIDI input port with index " + ToString(PortIndex) + ".");
1171          if (!parameters[ParamKey]) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");  
1172            // set port parameter value
1173            std::map<String,DeviceRuntimeParameter*> parameters = pMidiInputPort->PortParameters();
1174            if (!parameters.count(ParamKey)) throw LinuxSamplerException("MIDI input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'");
1175          parameters[ParamKey]->SetValue(ParamVal);          parameters[ParamKey]->SetValue(ParamVal);
1176      }      }
1177      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 1080  String LSCPServer::SetMidiInputPortParam Line 1186  String LSCPServer::SetMidiInputPortParam
1186   */   */
1187  String LSCPServer::SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel) {
1188      dmsg(2,("LSCPServer: SetAudioOutputChannel(ChannelAudioOutputChannel=%d, AudioOutputDeviceInputChannel=%d, SamplerChannel=%d)\n",ChannelAudioOutputChannel,AudioOutputDeviceInputChannel,uiSamplerChannel));      dmsg(2,("LSCPServer: SetAudioOutputChannel(ChannelAudioOutputChannel=%d, AudioOutputDeviceInputChannel=%d, SamplerChannel=%d)\n",ChannelAudioOutputChannel,AudioOutputDeviceInputChannel,uiSamplerChannel));
1189      return "ERR:0:Not implemented yet.\r\n"; //FIXME: Add support for this in resultset class?      LSCPResultSet result;
1190        try {
1191            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1192            if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1193            EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
1194            if (!pEngineChannel) throw LinuxSamplerException("No engine type yet assigned to sampler channel " + ToString(uiSamplerChannel));
1195            if (!pSamplerChannel->GetAudioOutputDevice()) throw LinuxSamplerException("No audio output device connected to sampler channel " + ToString(uiSamplerChannel));
1196            pEngineChannel->SetOutputChannel(ChannelAudioOutputChannel, AudioOutputDeviceInputChannel);
1197        }
1198        catch (LinuxSamplerException e) {
1199             result.Error(e);
1200        }
1201        return result.Produce();
1202  }  }
1203    
1204  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {
# Line 1088  String LSCPServer::SetAudioOutputDevice( Line 1206  String LSCPServer::SetAudioOutputDevice(
1206      LSCPResultSet result;      LSCPResultSet result;
1207      try {      try {
1208          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1209          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1210          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1211            if (!devices.count(AudioDeviceId)) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));
1212          AudioOutputDevice* pDevice = devices[AudioDeviceId];          AudioOutputDevice* pDevice = devices[AudioDeviceId];
         if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId));  
1213          pSamplerChannel->SetAudioOutputDevice(pDevice);          pSamplerChannel->SetAudioOutputDevice(pDevice);
1214      }      }
1215      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 1105  String LSCPServer::SetAudioOutputType(St Line 1223  String LSCPServer::SetAudioOutputType(St
1223      LSCPResultSet result;      LSCPResultSet result;
1224      try {      try {
1225          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1226          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1227          // Driver type name aliasing...          // Driver type name aliasing...
1228          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";          if (AudioOutputDriver == "Alsa") AudioOutputDriver = "ALSA";
1229          if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";          if (AudioOutputDriver == "Jack") AudioOutputDriver = "JACK";
1230          // Check if there's one audio output device already created          // Check if there's one audio output device already created
1231          // for the intended audio driver type (AudioOutputDriver)...          // for the intended audio driver type (AudioOutputDriver)...
1232          AudioOutputDevice *pDevice = NULL;          AudioOutputDevice *pDevice = NULL;
# Line 1142  String LSCPServer::SetMIDIInputPort(uint Line 1260  String LSCPServer::SetMIDIInputPort(uint
1260      LSCPResultSet result;      LSCPResultSet result;
1261      try {      try {
1262          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1263          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1264          pSamplerChannel->SetMidiInputPort(MIDIPort);          pSamplerChannel->SetMidiInputPort(MIDIPort);
1265      }      }
1266      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 1156  String LSCPServer::SetMIDIInputChannel(u Line 1274  String LSCPServer::SetMIDIInputChannel(u
1274      LSCPResultSet result;      LSCPResultSet result;
1275      try {      try {
1276          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1277          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1278          pSamplerChannel->SetMidiInputChannel((MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);          pSamplerChannel->SetMidiInputChannel((MidiInputPort::midi_chan_t) MIDIChannel);
1279      }      }
1280      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1281           result.Error(e);           result.Error(e);
# Line 1170  String LSCPServer::SetMIDIInputDevice(ui Line 1288  String LSCPServer::SetMIDIInputDevice(ui
1288      LSCPResultSet result;      LSCPResultSet result;
1289      try {      try {
1290          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1291          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1292          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1293            if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1294          MidiInputDevice* pDevice = devices[MIDIDeviceId];          MidiInputDevice* pDevice = devices[MIDIDeviceId];
         if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));  
1295          pSamplerChannel->SetMidiInputDevice(pDevice);          pSamplerChannel->SetMidiInputDevice(pDevice);
1296      }      }
1297      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 1187  String LSCPServer::SetMIDIInputType(Stri Line 1305  String LSCPServer::SetMIDIInputType(Stri
1305      LSCPResultSet result;      LSCPResultSet result;
1306      try {      try {
1307          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1308          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1309          // Driver type name aliasing...          // Driver type name aliasing...
1310          if (MidiInputDriver == "ALSA") MidiInputDriver = "Alsa";          if (MidiInputDriver == "Alsa") MidiInputDriver = "ALSA";
1311          // Check if there's one MIDI input device already created          // Check if there's one MIDI input device already created
1312          // for the intended MIDI driver type (MidiInputDriver)...          // for the intended MIDI driver type (MidiInputDriver)...
1313          MidiInputDevice *pDevice = NULL;          MidiInputDevice *pDevice = NULL;
# Line 1207  String LSCPServer::SetMIDIInputType(Stri Line 1325  String LSCPServer::SetMIDIInputType(Stri
1325              pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);              pDevice = pSampler->CreateMidiInputDevice(MidiInputDriver, params);
1326              // Make it with at least one initial port.              // Make it with at least one initial port.
1327              std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();              std::map<String,DeviceCreationParameter*> parameters = pDevice->DeviceParameters();
1328              parameters["ports"]->SetValue("1");              parameters["PORTS"]->SetValue("1");
1329          }          }
1330          // Must have a device...          // Must have a device...
1331          if (pDevice == NULL)          if (pDevice == NULL)
# Line 1230  String LSCPServer::SetMIDIInput(uint MID Line 1348  String LSCPServer::SetMIDIInput(uint MID
1348      LSCPResultSet result;      LSCPResultSet result;
1349      try {      try {
1350          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1351          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1352          std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();          std::map<uint, MidiInputDevice*> devices =  pSampler->GetMidiInputDevices();
1353            if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1354          MidiInputDevice* pDevice = devices[MIDIDeviceId];          MidiInputDevice* pDevice = devices[MIDIDeviceId];
1355          if (!pDevice) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId));          pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputPort::midi_chan_t) MIDIChannel);
         pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel);  
1356      }      }
1357      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1358           result.Error(e);           result.Error(e);
# Line 1246  String LSCPServer::SetMIDIInput(uint MID Line 1364  String LSCPServer::SetMIDIInput(uint MID
1364   * Will be called by the parser to change the global volume factor on a   * Will be called by the parser to change the global volume factor on a
1365   * particular sampler channel.   * particular sampler channel.
1366   */   */
1367  String LSCPServer::SetVolume(double Volume, uint uiSamplerChannel) {  String LSCPServer::SetVolume(double dVolume, uint uiSamplerChannel) {
1368      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", Volume, uiSamplerChannel));      dmsg(2,("LSCPServer: SetVolume(Volume=%f, SamplerChannel=%d)\n", dVolume, uiSamplerChannel));
1369      LSCPResultSet result;      LSCPResultSet result;
1370      try {      try {
1371          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1372          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1373          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
1374          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
1375          pEngine->Volume(Volume);          pEngineChannel->Volume(dVolume);
1376      }      }
1377      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1378           result.Error(e);           result.Error(e);
# Line 1270  String LSCPServer::ResetChannel(uint uiS Line 1388  String LSCPServer::ResetChannel(uint uiS
1388      LSCPResultSet result;      LSCPResultSet result;
1389      try {      try {
1390          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1391          if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds");          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1392          Engine* pEngine = pSamplerChannel->GetEngine();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
1393          if (!pEngine) throw LinuxSamplerException("No engine loaded on channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
1394          pEngine->Reset();          pEngineChannel->GetEngine()->Reset();
1395      }      }
1396      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
1397           result.Error(e);           result.Error(e);
# Line 1317  String LSCPServer::UnsubscribeNotificati Line 1435  String LSCPServer::UnsubscribeNotificati
1435      return result.Produce();      return result.Produce();
1436  }  }
1437    
1438    static int select_callback(void * lscpResultSet, int argc,
1439                            char **argv, char **azColName)
1440    {
1441        LSCPResultSet* resultSet = (LSCPResultSet*) lscpResultSet;
1442        resultSet->Add(argc, argv);
1443        return 0;
1444    }
1445    
1446    String LSCPServer::QueryDatabase(String query) {
1447        LSCPResultSet result;
1448    #if HAVE_SQLITE3
1449        char* zErrMsg = NULL;
1450        sqlite3 *db;
1451        String selectStr = "SELECT " + query;
1452    
1453        int rc = sqlite3_open("linuxsampler.db", &db);
1454        if (rc == SQLITE_OK)
1455        {
1456                rc = sqlite3_exec(db, selectStr.c_str(), select_callback, &result, &zErrMsg);
1457        }
1458        if ( rc != SQLITE_OK )
1459        {
1460                result.Error(String(zErrMsg), rc);
1461        }
1462        sqlite3_close(db);
1463    #else
1464        result.Error(String("SQLITE3 was not installed when linuxsampler was built. SELECT statement is not available."), 0);
1465    #endif
1466        return result.Produce();
1467    }
1468    
1469  /**  /**
1470   * 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
1471   * mode is enabled, all commands from the client will (immediately) be   * mode is enabled, all commands from the client will (immediately) be
# Line 1335  String LSCPServer::SetEcho(yyparse_param Line 1484  String LSCPServer::SetEcho(yyparse_param
1484      }      }
1485      return result.Produce();      return result.Produce();
1486  }  }
   
 // Instrument loader constructor.  
 LSCPLoadInstrument::LSCPLoadInstrument(Engine* pEngine, String Filename, uint uiInstrument)  
     : Thread(false, 0, -4)  
 {  
     this->pEngine = pEngine;  
     this->Filename = Filename;  
     this->uiInstrument = uiInstrument;  
 }  
   
 // Instrument loader process.  
 int LSCPLoadInstrument::Main()  
 {  
     try {  
         pEngine->LoadInstrument(Filename.c_str(), uiInstrument);  
     }  
   
     catch (LinuxSamplerException e) {  
         e.PrintMessage();  
     }  
   
     // Always re-enable the engine.  
     pEngine->Enable();  
   
     // FIXME: Shoot ourselves on the foot?  
     delete this;  
 }  
Legend:
Removed from v.219  
changed lines
  Added in v.556
  ViewVC Help
Powered by ViewVC