--- linuxsampler/trunk/src/network/lscpserver.cpp 2005/06/17 19:49:30 660 +++ linuxsampler/trunk/src/network/lscpserver.cpp 2005/12/22 19:26:35 814 @@ -61,7 +61,10 @@ Mutex LSCPServer::SubscriptionMutex = Mutex(); Mutex LSCPServer::RTNotifyMutex = Mutex(); -LSCPServer::LSCPServer(Sampler* pSampler) : Thread(true, false, 0, -4) { +LSCPServer::LSCPServer(Sampler* pSampler, long int addr, short int port) : Thread(true, false, 0, -4) { + SocketAddress.sin_family = AF_INET; + SocketAddress.sin_addr.s_addr = addr; + SocketAddress.sin_port = port; this->pSampler = pSampler; LSCPEvent::RegisterEvent(LSCPEvent::event_channel_count, "CHANNEL_COUNT"); LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT"); @@ -69,6 +72,7 @@ LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL"); LSCPEvent::RegisterEvent(LSCPEvent::event_channel_info, "CHANNEL_INFO"); LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS"); + LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT"); hSocket = -1; } @@ -98,10 +102,6 @@ exit(EXIT_FAILURE); } - SocketAddress.sin_family = AF_INET; - SocketAddress.sin_port = htons(LSCP_PORT); - SocketAddress.sin_addr.s_addr = htonl(INADDR_ANY); - if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) { std::cerr << "LSCPServer: Could not bind server socket, retrying for " << ToString(LSCP_SERVER_BIND_TIMEOUT) << " seconds..."; for (int trial = 0; true; trial++) { // retry for LSCP_SERVER_BIND_TIMEOUT seconds @@ -128,9 +128,39 @@ FD_SET(hSocket, &fdSet); int maxSessions = hSocket; + timeval timeout; + while (true) { - fd_set selectSet = fdSet; - int retval = select(maxSessions+1, &selectSet, NULL, NULL, NULL); + // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers + { + std::set engineChannels = EngineChannelFactory::EngineChannelInstances(); + std::set::iterator itEngineChannel = engineChannels.begin(); + std::set::iterator itEnd = engineChannels.end(); + for (; itEngineChannel != itEnd; ++itEngineChannel) { + if ((*itEngineChannel)->StatusChanged()) { + SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_info, (*itEngineChannel)->iSamplerChannelIndex)); + } + } + } + + //Now let's deliver late notifies (if any) + NotifyBufferMutex.Lock(); + for (std::map::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) { +#ifdef MSG_NOSIGNAL + send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), MSG_NOSIGNAL); +#else + send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), 0); +#endif + bufferedNotifies.erase(iterNotify); + } + NotifyBufferMutex.Unlock(); + + fd_set selectSet = fdSet; + timeout.tv_sec = 0; + timeout.tv_usec = 100000; + + int retval = select(maxSessions+1, &selectSet, NULL, NULL, &timeout); + if (retval == 0) continue; //Nothing try again if (retval == -1) { @@ -190,26 +220,6 @@ break; } } - - // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers - { - std::set engineChannels = EngineChannelFactory::EngineChannelInstances(); - std::set::iterator itEngineChannel = engineChannels.begin(); - std::set::iterator itEnd = engineChannels.end(); - for (; itEngineChannel != itEnd; ++itEngineChannel) { - if ((*itEngineChannel)->StatusChanged()) { - SendLSCPNotify(LSCPEvent(LSCPEvent::event_channel_info, (*itEngineChannel)->iSamplerChannelIndex)); - } - } - } - - //Now let's deliver late notifies (if any) - NotifyBufferMutex.Lock(); - for (std::map::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) { - send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), 0); - bufferedNotifies.erase(iterNotify); - } - NotifyBufferMutex.Unlock(); } } @@ -256,7 +266,11 @@ while (true) { if (NotifyMutex.Trylock()) { for(;iter != end; iter++) +#ifdef MSG_NOSIGNAL + send(*iter, notify.c_str(), notify.size(), MSG_NOSIGNAL); +#else send(*iter, notify.c_str(), notify.size(), 0); +#endif NotifyMutex.Unlock(); break; } else { @@ -365,7 +379,11 @@ dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str())); if (currentSocket != -1) { NotifyMutex.Lock(); +#ifdef MSG_NOSIGNAL + send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), MSG_NOSIGNAL); +#else send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), 0); +#endif NotifyMutex.Unlock(); } } @@ -498,13 +516,14 @@ * sampler channel. */ String LSCPServer::SetEngineType(String EngineName, uint uiSamplerChannel) { - dmsg(2,("LSCPServer: LoadEngine(EngineName=%s,SamplerChannel=%d)\n", EngineName.c_str(), uiSamplerChannel)); + dmsg(2,("LSCPServer: SetEngineType(EngineName=%s,uiSamplerChannel=%d)\n", EngineName.c_str(), uiSamplerChannel)); LSCPResultSet result; try { SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel); if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel)); LockRTNotify(); pSamplerChannel->SetEngineType(EngineName); + if(HasSoloChannel()) pSamplerChannel->GetEngineChannel()->SetMute(-1); UnlockRTNotify(); } catch (LinuxSamplerException e) { @@ -620,6 +639,8 @@ int InstrumentStatus = -1; int AudioOutputChannels = 0; String AudioRouting; + int Mute = 0; + bool Solo = false; if (pEngineChannel) { EngineName = pEngineChannel->EngineName(); @@ -635,6 +656,8 @@ if (AudioRouting != "") AudioRouting += ","; AudioRouting += ToString(pEngineChannel->OutputChannel(chan)); } + Mute = pEngineChannel->GetMute(); + Solo = pEngineChannel->GetSolo(); } result.Add("ENGINE_NAME", EngineName); @@ -647,13 +670,15 @@ result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice())); result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort()); - if (pSamplerChannel->GetMidiInputChannel() == MidiInputPort::midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL"); + if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL"); else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel()); result.Add("INSTRUMENT_FILE", InstrumentFileName); result.Add("INSTRUMENT_NR", InstrumentIndex); result.Add("INSTRUMENT_NAME", InstrumentName); result.Add("INSTRUMENT_STATUS", InstrumentStatus); + result.Add("MUTE", Mute == -1 ? "MUTED_BY_SOLO" : (Mute ? "true" : "false")); + result.Add("SOLO", Solo); } catch (LinuxSamplerException e) { result.Error(e); @@ -1291,7 +1316,7 @@ try { SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel); if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel)); - pSamplerChannel->SetMidiInputChannel((MidiInputPort::midi_chan_t) MIDIChannel); + pSamplerChannel->SetMidiInputChannel((midi_chan_t) MIDIChannel); } catch (LinuxSamplerException e) { result.Error(e); @@ -1368,7 +1393,7 @@ std::map devices = pSampler->GetMidiInputDevices(); if (!devices.count(MIDIDeviceId)) throw LinuxSamplerException("There is no MIDI input device with index " + ToString(MIDIDeviceId)); MidiInputDevice* pDevice = devices[MIDIDeviceId]; - pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (MidiInputPort::midi_chan_t) MIDIChannel); + pSamplerChannel->SetMidiInput(pDevice, MIDIPort, (midi_chan_t) MIDIChannel); } catch (LinuxSamplerException e) { result.Error(e); @@ -1397,6 +1422,107 @@ } /** + * Will be called by the parser to mute/unmute particular sampler channel. + */ +String LSCPServer::SetChannelMute(bool bMute, uint uiSamplerChannel) { + dmsg(2,("LSCPServer: SetChannelMute(bMute=%d,uiSamplerChannel=%d)\n",bMute,uiSamplerChannel)); + LSCPResultSet result; + try { + SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel); + if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel)); + + EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel(); + if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel"); + + if(!bMute) pEngineChannel->SetMute((HasSoloChannel() && !pEngineChannel->GetSolo()) ? -1 : 0); + else pEngineChannel->SetMute(1); + } catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +/** + * Will be called by the parser to solo particular sampler channel. + */ +String LSCPServer::SetChannelSolo(bool bSolo, uint uiSamplerChannel) { + dmsg(2,("LSCPServer: SetChannelSolo(bSolo=%d,uiSamplerChannel=%d)\n",bSolo,uiSamplerChannel)); + LSCPResultSet result; + try { + SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel); + if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel)); + + EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel(); + if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel"); + + bool oldSolo = pEngineChannel->GetSolo(); + bool hadSoloChannel = HasSoloChannel(); + + pEngineChannel->SetSolo(bSolo); + + if(!oldSolo && bSolo) { + if(pEngineChannel->GetMute() == -1) pEngineChannel->SetMute(0); + if(!hadSoloChannel) MuteNonSoloChannels(); + } + + if(oldSolo && !bSolo) { + if(!HasSoloChannel()) UnmuteChannels(); + else if(!pEngineChannel->GetMute()) pEngineChannel->SetMute(-1); + } + } catch (LinuxSamplerException e) { + result.Error(e); + } + return result.Produce(); +} + +/** + * Determines whether there is at least one solo channel in the channel list. + * + * @returns true if there is at least one solo channel in the channel list, + * false otherwise. + */ +bool LSCPServer::HasSoloChannel() { + std::map channels = pSampler->GetSamplerChannels(); + std::map::iterator iter = channels.begin(); + for (; iter != channels.end(); iter++) { + EngineChannel* c = iter->second->GetEngineChannel(); + if(c && c->GetSolo()) return true; + } + + return false; +} + +/** + * Mutes all unmuted non-solo channels. Notice that the channels are muted + * with -1 which indicates that they are muted because of the presence + * of a solo channel(s). Channels muted with -1 will be automatically unmuted + * when there are no solo channels left. + */ +void LSCPServer::MuteNonSoloChannels() { + dmsg(2,("LSCPServer: MuteNonSoloChannels()\n")); + std::map channels = pSampler->GetSamplerChannels(); + std::map::iterator iter = channels.begin(); + for (; iter != channels.end(); iter++) { + EngineChannel* c = iter->second->GetEngineChannel(); + if(c && !c->GetSolo() && !c->GetMute()) c->SetMute(-1); + } +} + +/** + * Unmutes all channels that are muted because of the presence + * of a solo channel(s). + */ +void LSCPServer::UnmuteChannels() { + dmsg(2,("LSCPServer: UnmuteChannels()\n")); + std::map channels = pSampler->GetSamplerChannels(); + std::map::iterator iter = channels.begin(); + for (; iter != channels.end(); iter++) { + EngineChannel* c = iter->second->GetEngineChannel(); + if(c && c->GetMute() == -1) c->SetMute(0); + } +} + +/** * Will be called by the parser to reset a particular sampler channel. */ String LSCPServer::ResetChannel(uint uiSamplerChannel) { @@ -1407,8 +1533,7 @@ if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel)); EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel(); if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel"); - if (!pEngineChannel->GetEngine()) throw LinuxSamplerException("No audio output device connected to sampler channel"); - pEngineChannel->GetEngine()->Reset(); + pEngineChannel->Reset(); } catch (LinuxSamplerException e) { result.Error(e); @@ -1439,6 +1564,26 @@ return result.Produce(); } +/** + * Will be called by the parser to return the current number of all active voices. + */ +String LSCPServer::GetTotalVoiceCount() { + dmsg(2,("LSCPServer: GetTotalVoiceCount()\n")); + LSCPResultSet result; + result.Add(pSampler->GetVoiceCount()); + return result.Produce(); +} + +/** + * Will be called by the parser to return the maximum number of voices. + */ +String LSCPServer::GetTotalVoiceCountMax() { + dmsg(2,("LSCPServer: GetTotalVoiceCountMax()\n")); + LSCPResultSet result; + result.Add(EngineFactory::EngineInstances().size() * CONFIG_MAX_VOICES); + return result.Produce(); +} + /** * Will be called by the parser to subscribe a client (frontend) on the * server for receiving event messages.