--- linuxsampler/trunk/src/network/lscpserver.cpp 2004/06/12 07:29:37 120 +++ linuxsampler/trunk/src/network/lscpserver.cpp 2004/06/28 04:30:11 155 @@ -24,6 +24,8 @@ #include "lscpresultset.h" #include "../engines/gig/Engine.h" +#include "../audiodriver/AudioOutputDeviceFactory.h" +#include "../mididriver/MidiInputDeviceFactory.h" LSCPServer::LSCPServer(Sampler* pSampler) : Thread(false, 0, -4) { this->pSampler = pSampler; @@ -90,9 +92,103 @@ } /** + * Find a created audio output device index. + */ +int LSCPServer::GetAudioOutputDeviceIndex ( AudioOutputDevice *pDevice ) +{ + // Search for the created device to get its index + std::map devices = pSampler->GetAudioOutputDevices(); + std::map::iterator iter = devices.begin(); + for (; iter != devices.end(); iter++) { + if (iter->second == pDevice) + return iter->first; + } + // Not found. + return -1; +} + +/** + * Find a created midi input device index. + */ +int LSCPServer::GetMidiInputDeviceIndex ( MidiInputDevice *pDevice ) +{ + // Search for the created device to get its index + std::map devices = pSampler->GetMidiInputDevices(); + std::map::iterator iter = devices.begin(); + for (; iter != devices.end(); iter++) { + if (iter->second == pDevice) + return iter->first; + } + // Not found. + return -1; +} + +String LSCPServer::CreateAudioOutputDevice(String Driver, std::map Parameters) { + dmsg(2,("LSCPServer: CreateAudioOutputDevice(Driver=%s)\n", Driver.c_str())); + LSCPResultSet result; + try { + AudioOutputDevice* pDevice = pSampler->CreateAudioOutputDevice(Driver, Parameters); + // search for the created device to get its index + int index = GetAudioOutputDeviceIndex(pDevice); + if (index == -1) throw LinuxSamplerException("Internal error: could not find created audio output device."); + result = index; // success + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::CreateMidiInputDevice(String Driver, std::map Parameters) { + dmsg(2,("LSCPServer: CreateMidiInputDevice(Driver=%s)\n", Driver.c_str())); + LSCPResultSet result; + try { + MidiInputDevice* pDevice = pSampler->CreateMidiInputDevice(Driver, Parameters); + // search for the created device to get its index + int index = GetMidiInputDeviceIndex(pDevice); + if (index == -1) throw LinuxSamplerException("Internal error: could not find created midi input device."); + result = index; // success + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::DestroyAudioOutputDevice(uint DeviceIndex) { + dmsg(2,("LSCPServer: DestroyAudioOutputDevice(DeviceIndex=%d)\n", DeviceIndex)); + LSCPResultSet result; + try { + std::map devices = pSampler->GetAudioOutputDevices(); + if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + "."); + AudioOutputDevice* pDevice = devices[DeviceIndex]; + pSampler->DestroyAudioOutputDevice(pDevice); + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::DestroyMidiInputDevice(uint DeviceIndex) { + dmsg(2,("LSCPServer: DestroyMidiInputDevice(DeviceIndex=%d)\n", DeviceIndex)); + LSCPResultSet result; + try { + std::map devices = pSampler->GetMidiInputDevices(); + MidiInputDevice* pDevice = devices[DeviceIndex]; + if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + "."); + pSampler->DestroyMidiInputDevice(pDevice); + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +/** * Will be called by the parser to load an instrument. */ -String LSCPServer::LoadInstrument(String Filename, uint uiInstrument, uint uiSamplerChannel) { +String LSCPServer::LoadInstrument(String Filename, uint uiInstrument, uint uiSamplerChannel, bool bBackground) { dmsg(2,("LSCPServer: LoadInstrument(Filename=%s,Instrument=%d,SamplerChannel=%d)\n", Filename.c_str(), uiInstrument, uiSamplerChannel)); LSCPResultSet result; try { @@ -100,7 +196,13 @@ if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds"); Engine* pEngine = pSamplerChannel->GetEngine(); if (!pEngine) throw LinuxSamplerException("No engine loaded on channel"); - pEngine->LoadInstrument(Filename.c_str(), uiInstrument); + if (pSamplerChannel->GetAudioOutputDevice() == NULL) + throw LinuxSamplerException("No audio output device on channel"); + if (bBackground) { + LSCPLoadInstrument *pLoadInstrument = new LSCPLoadInstrument(pEngine, Filename.c_str(), uiInstrument); + pLoadInstrument->StartThread(); + } + else pEngine->LoadInstrument(Filename.c_str(), uiInstrument); } catch (LinuxSamplerException e) { result.Error(e); @@ -177,6 +279,7 @@ if ((EngineName == "GigEngine") || (EngineName == "gig")) { Engine* pEngine = new LinuxSampler::gig::Engine; result.Add(pEngine->Description()); + result.Add(pEngine->Version()); delete pEngine; } else throw LinuxSamplerException("Unknown engine type"); @@ -198,38 +301,45 @@ SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel); if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds"); Engine* pEngine = pSamplerChannel->GetEngine(); - + //Defaults values String EngineName = "NONE"; float Volume = 0; String InstrumentFileName = "NONE"; - int InstrumentIndex = 0; - + int InstrumentIndex = -1; + int InstrumentStatus = -1; + if (pEngine) { EngineName = pEngine->EngineName(); Volume = pEngine->Volume(); - int iIdx = pEngine->InstrumentIndex(); - if (iIdx != -1) { + InstrumentStatus = pEngine->InstrumentStatus(); + InstrumentIndex = pEngine->InstrumentIndex(); + if (InstrumentIndex != -1) InstrumentFileName = pEngine->InstrumentFileName(); - InstrumentIndex = iIdx; - } } result.Add("ENGINE_NAME", EngineName); result.Add("VOLUME", Volume); - //Some hardcoded stuff for now to make GUI look good - result.Add("AUDIO_OUTPUT_DEVICE", "0"); + //Some not-so-hardcoded stuff to make GUI look good + result.Add("AUDIO_OUTPUT_DEVICE", GetAudioOutputDeviceIndex(pSamplerChannel->GetAudioOutputDevice())); result.Add("AUDIO_OUTPUT_CHANNELS", "2"); result.Add("AUDIO_OUTPUT_ROUTING", "0,1"); result.Add("INSTRUMENT_FILE", InstrumentFileName); result.Add("INSTRUMENT_NR", InstrumentIndex); - - //Some more hardcoded stuff for now to make GUI look good - result.Add("MIDI_INPUT_DEVICE", "0"); - result.Add("MIDI_INPUT_PORT", "0"); - result.Add("MIDI_INPUT_CHANNEL", "1"); + result.Add("INSTRUMENT_STATUS", InstrumentStatus); + + MidiInputDevice *pDevice = pSamplerChannel->GetMidiInputDevice(); + if (pDevice) { + result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pDevice)); + MidiInputDevice::MidiInputPort *pPort = pSamplerChannel->GetMidiInputPort(); + if (pPort) { + result.Add("MIDI_INPUT_PORT", (int)pPort->GetPortNumber()); + result.Add("MIDI_INPUT_CHANNEL", (int)pSamplerChannel->GetMidiInputChannel()); + } + + } } catch (LinuxSamplerException e) { result.Error(e); @@ -289,15 +399,20 @@ if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds"); Engine* pEngine = pSamplerChannel->GetEngine(); if (!pEngine) throw LinuxSamplerException("No engine loaded on channel"); - if (!pEngine->DiskStreamSupported()) return "NA\r\n"; //FIXME: Update resultset class to support "NA" - switch (ResponseType) { - case fill_response_bytes: - result.Add(pEngine->DiskStreamBufferFillBytes()); - case fill_response_percentage: - result.Add(pEngine->DiskStreamBufferFillPercentage()); - default: - throw LinuxSamplerException("Unknown fill response type"); - } + if (!pEngine->DiskStreamSupported()) + result.Add("NA"); + else { + switch (ResponseType) { + case fill_response_bytes: + result.Add(pEngine->DiskStreamBufferFillBytes()); + break; + case fill_response_percentage: + result.Add(pEngine->DiskStreamBufferFillPercentage()); + break; + default: + throw LinuxSamplerException("Unknown fill response type"); + } + } } catch (LinuxSamplerException e) { result.Error(e); @@ -305,20 +420,383 @@ return result.Produce(); } -/** - * Will be called by the parser to change the audio output type on a - * particular sampler channel. - */ -String LSCPServer::SetAudioOutputType(AudioOutputDevice::type_t AudioOutputType, uint uiSamplerChannel) { - dmsg(2,("LSCPServer: SetAudioOutputType(AudioOutputType=%d, SamplerChannel=%d)\n", AudioOutputType, uiSamplerChannel)); +String LSCPServer::GetAvailableAudioOutputDrivers() { + dmsg(2,("LSCPServer: GetAvailableAudioOutputDrivers()\n")); LSCPResultSet result; try { - SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel); - if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds"); - pSamplerChannel->SetAudioOutputDevice(AudioOutputType); + String s = AudioOutputDeviceFactory::AvailableDriversAsString(); + result.Add(s); } catch (LinuxSamplerException e) { - result.Error(e); + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetAvailableMidiInputDrivers() { + dmsg(2,("LSCPServer: GetAvailableMidiInputDrivers()\n")); + LSCPResultSet result; + try { + String s = MidiInputDeviceFactory::AvailableDriversAsString(); + result.Add(s); + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetMidiInputDriverInfo(String Driver) { + dmsg(2,("LSCPServer: GetMidiInputDriverInfo(Driver=%s)\n",Driver.c_str())); + LSCPResultSet result; + try { + result.Add("DESCRIPTION", MidiInputDeviceFactory::GetDriverDescription(Driver)); + result.Add("VERSION", MidiInputDeviceFactory::GetDriverVersion(Driver)); + + std::map parameters = MidiInputDeviceFactory::GetAvailableDriverParameters(Driver); + if (parameters.size()) { // if there are parameters defined for this driver + String s; + std::map::iterator iter = parameters.begin(); + for (;iter != parameters.end(); iter++) { + if (s != "") s += ","; + s += iter->first; + } + result.Add("PARAMETERS", s); + } + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetAudioOutputDriverInfo(String Driver) { + dmsg(2,("LSCPServer: GetAudioOutputDriverInfo(Driver=%s)\n",Driver.c_str())); + LSCPResultSet result; + try { + result.Add("DESCRIPTION", AudioOutputDeviceFactory::GetDriverDescription(Driver)); + result.Add("VERSION", AudioOutputDeviceFactory::GetDriverVersion(Driver)); + + std::map parameters = AudioOutputDeviceFactory::GetAvailableDriverParameters(Driver); + if (parameters.size()) { // if there are parameters defined for this driver + String s; + std::map::iterator iter = parameters.begin(); + for (;iter != parameters.end(); iter++) { + if (s != "") s += ","; + s += iter->first; + } + result.Add("PARAMETERS", s); + } + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map DependencyList) { + dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str())); + LSCPResultSet result; + try { + DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter); + result.Add("TYPE", pParameter->Type()); + result.Add("DESCRIPTION", pParameter->Description()); + result.Add("MANDATORY", pParameter->Mandatory()); + result.Add("FIX", pParameter->Fix()); + result.Add("MULTIPLICITY", pParameter->Multiplicity()); + if (pParameter->Depends()) result.Add("DEPENDS", pParameter->Depends()); + if (pParameter->Default()) result.Add("DEFAULT", pParameter->Default()); + if (pParameter->RangeMin()) result.Add("RANGE_MIN", pParameter->RangeMin()); + if (pParameter->RangeMax()) result.Add("RANGE_MAX", pParameter->RangeMax()); + if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities()); + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map DependencyList) { + dmsg(2,("LSCPServer: GetAudioOutputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str())); + LSCPResultSet result; + try { + DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter); + result.Add("TYPE", pParameter->Type()); + result.Add("DESCRIPTION", pParameter->Description()); + result.Add("MANDATORY", pParameter->Mandatory()); + result.Add("FIX", pParameter->Fix()); + result.Add("MULTIPLICITY", pParameter->Multiplicity()); + if (pParameter->Depends()) result.Add("DEPENDS", pParameter->Depends()); + if (pParameter->Default()) result.Add("DEFAULT", pParameter->Default()); + if (pParameter->RangeMin()) result.Add("RANGE_MIN", pParameter->RangeMin()); + if (pParameter->RangeMax()) result.Add("RANGE_MAX", pParameter->RangeMax()); + if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities()); + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetAudioOutputDeviceCount() { + dmsg(2,("LSCPServer: GetAudioOutputDeviceCount()\n")); + LSCPResultSet result; + try { + uint count = pSampler->AudioOutputDevices(); + result.Add(count); // success + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetMidiInputDeviceCount() { + dmsg(2,("LSCPServer: GetMidiInputDeviceCount()\n")); + LSCPResultSet result; + try { + uint count = pSampler->MidiInputDevices(); + result.Add(count); // success + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetAudioOutputDevices() { + dmsg(2,("LSCPServer: GetAudioOutputDevices()\n")); + LSCPResultSet result; + try { + String s; + std::map devices = pSampler->GetAudioOutputDevices(); + std::map::iterator iter = devices.begin(); + for (; iter != devices.end(); iter++) { + if (s != "") s += ","; + s += ToString(iter->first); + } + result.Add(s); + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetMidiInputDevices() { + dmsg(2,("LSCPServer: GetMidiInputDevices()\n")); + LSCPResultSet result; + try { + String s; + std::map devices = pSampler->GetMidiInputDevices(); + std::map::iterator iter = devices.begin(); + for (; iter != devices.end(); iter++) { + if (s != "") s += ","; + s += ToString(iter->first); + } + result.Add(s); + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetAudioOutputDeviceInfo(uint DeviceIndex) { + dmsg(2,("LSCPServer: GetAudioOutputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex)); + LSCPResultSet result; + try { + std::map devices = pSampler->GetAudioOutputDevices(); + if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + "."); + AudioOutputDevice* pDevice = devices[DeviceIndex]; + result.Add("driver", pDevice->Driver()); + std::map parameters = pDevice->DeviceParameters(); + std::map::iterator iter = parameters.begin(); + for (; iter != parameters.end(); iter++) { + result.Add(iter->first, iter->second->Value()); + } + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetMidiInputDeviceInfo(uint DeviceIndex) { + dmsg(2,("LSCPServer: GetMidiInputDeviceInfo(DeviceIndex=%d)\n",DeviceIndex)); + LSCPResultSet result; + try { + std::map devices = pSampler->GetMidiInputDevices(); + MidiInputDevice* pDevice = devices[DeviceIndex]; + if (!pDevice) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceIndex) + "."); + result.Add("driver", pDevice->Driver()); + std::map parameters = pDevice->DeviceParameters(); + std::map::iterator iter = parameters.begin(); + for (; iter != parameters.end(); iter++) { + result.Add(iter->first, iter->second->Value()); + } + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} +String LSCPServer::GetMidiInputPortInfo(uint DeviceIndex, uint PortIndex) { + dmsg(2,("LSCPServer: GetMidiInputPortInfo(DeviceIndex=%d, PortIndex=%d)\n",DeviceIndex, PortIndex)); + LSCPResultSet result; + try { + std::map devices = pSampler->GetMidiInputDevices(); + MidiInputDevice* pDevice = devices[DeviceIndex]; + if (!pDevice) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceIndex) + "."); + MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex); + if (!pMidiInputPort) throw LinuxSamplerException("There is no midi input port with index " + ToString(PortIndex) + "."); + std::map parameters = pMidiInputPort->DeviceParameters(); + std::map::iterator iter = parameters.begin(); + for (; iter != parameters.end(); iter++) { + result.Add(iter->first, iter->second->Value()); + } + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetAudioOutputChannelInfo(uint DeviceId, uint ChannelId) { + dmsg(2,("LSCPServer: GetAudioOutputChannelInfo(DeviceId=%d,ChannelId)\n",DeviceId,ChannelId)); + LSCPResultSet result; + try { + // get audio output device + std::map devices = pSampler->GetAudioOutputDevices(); + if (!devices[DeviceId]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceId) + "."); + AudioOutputDevice* pDevice = devices[DeviceId]; + + // get audio channel + AudioChannel* pChannel = pDevice->Channel(ChannelId); + if (!pChannel) throw LinuxSamplerException("Audio ouotput device does not have channel " + ToString(ChannelId) + "."); + + // return the values of all audio channel parameters + std::map parameters = pChannel->ChannelParameters(); + std::map::iterator iter = parameters.begin(); + for (; iter != parameters.end(); iter++) { + result.Add(iter->first, iter->second->Value()); + } + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::GetAudioOutputChannelParameterInfo(uint DeviceId, uint ChannelId, String ParameterName) { + dmsg(2,("LSCPServer: GetAudioOutputChannelParameterInfo(DeviceId=%d,ChannelId=%d,ParameterName=%s)\n",DeviceId,ChannelId,ParameterName.c_str())); + LSCPResultSet result; + try { + // get audio output device + std::map devices = pSampler->GetAudioOutputDevices(); + if (!devices[DeviceId]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceId) + "."); + AudioOutputDevice* pDevice = devices[DeviceId]; + + // get audio channel + AudioChannel* pChannel = pDevice->Channel(ChannelId); + if (!pChannel) throw LinuxSamplerException("Audio output device does not have channel " + ToString(ChannelId) + "."); + + // get desired audio channel parameter + std::map parameters = pChannel->ChannelParameters(); + if (!parameters[ParameterName]) throw LinuxSamplerException("Audio channel does not provide a parameter '" + ParameterName + "'."); + DeviceRuntimeParameter* pParameter = parameters[ParameterName]; + + // return all fields of this audio channel parameter + result.Add("TYPE", pParameter->Type()); + result.Add("DESCRIPTION", pParameter->Description()); + result.Add("FIX", pParameter->Fix()); + result.Add("MULTIPLICITY", pParameter->Multiplicity()); + if (pParameter->RangeMin()) result.Add("RANGE_MIN", pParameter->RangeMin()); + if (pParameter->RangeMax()) result.Add("RANGE_MAX", pParameter->RangeMax()); + if (pParameter->Possibilities()) result.Add("POSSIBILITIES", pParameter->Possibilities()); + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::SetAudioOutputChannelParameter(uint DeviceId, uint ChannelId, String ParamKey, String ParamVal) { + dmsg(2,("LSCPServer: SetAudioOutputChannelParameter(DeviceId=%d,ChannelId=%d,ParamKey=%s,ParamVal=%s)\n",DeviceId,ChannelId,ParamKey.c_str(),ParamVal.c_str())); + LSCPResultSet result; + try { + // get audio output device + std::map devices = pSampler->GetAudioOutputDevices(); + if (!devices[DeviceId]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceId) + "."); + AudioOutputDevice* pDevice = devices[DeviceId]; + + // get audio channel + AudioChannel* pChannel = pDevice->Channel(ChannelId); + if (!pChannel) throw LinuxSamplerException("Audio output device does not have channel " + ToString(ChannelId) + "."); + + // get desired audio channel parameter + std::map parameters = pChannel->ChannelParameters(); + if (!parameters[ParamKey]) throw LinuxSamplerException("Audio channel does not provide a parameter '" + ParamKey + "'."); + DeviceRuntimeParameter* pParameter = parameters[ParamKey]; + + // set new channel parameter value + pParameter->SetValue(ParamVal); + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::SetAudioOutputDeviceParameter(uint DeviceIndex, String ParamKey, String ParamVal) { + dmsg(2,("LSCPServer: SetAudioOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str())); + LSCPResultSet result; + try { + std::map devices = pSampler->GetAudioOutputDevices(); + if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no audio output device with index " + ToString(DeviceIndex) + "."); + AudioOutputDevice* pDevice = devices[DeviceIndex]; + std::map parameters = pDevice->DeviceParameters(); + if (!parameters[ParamKey]) throw LinuxSamplerException("Audio output device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'"); + parameters[ParamKey]->SetValue(ParamVal); + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::SetMidiInputDeviceParameter(uint DeviceIndex, String ParamKey, String ParamVal) { + dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str())); + LSCPResultSet result; + try { + std::map devices = pSampler->GetMidiInputDevices(); + if (!devices[DeviceIndex]) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceIndex) + "."); + MidiInputDevice* pDevice = devices[DeviceIndex]; + std::map parameters = pDevice->DeviceParameters(); + if (!parameters[ParamKey]) throw LinuxSamplerException("Midi input device " + ToString(DeviceIndex) + " does not have a device parameter '" + ParamKey + "'"); + parameters[ParamKey]->SetValue(ParamVal); + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::SetMidiInputPortParameter(uint DeviceIndex, uint PortIndex, String ParamKey, String ParamVal) { + dmsg(2,("LSCPServer: SetMidiOutputDeviceParameter(DeviceIndex=%d,ParamKey=%s,ParamVal=%s)\n",DeviceIndex,ParamKey.c_str(),ParamVal.c_str())); + LSCPResultSet result; + try { + std::map devices = pSampler->GetMidiInputDevices(); + MidiInputDevice* pDevice = devices[DeviceIndex]; + if (!pDevice) throw LinuxSamplerException("There is no midi input device with index " + ToString(DeviceIndex) + "."); + MidiInputDevice::MidiInputPort* pMidiInputPort = pDevice->GetPort(PortIndex); + if (!pMidiInputPort) throw LinuxSamplerException("There is no midi input port with index " + ToString(PortIndex) + "."); + std::map parameters = pMidiInputPort->DeviceParameters(); + if (!parameters[ParamKey]) throw LinuxSamplerException("Midi input device " + ToString(PortIndex) + " does not have a parameter '" + ParamKey + "'"); + parameters[ParamKey]->SetValue(ParamVal); + } + catch (LinuxSamplerException e) { + result.Error(e); } return result.Produce(); } @@ -327,18 +805,41 @@ * Will be called by the parser to change the audio output channel for * playback on a particular sampler channel. */ -String LSCPServer::SetAudioOutputChannel(uint AudioOutputChannel, uint uiSamplerChannel) { - dmsg(2,("LSCPServer: SetAudioOutputChannel(AudioOutputChannel=%d, SamplerChannel=%d)\n", AudioOutputChannel, uiSamplerChannel)); +String LSCPServer::SetAudioOutputChannel(uint ChannelAudioOutputChannel, uint AudioOutputDeviceInputChannel, uint uiSamplerChannel) { + dmsg(2,("LSCPServer: SetAudioOutputChannel(ChannelAudioOutputChannel=%d, AudioOutputDeviceInputChannel=%d, SamplerChannel=%d)\n",ChannelAudioOutputChannel,AudioOutputDeviceInputChannel,uiSamplerChannel)); return "ERR:0:Not implemented yet.\r\n"; //FIXME: Add support for this in resultset class? } -String LSCPServer::SetMIDIInputType(MidiInputDevice::type_t MidiInputType, uint uiSamplerChannel) { - dmsg(2,("LSCPServer: SetMIDIInputType(MidiInputType=%d, SamplerChannel=%d)\n", MidiInputType, uiSamplerChannel)); +String LSCPServer::SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel) { + dmsg(2,("LSCPServer: SetAudioOutputType(String AudioOutputDriver=%s, SamplerChannel=%d)\n",AudioOutputDriver.c_str(),uiSamplerChannel)); LSCPResultSet result; try { SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel); - if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds"); - pSamplerChannel->SetMidiInputDevice(MidiInputType); + if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel)); + // Driver type name aliasing... + if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa"; + if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack"; + // Check if there's one audio output device already created + // for the intended audio driver type (AudioOutputDriver)... + AudioOutputDevice *pDevice = NULL; + std::map devices = pSampler->GetAudioOutputDevices(); + std::map::iterator iter = devices.begin(); + for (; iter != devices.end(); iter++) { + if ((iter->second)->Driver() == AudioOutputDriver) { + pDevice = iter->second; + break; + } + } + // If it doesn't exist, create a new one with default parameters... + if (pDevice == NULL) { + std::map params; + pDevice = pSampler->CreateAudioOutputDevice(AudioOutputDriver, params); + } + // Must have a device... + if (pDevice == NULL) + throw LinuxSamplerException("Internal error: could not create audio output device."); + // Set it as the current channel device... + pSamplerChannel->SetAudioOutputDevice(pDevice); } catch (LinuxSamplerException e) { result.Error(e); @@ -346,18 +847,21 @@ return result.Produce(); } -/** - * Will be called by the parser to change the MIDI input port on which the - * engine of a particular sampler channel should listen to. - */ -String LSCPServer::SetMIDIInputPort(String MIDIInputPort, uint uiSamplerChannel) { - dmsg(2,("LSCPServer: SetMIDIInputPort(MIDIInputPort=%s, Samplerchannel=%d)\n", MIDIInputPort.c_str(), uiSamplerChannel)); +String LSCPServer::SetMIDIInputType(String MidiInputDriver, uint uiSamplerChannel) { + dmsg(2,("LSCPServer: SetMIDIInputType(String MidiInputDriver=%s, SamplerChannel=%d)\n",MidiInputDriver.c_str(),uiSamplerChannel)); LSCPResultSet result; try { +#if 1 + throw LinuxSamplerException("Command deprecated"); +#else SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel); if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds"); - if (!pSamplerChannel->GetMidiInputDevice()) throw LinuxSamplerException("No MIDI input device connected yet"); - pSamplerChannel->GetMidiInputDevice()->SetInputPort(MIDIInputPort.c_str()); + // FIXME: workaround until MIDI driver configuration is implemented (using a Factory class for the MIDI input drivers then, like its already done for audio output drivers) + if (MidiInputDriver == "ALSA") MidiInputDriver = "Alsa"; + if (MidiInputDriver != "Alsa") throw LinuxSamplerException("Unknown MIDI input driver '" + MidiInputDriver + "'."); + MidiInputDevice::type_t MidiInputType = MidiInputDevice::type_alsa; + pSamplerChannel->SetMidiInputDevice(MidiInputType); +#endif } catch (LinuxSamplerException e) { result.Error(e); @@ -366,18 +870,35 @@ } /** - * Will be called by the parser to change the MIDI input channel on which the + * Will be called by the parser to change the MIDI input device, port and channel on which * engine of a particular sampler channel should listen to. */ -String LSCPServer::SetMIDIInputChannel(uint MIDIChannel, uint uiSamplerChannel) { - dmsg(2,("LSCPServer: SetMIDIInputChannel(MIDIChannel=%d, SamplerChannel=%d)\n", MIDIChannel, uiSamplerChannel)); +String LSCPServer::SetMIDIInput(uint MIDIDevice, uint MIDIPort, uint MIDIChannel, uint uiSamplerChannel) { + dmsg(2,("LSCPServer: SetMIDIInput(MIDIDevice=%d, MIDIPort=%d, MIDIChannel=%d, SamplerChannel=%d)\n", MIDIDevice, MIDIPort, MIDIChannel, uiSamplerChannel)); LSCPResultSet result; try { SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel); - if (!pSamplerChannel) throw LinuxSamplerException("Index out of bounds"); - if (!pSamplerChannel->GetMidiInputDevice()) throw LinuxSamplerException("No MIDI input device connected yet"); - MidiInputDevice::type_t oldtype = pSamplerChannel->GetMidiInputDevice()->Type(); - pSamplerChannel->SetMidiInputDevice(oldtype, (MidiInputDevice::midi_chan_t) MIDIChannel); + if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel)); + std::map devices = pSampler->GetMidiInputDevices(); + MidiInputDevice* pDevice = devices[MIDIDevice]; + if (!pDevice) throw LinuxSamplerException("There is no midi input device with index " + ToString(MIDIDevice)); + pSamplerChannel->SetMidiInputPort(pDevice, MIDIPort, (MidiInputDevice::MidiInputPort::midi_chan_t) MIDIChannel); + } + catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) { + LSCPResultSet result; + try { + SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel); + if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel)); + std::map devices = pSampler->GetAudioOutputDevices(); + AudioOutputDevice* pDevice = devices[AudioDeviceId]; + if (!pDevice) throw LinuxSamplerException("There is no audio output device with index " + ToString(AudioDeviceId)); + pSamplerChannel->SetAudioOutputDevice(pDevice); } catch (LinuxSamplerException e) { result.Error(e); @@ -428,8 +949,8 @@ * Will be called by the parser to subscribe a client (frontend) on the * server for receiving event messages. */ -String LSCPServer::SubscribeNotification(uint UDPPort) { - dmsg(2,("LSCPServer: SubscribeNotification(UDPPort=%d)\n", UDPPort)); +String LSCPServer::SubscribeNotification(event_t Event) { + dmsg(2,("LSCPServer: SubscribeNotification(Event=%d)\n", Event)); return "ERR:0:Not implemented yet.\r\n"; } @@ -437,7 +958,35 @@ * Will be called by the parser to unsubscribe a client on the server * for not receiving further event messages. */ -String LSCPServer::UnsubscribeNotification(String SessionID) { - dmsg(2,("LSCPServer: UnsubscribeNotification(SessionID=%s)\n", SessionID.c_str())); +String LSCPServer::UnsubscribeNotification(event_t Event) { + dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%d)\n", Event)); return "ERR:0:Not implemented yet.\r\n"; } + + +// 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; +}