--- linuxsampler/trunk/src/engines/gig/Engine.cpp 2007/10/14 22:00:17 1424 +++ linuxsampler/trunk/src/engines/gig/Engine.cpp 2008/04/20 08:53:39 1723 @@ -2,8 +2,8 @@ * * * LinuxSampler - modular, streaming capable sampler * * * - * Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck * - * Copyright (C) 2005-2007 Christian Schoenebeck * + * Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck * + * Copyright (C) 2005-2008 Christian Schoenebeck * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -74,7 +74,7 @@ /** * Once an engine channel is disconnected from an audio output device, - * it wil immediately call this method to unregister itself from the + * it will immediately call this method to unregister itself from the * engine instance and if that engine instance is not used by any other * engine channel anymore, then that engine instance will be destroyed. * @@ -108,11 +108,10 @@ pEventQueue = new RingBuffer(CONFIG_MAX_EVENTS_PER_FRAGMENT, 0); pEventPool = new Pool(CONFIG_MAX_EVENTS_PER_FRAGMENT); pVoicePool = new Pool(CONFIG_MAX_VOICES); - pDimRegionsInUse = new ::gig::DimensionRegion*[CONFIG_MAX_VOICES + 1]; + pDimRegionPool[0] = new Pool< ::gig::DimensionRegion*>(CONFIG_MAX_VOICES); + pDimRegionPool[1] = new Pool< ::gig::DimensionRegion*>(CONFIG_MAX_VOICES); pVoiceStealingQueue = new RTList(pEventPool); pGlobalEvents = new RTList(pEventPool); - InstrumentChangeQueue = new RingBuffer(1, 0); - InstrumentChangeReplyQueue = new RingBuffer(1, 0); for (RTList::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) { iterVoice->SetEngine(this); @@ -145,9 +144,8 @@ if (pVoiceStealingQueue) delete pVoiceStealingQueue; if (pSysexBuffer) delete pSysexBuffer; if (pGlobalEvents) delete pGlobalEvents; - if (InstrumentChangeQueue) delete InstrumentChangeQueue; - if (InstrumentChangeReplyQueue) delete InstrumentChangeReplyQueue; - if (pDimRegionsInUse) delete[] pDimRegionsInUse; + if (pDimRegionPool[0]) delete pDimRegionPool[0]; + if (pDimRegionPool[1]) delete pDimRegionPool[1]; ResetSuspendedRegions(); Unregister(); } @@ -460,7 +458,7 @@ // free request slot for next caller (and to make sure that // we're not going to process the same request in the next cycle) pPendingRegionSuspension = NULL; - // if no disk stream deletions are pending, awaker other side, as + // if no disk stream deletions are pending, awaken other side, as // we're done in this case if (!iPendingStreamDeletions) SuspensionChangeOngoing.Set(false); } @@ -571,7 +569,7 @@ * @returns 0 on success */ int Engine::RenderAudio(uint Samples) { - dmsg(7,("RenderAudio(Samples=%d)\n", Samples)); + dmsg(8,("RenderAudio(Samples=%d)\n", Samples)); // return if engine disabled if (EngineDisabled.Pop()) { @@ -613,39 +611,47 @@ ActiveVoiceCountTemp = 0; // handle instrument change commands - instrument_change_command_t command; - if (InstrumentChangeQueue->pop(&command) > 0) { - EngineChannel* pEngineChannel = command.pEngineChannel; - pEngineChannel->pInstrument = command.pInstrument; - - //TODO: this is a lazy solution ATM and not safe in case somebody is currently editing the instrument we're currently switching to (we should store all suspended regions on instrument manager side and when switching to another instrument copy that list to the engine's local list of suspensions - ResetSuspendedRegions(); + bool instrumentChanged = false; + for (int i = 0; i < engineChannels.size(); i++) { + EngineChannel* pEngineChannel = engineChannels[i]; - // iterate through all active voices and mark their - // dimension regions as "in use". The instrument resource - // manager may delete all of the instrument except the - // dimension regions and samples that are in use. - int i = 0; - RTList::Iterator iuiKey = pEngineChannel->pActiveKeys->first(); - RTList::Iterator end = pEngineChannel->pActiveKeys->end(); - while (iuiKey != end) { // iterate through all active keys - midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey]; - ++iuiKey; + // as we're going to (carefully) write some status to the + // synchronized struct, we cast away the const + EngineChannel::instrument_change_command_t& cmd = + const_cast(pEngineChannel->InstrumentChangeCommandReader.Lock()); + + pEngineChannel->pDimRegionsInUse = cmd.pDimRegionsInUse; + pEngineChannel->pDimRegionsInUse->clear(); + + if (cmd.bChangeInstrument) { + // change instrument + dmsg(5,("Engine: instrument change command received\n")); + cmd.bChangeInstrument = false; + pEngineChannel->pInstrument = cmd.pInstrument; + instrumentChanged = true; + + // Iterate through all active voices and mark them as + // "orphans", which means that the dimension regions + // and samples they use should be released to the + // instrument resource manager when the voices die. + int i = 0; + RTList::Iterator iuiKey = pEngineChannel->pActiveKeys->first(); + RTList::Iterator end = pEngineChannel->pActiveKeys->end(); + while (iuiKey != end) { // iterate through all active keys + midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey]; + ++iuiKey; - RTList::Iterator itVoice = pKey->pActiveVoices->first(); - RTList::Iterator itVoicesEnd = pKey->pActiveVoices->end(); - for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key - if (!itVoice->Orphan) { + RTList::Iterator itVoice = pKey->pActiveVoices->first(); + RTList::Iterator itVoicesEnd = pKey->pActiveVoices->end(); + for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key itVoice->Orphan = true; - pDimRegionsInUse[i++] = itVoice->pDimRgn; } } } - pDimRegionsInUse[i] = 0; // end of list - - // send a reply to the calling thread, which is waiting - instrument_change_reply_t reply; - InstrumentChangeReplyQueue->push(&reply); + } + if (instrumentChanged) { + //TODO: this is a lazy solution ATM and not safe in case somebody is currently editing the instrument we're currently switching to (we should store all suspended regions on instrument manager side and when switching to another instrument copy that list to the engine's local list of suspensions + ResetSuspendedRegions(); } // handle events on all engine channels @@ -688,6 +694,9 @@ // been deleted by the disk thread if (iPendingStreamDeletions) ProcessPendingStreamDeletions(); + for (int i = 0; i < engineChannels.size(); i++) { + engineChannels[i]->InstrumentChangeCommandReader.Unlock(); + } FrameTime += Samples; return 0; @@ -769,6 +778,9 @@ // now render current voice itVoice->Render(Samples); if (itVoice->IsActive()) { // still active + if (!itVoice->Orphan) { + *(pEngineChannel->pDimRegionsInUse->allocAppend()) = itVoice->pDimRgn; + } ActiveVoiceCountTemp++; voiceCount++; @@ -809,6 +821,7 @@ if (itNewVoice) { itNewVoice->Render(Samples); if (itNewVoice->IsActive()) { // still active + *(pEngineChannel->pDimRegionsInUse->allocAppend()) = itNewVoice->pDimRgn; ActiveVoiceCountTemp++; pEngineChannel->SetVoiceCount(pEngineChannel->GetVoiceCount() + 1); @@ -844,7 +857,7 @@ * this audio fragment cycle */ void Engine::RouteAudio(EngineChannel* pEngineChannel, uint Samples) { - // route master signal + // route dry signal { AudioChannel* pDstL = pAudioOutputDevice->Channel(pEngineChannel->AudioDeviceChannelLeft); AudioChannel* pDstR = pAudioOutputDevice->Channel(pEngineChannel->AudioDeviceChannelRight); @@ -855,28 +868,47 @@ { for (int iFxSend = 0; iFxSend < pEngineChannel->GetFxSendCount(); iFxSend++) { FxSend* pFxSend = pEngineChannel->GetFxSend(iFxSend); - // left channel - const int iDstL = pFxSend->DestinationChannel(0); - if (iDstL < 0) { - dmsg(1,("Engine::RouteAudio() Error: invalid FX send (L) destination channel")); - } else { - AudioChannel* pDstL = pAudioOutputDevice->Channel(iDstL); - if (!pDstL) { - dmsg(1,("Engine::RouteAudio() Error: invalid FX send (L) destination channel")); - } else pEngineChannel->pChannelLeft->MixTo(pDstL, Samples, pFxSend->Level()); - } - // right channel - const int iDstR = pFxSend->DestinationChannel(1); - if (iDstR < 0) { - dmsg(1,("Engine::RouteAudio() Error: invalid FX send (R) destination channel")); - } else { - AudioChannel* pDstR = pAudioOutputDevice->Channel(iDstR); - if (!pDstR) { - dmsg(1,("Engine::RouteAudio() Error: invalid FX send (R) destination channel")); - } else pEngineChannel->pChannelRight->MixTo(pDstR, Samples, pFxSend->Level()); + for (int iChan = 0; iChan < 2; ++iChan) { + AudioChannel* pSource = + (iChan) + ? pEngineChannel->pChannelRight + : pEngineChannel->pChannelLeft; + const int iDstChan = pFxSend->DestinationChannel(iChan); + if (iDstChan < 0) { + dmsg(1,("Engine::RouteAudio() Error: invalid FX send (%s) destination channel (%d->%d)", ((iChan) ? "R" : "L"), iChan, iDstChan)); + goto channel_cleanup; + } + AudioChannel* pDstChan = NULL; + if (pFxSend->DestinationMasterEffectChain() >= 0) { // fx send routed to an internal master effect + EffectChain* pEffectChain = + pAudioOutputDevice->MasterEffectChain( + pFxSend->DestinationMasterEffectChain() + ); + if (!pEffectChain) { + dmsg(1,("Engine::RouteAudio() Error: invalid FX send (%s) destination effect chain %d", ((iChan) ? "R" : "L"), pFxSend->DestinationMasterEffectChain())); + goto channel_cleanup; + } + Effect* pEffect = + pEffectChain->GetEffect( + pFxSend->DestinationMasterEffect() + ); + if (!pEffect) { + dmsg(1,("Engine::RouteAudio() Error: invalid FX send (%s) destination effect %d of effect chain %d", ((iChan) ? "R" : "L"), pFxSend->DestinationMasterEffect(), pFxSend->DestinationMasterEffectChain())); + goto channel_cleanup; + } + pDstChan = pEffect->InputChannel(iDstChan); + } else { // FX send routed directly to an audio output channel + pDstChan = pAudioOutputDevice->Channel(iDstChan); + } + if (!pDstChan) { + dmsg(1,("Engine::RouteAudio() Error: invalid FX send (%s) destination channel (%d->%d)", ((iChan) ? "R" : "L"), iChan, iDstChan)); + goto channel_cleanup; + } + pSource->MixTo(pDstChan, Samples, pFxSend->Level()); } } } + channel_cleanup: // reset buffers with silence (zero out) for the next audio cycle pEngineChannel->pChannelLeft->Clear(); pEngineChannel->pChannelRight->Clear(); @@ -1605,6 +1637,64 @@ void Engine::ProcessControlChange(EngineChannel* pEngineChannel, Pool::Iterator& itControlChangeEvent) { dmsg(4,("Engine::ContinuousController cc=%d v=%d\n", itControlChangeEvent->Param.CC.Controller, itControlChangeEvent->Param.CC.Value)); + // handle the "control triggered" MIDI rule: a control change + // event can trigger a new note on or note off event + if (pEngineChannel->pInstrument) { + + ::gig::MidiRule* rule; + for (int i = 0 ; (rule = pEngineChannel->pInstrument->GetMidiRule(i)) ; i++) { + + if (::gig::MidiRuleCtrlTrigger* ctrlTrigger = + dynamic_cast< ::gig::MidiRuleCtrlTrigger*>(rule)) { + if (itControlChangeEvent->Param.CC.Controller == + ctrlTrigger->ControllerNumber) { + + uint8_t oldCCValue = pEngineChannel->ControllerTable[ + itControlChangeEvent->Param.CC.Controller]; + uint8_t newCCValue = itControlChangeEvent->Param.CC.Value; + + for (int i = 0 ; i < ctrlTrigger->Triggers ; i++) { + ::gig::MidiRuleCtrlTrigger::trigger_t* pTrigger = + &ctrlTrigger->pTriggers[i]; + + // check if the controller has passed the + // trigger point in the right direction + if ((pTrigger->Descending && + oldCCValue > pTrigger->TriggerPoint && + newCCValue <= pTrigger->TriggerPoint) || + (!pTrigger->Descending && + oldCCValue < pTrigger->TriggerPoint && + newCCValue >= pTrigger->TriggerPoint)) { + + RTList::Iterator itNewEvent = pGlobalEvents->allocAppend(); + if (itNewEvent) { + *itNewEvent = *itControlChangeEvent; + itNewEvent->Param.Note.Key = pTrigger->Key; + + if (pTrigger->NoteOff || pTrigger->Velocity == 0) { + itNewEvent->Type = Event::type_note_off; + itNewEvent->Param.Note.Velocity = 100; + + ProcessNoteOff(pEngineChannel, itNewEvent); + } else { + itNewEvent->Type = Event::type_note_on; + //TODO: if Velocity is 255, the triggered velocity should + // depend on how fast the controller is moving + itNewEvent->Param.Note.Velocity = + pTrigger->Velocity == 255 ? 100 : + pTrigger->Velocity; + + ProcessNoteOn(pEngineChannel, itNewEvent); + } + } + else dmsg(1,("Event pool emtpy!\n")); + } + } + } + } + } + } + // update controller value in the engine channel's controller table pEngineChannel->ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value; @@ -1638,6 +1728,7 @@ //TODO: not sample accurate yet pEngineChannel->GlobalPanLeft = PanCurve[128 - itControlChangeEvent->Param.CC.Value]; pEngineChannel->GlobalPanRight = PanCurve[itControlChangeEvent->Param.CC.Value]; + pEngineChannel->iLastPanRequest = itControlChangeEvent->Param.CC.Value; break; } case 64: { // sustain @@ -1778,9 +1869,10 @@ if (!pEngineChannel->fxSends.empty()) { for (int iFxSend = 0; iFxSend < pEngineChannel->GetFxSendCount(); iFxSend++) { FxSend* pFxSend = pEngineChannel->GetFxSend(iFxSend); - if (pFxSend->MidiController() == itControlChangeEvent->Param.CC.Controller) + if (pFxSend->MidiController() == itControlChangeEvent->Param.CC.Controller) { pFxSend->SetLevel(itControlChangeEvent->Param.CC.Value); pFxSend->SetInfoChanged(true); + } } } } @@ -1973,11 +2065,11 @@ } String Engine::Description() { - return "Gigasampler Engine"; + return "Gigasampler Format Engine"; } String Engine::Version() { - String s = "$Revision: 1.83 $"; + String s = "$Revision: 1.91 $"; return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword } @@ -1986,9 +2078,9 @@ } // static constant initializers - const float* Engine::VolumeCurve(InitVolumeCurve()); - const float* Engine::PanCurve(InitPanCurve()); - const float* Engine::CrossfadeCurve(InitCrossfadeCurve()); + const Engine::FloatTable Engine::VolumeCurve(InitVolumeCurve()); + const Engine::FloatTable Engine::PanCurve(InitPanCurve()); + const Engine::FloatTable Engine::CrossfadeCurve(InitCrossfadeCurve()); float* Engine::InitVolumeCurve() { // line-segment approximation @@ -2027,28 +2119,4 @@ return y; } - /** - * Changes the instrument for an engine channel. - * - * @param pEngineChannel - engine channel on which the instrument - * should be changed - * @param pInstrument - new instrument - * @returns a list of dimension regions from the old instrument - * that are still in use - */ - ::gig::DimensionRegion** Engine::ChangeInstrument(EngineChannel* pEngineChannel, ::gig::Instrument* pInstrument) { - instrument_change_command_t command; - command.pEngineChannel = pEngineChannel; - command.pInstrument = pInstrument; - InstrumentChangeQueue->push(&command); - - // wait for the audio thread to confirm that the instrument - // change has been done - instrument_change_reply_t reply; - while (InstrumentChangeReplyQueue->pop(&reply) == 0) { - usleep(10000); - } - return pDimRegionsInUse; - } - }} // namespace LinuxSampler::gig