/[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 225 by schoenebeck, Sun Aug 22 14:46:47 2004 UTC revision 226 by schoenebeck, Wed Aug 25 22:00:33 2004 UTC
# Line 743  String LSCPServer::GetAudioOutputDriverI Line 743  String LSCPServer::GetAudioOutputDriverI
743  }  }
744    
745  String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {  String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
746      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()));
747      LSCPResultSet result;      LSCPResultSet result;
748      try {      try {
749          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);
# Line 752  String LSCPServer::GetMidiInputDriverPar Line 752  String LSCPServer::GetMidiInputDriverPar
752          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    pParameter->Mandatory());
753          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
754          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
755          if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());          optional<String> oDepends       = pParameter->Depends();
756          if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());          optional<String> oDefault       = pParameter->Default(DependencyList);
757          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());          optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
758          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());          optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
759          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());          optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
760            if (oDepends)       result.Add("DEPENDS",       *oDepends);
761            if (oDefault)       result.Add("DEFAULT",       *oDefault);
762            if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
763            if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
764            if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
765      }      }
766      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
767          result.Error(e);          result.Error(e);
# Line 765  String LSCPServer::GetMidiInputDriverPar Line 770  String LSCPServer::GetMidiInputDriverPar
770  }  }
771    
772  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {  String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
773      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()));
774      LSCPResultSet result;      LSCPResultSet result;
775      try {      try {
776          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);          DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);
# Line 774  String LSCPServer::GetAudioOutputDriverP Line 779  String LSCPServer::GetAudioOutputDriverP
779          result.Add("MANDATORY",    pParameter->Mandatory());          result.Add("MANDATORY",    pParameter->Mandatory());
780          result.Add("FIX",          pParameter->Fix());          result.Add("FIX",          pParameter->Fix());
781          result.Add("MULTIPLICITY", pParameter->Multiplicity());          result.Add("MULTIPLICITY", pParameter->Multiplicity());
782          if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());          optional<String> oDepends       = pParameter->Depends();
783          if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());          optional<String> oDefault       = pParameter->Default(DependencyList);
784          if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());          optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
785          if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());          optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
786          if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());          optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
787            if (oDepends)       result.Add("DEPENDS",       *oDepends);
788            if (oDefault)       result.Add("DEFAULT",       *oDefault);
789            if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
790            if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
791            if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
792      }      }
793      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
794          result.Error(e);          result.Error(e);
# Line 1136  String LSCPServer::SetAudioOutputType(St Line 1146  String LSCPServer::SetAudioOutputType(St
1146          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1147          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1148          // Driver type name aliasing...          // Driver type name aliasing...
1149          if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";          if (AudioOutputDriver == "Alsa") AudioOutputDriver = "ALSA";
1150          if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";          if (AudioOutputDriver == "Jack") AudioOutputDriver = "JACK";
1151          // Check if there's one audio output device already created          // Check if there's one audio output device already created
1152          // for the intended audio driver type (AudioOutputDriver)...          // for the intended audio driver type (AudioOutputDriver)...
1153          AudioOutputDevice *pDevice = NULL;          AudioOutputDevice *pDevice = NULL;
# Line 1218  String LSCPServer::SetMIDIInputType(Stri Line 1228  String LSCPServer::SetMIDIInputType(Stri
1228          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1229          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
1230          // Driver type name aliasing...          // Driver type name aliasing...
1231          if (MidiInputDriver == "ALSA") MidiInputDriver = "Alsa";          if (MidiInputDriver == "Alsa") MidiInputDriver = "ALSA";
1232          // Check if there's one MIDI input device already created          // Check if there's one MIDI input device already created
1233          // for the intended MIDI driver type (MidiInputDriver)...          // for the intended MIDI driver type (MidiInputDriver)...
1234          MidiInputDevice *pDevice = NULL;          MidiInputDevice *pDevice = NULL;

Legend:
Removed from v.225  
changed lines
  Added in v.226

  ViewVC Help
Powered by ViewVC