--- linuxsampler/trunk/src/engines/gig/Engine.cpp 2006/10/21 14:13:09 924 +++ linuxsampler/trunk/src/engines/gig/Engine.cpp 2007/09/04 01:12:49 1321 @@ -2,8 +2,8 @@ * * * LinuxSampler - modular, streaming capable sampler * * * - * Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck * - * Copyright (C) 2005, 2006 Christian Schoenebeck * + * Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck * + * Copyright (C) 2005-2007 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 * @@ -51,6 +51,11 @@ if (engines.count(pDevice)) { dmsg(4,("Using existing gig::Engine.\n")); pEngine = engines[pDevice]; + + // Disable the engine while the new engine channel is + // added and initialized. The engine will be enabled again + // in EngineChannel::Connect. + pEngine->DisableAndLock(); } else { // create a new engine (and disk thread) instance for the given audio output device dmsg(4,("Creating new gig::Engine.\n")); pEngine = (Engine*) EngineFactory::Create("gig"); @@ -93,16 +98,20 @@ /** * Constructor */ - Engine::Engine() { + Engine::Engine() : SuspendedRegions(128) { pAudioOutputDevice = NULL; pDiskThread = NULL; pEventGenerator = NULL; - pSysexBuffer = new RingBuffer(CONFIG_SYSEX_BUFFER_SIZE, 0); - pEventQueue = new RingBuffer(CONFIG_MAX_EVENTS_PER_FRAGMENT, 0); + pSysexBuffer = new RingBuffer(CONFIG_SYSEX_BUFFER_SIZE, 0); + 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]; 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); } @@ -110,6 +119,7 @@ ResetInternal(); ResetScaleTuning(); + ResetSuspendedRegions(); } /** @@ -132,7 +142,12 @@ if (pEventGenerator) delete pEventGenerator; if (pVoiceStealingQueue) delete pVoiceStealingQueue; if (pSysexBuffer) delete pSysexBuffer; - EngineFactory::Destroy(this); + if (pGlobalEvents) delete pGlobalEvents; + if (InstrumentChangeQueue) delete InstrumentChangeQueue; + if (InstrumentChangeReplyQueue) delete InstrumentChangeReplyQueue; + if (pDimRegionsInUse) delete[] pDimRegionsInUse; + ResetSuspendedRegions(); + Unregister(); } void Engine::Enable() { @@ -141,6 +156,18 @@ dmsg(3,("gig::Engine: enabled (val=%d)\n", EngineDisabled.GetUnsafe())); } + /** + * Temporarily stop the engine to not do anything. The engine will just be + * frozen during that time, that means after enabling it again it will + * continue where it was, with all its voices and playback state it had at + * the point of disabling. Notice that the engine's (audio) thread will + * continue to run, it just remains in an inactive loop during that time. + * + * If you need to be sure that all voices and disk streams are killed as + * well, use @c SuspendAll() instead. + * + * @see Enable(), SuspendAll() + */ void Engine::Disable() { dmsg(3,("gig::Engine: disabling\n")); bool* pWasDisabled = EngineDisabled.PushAndUnlock(true, 2); // wait max. 2s @@ -154,6 +181,96 @@ } /** + * Similar to @c Disable() but this method additionally kills all voices + * and disk streams and blocks until all voices and disk streams are actually + * killed / deleted. + * + * @e Note: only the original calling thread is able to re-enable the + * engine afterwards by calling @c ResumeAll() later on! + */ + void Engine::SuspendAll() { + dmsg(1,("gig::Engine: Suspending all ...\n")); + // stop the engine, so we can safely modify the engine's + // data structures from this foreign thread + DisableAndLock(); + // we could also use the respective class member variable here, + // but this is probably safer and cleaner + int iPendingStreamDeletions = 0; + // kill all voices on all engine channels the *die hard* way + for (int iChannel = 0; iChannel < engineChannels.size(); iChannel++) { + EngineChannel* pEngineChannel = engineChannels[iChannel]; + RTList::Iterator iuiKey = pEngineChannel->pActiveKeys->first(); + RTList::Iterator end = pEngineChannel->pActiveKeys->end(); + for (; iuiKey != end; ++iuiKey) { // iterate through all active keys + midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey]; + RTList::Iterator itVoice = pKey->pActiveVoices->first(); + RTList::Iterator itVoicesEnd = pKey->pActiveVoices->end(); + for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key + // request a notification from disk thread side for stream deletion + const Stream::Handle hStream = itVoice->KillImmediately(true); + if (hStream != Stream::INVALID_HANDLE) { // voice actually used a stream + iPendingStreamDeletions++; + } + } + } + } + // wait until all streams were actually deleted by the disk thread + while (iPendingStreamDeletions) { + while ( + iPendingStreamDeletions && + pDiskThread->AskForDeletedStream() != Stream::INVALID_HANDLE + ) iPendingStreamDeletions--; + if (!iPendingStreamDeletions) break; + usleep(10000); // sleep for 10ms + } + dmsg(1,("gig::Engine: Everything suspended.\n")); + } + + /** + * At the moment same as calling @c Enable() directly, but this might + * change in future, so better call this method as counterpart to + * @c SuspendAll() instead of @c Enable() ! + */ + void Engine::ResumeAll() { + Enable(); + } + + /** + * Order the engine to stop rendering audio for the given region. + * Additionally this method will block until all voices and their disk + * streams associated with that region are actually killed / deleted, so + * one can i.e. safely modify the region with an instrument editor after + * returning from this method. + * + * @param pRegion - region the engine shall stop using + */ + void Engine::Suspend(::gig::Region* pRegion) { + dmsg(1,("gig::Engine: Suspending Region %x ...\n",pRegion)); + SuspendedRegionsMutex.Lock(); + SuspensionChangeOngoing.Set(true); + pPendingRegionSuspension = pRegion; + SuspensionChangeOngoing.WaitAndUnlockIf(true); + SuspendedRegionsMutex.Unlock(); + dmsg(1,("gig::Engine: Region %x suspended.",pRegion)); + } + + /** + * Orders the engine to resume playing back the given region, previously + * suspended with @c Suspend() . + * + * @param pRegion - region the engine shall be allowed to use again + */ + void Engine::Resume(::gig::Region* pRegion) { + dmsg(1,("gig::Engine: Resuming Region %x ...\n",pRegion)); + SuspendedRegionsMutex.Lock(); + SuspensionChangeOngoing.Set(true); + pPendingRegionResumption = pRegion; + SuspensionChangeOngoing.WaitAndUnlockIf(true); + SuspendedRegionsMutex.Unlock(); + dmsg(1,("gig::Engine: Region %x resumed.\n",pRegion)); + } + + /** * Reset all voices and disk thread and clear input event queue and all * control and status variables. */ @@ -208,6 +325,13 @@ memset(&ScaleTuning[0], 0x00, 12); } + void Engine::ResetSuspendedRegions() { + SuspendedRegions.clear(); + iPendingStreamDeletions = 0; + pPendingRegionSuspension = pPendingRegionResumption = NULL; + SuspensionChangeOngoing.Set(false); + } + /** * Connect this engine instance with the given audio output device. * This method will be called when an Engine instance is created. @@ -257,7 +381,8 @@ delete this->pDiskThread; dmsg(1,("OK\n")); } - this->pDiskThread = new DiskThread(((pAudioOut->MaxSamplesPerCycle() << CONFIG_MAX_PITCH) << 1) + 6); //FIXME: assuming stereo + this->pDiskThread = new DiskThread(((pAudioOut->MaxSamplesPerCycle() << CONFIG_MAX_PITCH) << 1) + 6, //FIXME: assuming stereo + &instruments); if (!pDiskThread) { dmsg(0,("gig::Engine new diskthread = NULL\n")); exit(EXIT_FAILURE); @@ -286,6 +411,110 @@ } /** + * Called by the engine's (audio) thread once per cycle to process requests + * from the outer world to suspend or resume a given @c gig::Region . + */ + void Engine::ProcessSuspensionsChanges() { + // process request for suspending one region + if (pPendingRegionSuspension) { + // kill all voices on all engine channels that use this region + for (int iChannel = 0; iChannel < engineChannels.size(); iChannel++) { + EngineChannel* pEngineChannel = engineChannels[iChannel]; + RTList::Iterator iuiKey = pEngineChannel->pActiveKeys->first(); + RTList::Iterator end = pEngineChannel->pActiveKeys->end(); + for (; iuiKey != end; ++iuiKey) { // iterate through all active keys + midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey]; + RTList::Iterator itVoice = pKey->pActiveVoices->first(); + // if current key is not associated with this region, skip this key + if (itVoice->pDimRgn->GetParent() != pPendingRegionSuspension) continue; + RTList::Iterator itVoicesEnd = pKey->pActiveVoices->end(); + for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key + // request a notification from disk thread side for stream deletion + const Stream::Handle hStream = itVoice->KillImmediately(true); + if (hStream != Stream::INVALID_HANDLE) { // voice actually used a stream + iPendingStreamDeletions++; + } + } + } + } + // make sure the region is not yet on the list + bool bAlreadySuspended = false; + RTList< ::gig::Region*>::Iterator iter = SuspendedRegions.first(); + RTList< ::gig::Region*>::Iterator end = SuspendedRegions.end(); + for (; iter != end; ++iter) { // iterate through all suspended regions + if (*iter == pPendingRegionSuspension) { // found + bAlreadySuspended = true; + dmsg(1,("gig::Engine: attempt to suspend an already suspended region !!!\n")); + break; + } + } + if (!bAlreadySuspended) { + // put the region on the list of suspended regions + RTList< ::gig::Region*>::Iterator iter = SuspendedRegions.allocAppend(); + if (iter) { + *iter = pPendingRegionSuspension; + } else std::cerr << "gig::Engine: Could not suspend Region, list is full. This is a bug!!!\n" << std::flush; + } + // 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 + // we're done in this case + if (!iPendingStreamDeletions) SuspensionChangeOngoing.Set(false); + } + + // process request for resuming one region + if (pPendingRegionResumption) { + // remove region from the list of suspended regions + RTList< ::gig::Region*>::Iterator iter = SuspendedRegions.first(); + RTList< ::gig::Region*>::Iterator end = SuspendedRegions.end(); + for (; iter != end; ++iter) { // iterate through all suspended regions + if (*iter == pPendingRegionResumption) { // found + SuspendedRegions.free(iter); + break; // done + } + } + // free request slot for next caller + pPendingRegionResumption = NULL; + // awake other side as we're done + SuspensionChangeOngoing.Set(false); + } + } + + /** + * Called by the engine's (audio) thread once per cycle to check if + * streams of voices that were killed due to suspension request have + * finally really been deleted by the disk thread. + */ + void Engine::ProcessPendingStreamDeletions() { + if (!iPendingStreamDeletions) return; + //TODO: or shall we better store a list with stream handles instead of a scalar amount of streams to be deleted? might be safer + while ( + iPendingStreamDeletions && + pDiskThread->AskForDeletedStream() != Stream::INVALID_HANDLE + ) iPendingStreamDeletions--; + // just for safety ... + while (pDiskThread->AskForDeletedStream() != Stream::INVALID_HANDLE); + // now that all disk streams are deleted, awake other side as + // we're finally done with suspending the requested region + if (!iPendingStreamDeletions) SuspensionChangeOngoing.Set(false); + } + + /** + * Returns @c true if the given region is currently set to be suspended + * from being used, @c false otherwise. + */ + bool Engine::RegionSuspended(::gig::Region* pRegion) { + if (SuspendedRegions.isEmpty()) return false; + //TODO: or shall we use a sorted container instead of the RTList? might be faster ... or trivial ;-) + RTList< ::gig::Region*>::Iterator iter = SuspendedRegions.first(); + RTList< ::gig::Region*>::Iterator end = SuspendedRegions.end(); + for (; iter != end; ++iter) // iterate through all suspended regions + if (*iter == pRegion) return true; + return false; + } + + /** * Clear all engine global event lists. */ void Engine::ClearEventLists() { @@ -306,7 +535,7 @@ * current audio cycle */ void Engine::ImportEvents(uint Samples) { - RingBuffer::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader(); + RingBuffer::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader(); Event* pEvent; while (true) { // get next event from input event queue @@ -340,7 +569,7 @@ * @returns 0 on success */ int Engine::RenderAudio(uint Samples) { - dmsg(5,("RenderAudio(Samples=%d)\n", Samples)); + dmsg(7,("RenderAudio(Samples=%d)\n", Samples)); // return if engine disabled if (EngineDisabled.Pop()) { @@ -348,6 +577,10 @@ return 0; } + // process requests for suspending / resuming regions (i.e. to avoid + // crashes while these regions are modified by an instrument editor) + ProcessSuspensionsChanges(); + // update time of start and end of this audio fragment (as events' time stamps relate to this) pEventGenerator->UpdateFragmentTime(Samples); @@ -377,24 +610,63 @@ // reset internal voice counter (just for statistic of active voices) 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(); + + // 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; + + 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) { + 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); + } + // handle events on all engine channels for (int i = 0; i < engineChannels.size(); i++) { - if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded ProcessEvents(engineChannels[i], Samples); } // render all 'normal', active voices on all engine channels for (int i = 0; i < engineChannels.size(); i++) { - if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded RenderActiveVoices(engineChannels[i], Samples); } // now that all ordinary voices on ALL engine channels are rendered, render new stolen voices RenderStolenVoices(Samples); + // handle audio routing for engine channels with FX sends + for (int i = 0; i < engineChannels.size(); i++) { + if (engineChannels[i]->fxSends.empty()) continue; // ignore if no FX sends + RouteAudio(engineChannels[i], Samples); + } + // handle cleanup on all engine channels for the next audio fragment for (int i = 0; i < engineChannels.size(); i++) { - if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded PostProcess(engineChannels[i]); } @@ -409,6 +681,11 @@ ActiveVoiceCount = ActiveVoiceCountTemp; if (ActiveVoiceCount > ActiveVoiceCountMax) ActiveVoiceCountMax = ActiveVoiceCount; + // in case regions were previously suspended and we killed voices + // with disk streams due to that, check if those streams have finally + // been deleted by the disk thread + if (iPendingStreamDeletions) ProcessPendingStreamDeletions(); + FrameTime += Samples; return 0; @@ -476,6 +753,8 @@ if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted #endif + uint voiceCount = 0; + uint streamCount = 0; RTList::Iterator iuiKey = pEngineChannel->pActiveKeys->first(); RTList::Iterator end = pEngineChannel->pActiveKeys->end(); while (iuiKey != end) { // iterate through all active keys @@ -487,12 +766,21 @@ for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key // now render current voice itVoice->Render(Samples); - if (itVoice->IsActive()) ActiveVoiceCountTemp++; // still active - else { // voice reached end, is now inactive + if (itVoice->IsActive()) { // still active + ActiveVoiceCountTemp++; + voiceCount++; + + if (itVoice->PlaybackState == Voice::playback_state_disk) { + if ((itVoice->DiskStreamRef).State == Stream::state_active) streamCount++; + } + } else { // voice reached end, is now inactive FreeVoice(pEngineChannel, itVoice); // remove voice from the list of active voices } } } + + pEngineChannel->SetVoiceCount(voiceCount); + pEngineChannel->SetDiskStreamCount(streamCount); } /** @@ -513,12 +801,21 @@ RTList::Iterator end = pVoiceStealingQueue->end(); for (; itVoiceStealEvent != end; ++itVoiceStealEvent) { EngineChannel* pEngineChannel = (EngineChannel*) itVoiceStealEvent->pEngineChannel; + if (!pEngineChannel->pInstrument) continue; // ignore if no instrument loaded Pool::Iterator itNewVoice = LaunchVoice(pEngineChannel, itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false, false); if (itNewVoice) { itNewVoice->Render(Samples); - if (itNewVoice->IsActive()) ActiveVoiceCountTemp++; // still active - else { // voice reached end, is now inactive + if (itNewVoice->IsActive()) { // still active + ActiveVoiceCountTemp++; + pEngineChannel->SetVoiceCount(pEngineChannel->GetVoiceCount() + 1); + + if (itNewVoice->PlaybackState == Voice::playback_state_disk) { + if (itNewVoice->DiskStreamRef.State == Stream::state_active) { + pEngineChannel->SetDiskStreamCount(pEngineChannel->GetDiskStreamCount() + 1); + } + } + } else { // voice reached end, is now inactive FreeVoice(pEngineChannel, itNewVoice); // remove voice from the list of active voices } } @@ -532,6 +829,58 @@ } /** + * Will be called in case the respective engine channel sports FX send + * channels. In this particular case, engine channel local buffers are + * used to render and mix all voices to. This method is responsible for + * copying the audio data from those local buffers to the master audio + * output channels as well as to the FX send audio output channels with + * their respective FX send levels. + * + * @param pEngineChannel - engine channel from which audio should be + * routed + * @param Samples - amount of sample points to be routed in + * this audio fragment cycle + */ + void Engine::RouteAudio(EngineChannel* pEngineChannel, uint Samples) { + // route master signal + { + AudioChannel* pDstL = pAudioOutputDevice->Channel(pEngineChannel->AudioDeviceChannelLeft); + AudioChannel* pDstR = pAudioOutputDevice->Channel(pEngineChannel->AudioDeviceChannelRight); + pEngineChannel->pChannelLeft->MixTo(pDstL, Samples); + pEngineChannel->pChannelRight->MixTo(pDstR, Samples); + } + // route FX send signal + { + 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()); + } + } + } + // reset buffers with silence (zero out) for the next audio cycle + pEngineChannel->pChannelLeft->Clear(); + pEngineChannel->pChannelRight->Clear(); + } + + /** * Free all keys which have turned inactive in this audio fragment, from * the list of active keys and clear all event lists on that engine * channel. @@ -608,6 +957,11 @@ if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted #endif + if (!pEngineChannel->pInstrument) return; // ignore if no instrument loaded + + //HACK: we should better add the transpose value only to the most mandatory places (like for retrieving the region and calculating the tuning), because otherwise voices will unintendedly survive when changing transpose while playing + itNoteOnEvent->Param.Note.Key += pEngineChannel->GlobalTranspose; + const int key = itNoteOnEvent->Param.Note.Key; midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[key]; @@ -665,7 +1019,7 @@ { // first, get total amount of required voices (dependant on amount of layers) ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOnEventOnKeyList->Param.Note.Key); - if (pRegion) { + if (pRegion && !RegionSuspended(pRegion)) { int voicesRequired = pRegion->Layers; // now launch the required amount of voices for (int i = 0; i < voicesRequired; i++) @@ -695,6 +1049,9 @@ if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted #endif + //HACK: we should better add the transpose value only to the most mandatory places (like for retrieving the region and calculating the tuning), because otherwise voices will unintendedly survive when changing transpose while playing + itNoteOffEvent->Param.Note.Key += pEngineChannel->GlobalTranspose; + const int iKey = itNoteOffEvent->Param.Note.Key; midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[iKey]; pKey->KeyPressed = false; // the MIDI key was now released @@ -705,7 +1062,7 @@ bool bShouldRelease = pKey->Active && ShouldReleaseVoice(pEngineChannel, itNoteOffEventOnKeyList->Param.Note.Key); // in case Solo Mode is enabled, kill all voices on this key and respawn a voice on the highest pressed key (if any) - if (pEngineChannel->SoloMode) { //TODO: this feels like too much code just for handling solo mode :P + if (pEngineChannel->SoloMode && pEngineChannel->pInstrument) { //TODO: this feels like too much code just for handling solo mode :P bool bOtherKeysPressed = false; if (iKey == pEngineChannel->SoloKey) { pEngineChannel->SoloKey = -1; @@ -768,7 +1125,7 @@ itNoteOffEventOnKeyList->Type = Event::type_release; // transform event type // spawn release triggered voice(s) if needed - if (pKey->ReleaseTrigger) { + if (pKey->ReleaseTrigger && pEngineChannel->pInstrument) { // first, get total amount of required voices (dependant on amount of layers) ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(itNoteOffEventOnKeyList->Param.Note.Key); if (pRegion) { @@ -963,6 +1320,12 @@ std::cerr << "gig::Engine::LaunchVoice() Error: Unknown dimension\n" << std::flush; } } + + // return if this is a release triggered voice and there is no + // releasetrigger dimension (could happen if an instrument + // change has occured between note on and off) + if (ReleaseTriggerVoice && VoiceType != Voice::type_release_trigger) return Pool::Iterator(); + ::gig::DimensionRegion* pDimRgn = pRegion->GetDimensionRegionByValue(DimValues); // no need to continue if sample is silent @@ -1192,6 +1555,13 @@ uint keygroup = itVoice->KeyGroup; + // if the sample and dimension region belong to an + // instrument that is unloaded, tell the disk thread to + // release them + if (itVoice->Orphan) { + pDiskThread->OrderDeletionOfDimreg(itVoice->pDimRgn); + } + // free the voice object pVoicePool->free(itVoice); @@ -1236,14 +1606,29 @@ // update controller value in the engine channel's controller table pEngineChannel->ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value; + // handle hard coded MIDI controllers switch (itControlChangeEvent->Param.CC.Controller) { case 5: { // portamento time pEngineChannel->PortamentoTime = (float) itControlChangeEvent->Param.CC.Value / 127.0f * (float) CONFIG_PORTAMENTO_TIME_MAX + (float) CONFIG_PORTAMENTO_TIME_MIN; break; } + case 6: { // data entry (currently only used for RPN controllers) + if (pEngineChannel->GetMidiRpnController() == 2) { // coarse tuning in half tones + int transpose = (int) itControlChangeEvent->Param.CC.Value - 64; + // limit to +- two octaves for now + transpose = RTMath::Min(transpose, 24); + transpose = RTMath::Max(transpose, -24); + pEngineChannel->GlobalTranspose = transpose; + // workaround, so we won't have hanging notes + ReleaseAllVoices(pEngineChannel, itControlChangeEvent); + } + // to avoid other MIDI CC #6 messages to be misenterpreted as RPN controller data + pEngineChannel->ResetMidiRpnController(); + break; + } case 7: { // volume //TODO: not sample accurate yet - pEngineChannel->GlobalVolume = VolumeCurve[itControlChangeEvent->Param.CC.Value] * CONFIG_GLOBAL_ATTENUATION; + pEngineChannel->MidiVolume = VolumeCurve[itControlChangeEvent->Param.CC.Value]; pEngineChannel->bStatusChanged = true; // engine channel status has changed, so set notify flag break; } @@ -1345,6 +1730,14 @@ } break; } + case 100: { // RPN controller LSB + pEngineChannel->SetMidiRpnControllerLsb(itControlChangeEvent->Param.CC.Value); + break; + } + case 101: { // RPN controller MSB + pEngineChannel->SetMidiRpnControllerMsb(itControlChangeEvent->Param.CC.Value); + break; + } // Channel Mode Messages @@ -1374,6 +1767,16 @@ break; } } + + // handle FX send controllers + if (!pEngineChannel->fxSends.empty()) { + for (int iFxSend = 0; iFxSend < pEngineChannel->GetFxSendCount(); iFxSend++) { + FxSend* pFxSend = pEngineChannel->GetFxSend(iFxSend); + if (pFxSend->MidiController() == itControlChangeEvent->Param.CC.Controller) + pFxSend->SetLevel(itControlChangeEvent->Param.CC.Value); + pFxSend->SetInfoChanged(true); + } + } } /** @@ -1382,7 +1785,7 @@ * @param itSysexEvent - sysex data size and time stamp of the sysex event */ void Engine::ProcessSysex(Pool::Iterator& itSysexEvent) { - RingBuffer::NonVolatileReader reader = pSysexBuffer->get_non_volatile_reader(); + RingBuffer::NonVolatileReader reader = pSysexBuffer->get_non_volatile_reader(); uint8_t exclusive_status, id; if (!reader.pop(&exclusive_status)) goto free_sysex_data; @@ -1401,7 +1804,7 @@ // command address uint8_t addr[3]; // 2 byte addr MSB, followed by 1 byte addr LSB) - const RingBuffer::NonVolatileReader checksum_reader = reader; // so we can calculate the check sum later + const RingBuffer::NonVolatileReader checksum_reader = reader; // so we can calculate the check sum later if (reader.read(&addr[0], 3) != 3) goto free_sysex_data; if (addr[0] == 0x40 && addr[1] == 0x00) { // System Parameters dmsg(3,("\tSystem Parameter\n")); @@ -1448,8 +1851,8 @@ * question * @param DataSize - size of the GS message data (in bytes) */ - uint8_t Engine::GSCheckSum(const RingBuffer::NonVolatileReader AddrReader, uint DataSize) { - RingBuffer::NonVolatileReader reader = AddrReader; + uint8_t Engine::GSCheckSum(const RingBuffer::NonVolatileReader AddrReader, uint DataSize) { + RingBuffer::NonVolatileReader reader = AddrReader; uint bytes = 3 /*addr*/ + DataSize; uint8_t addr_and_data[bytes]; reader.read(&addr_and_data[0], bytes); @@ -1568,10 +1971,14 @@ } String Engine::Version() { - String s = "$Revision: 1.65 $"; + String s = "$Revision: 1.80 $"; return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword } + InstrumentManager* Engine::GetInstrumentManager() { + return &instruments; + } + // static constant initializers const float* Engine::VolumeCurve(InitVolumeCurve()); const float* Engine::PanCurve(InitPanCurve()); @@ -1614,4 +2021,28 @@ 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