--- linuxsampler/trunk/src/engines/gig/Engine.cpp 2006/01/28 16:55:30 831 +++ linuxsampler/trunk/src/engines/gig/Engine.cpp 2007/02/07 21:02:04 1043 @@ -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"); @@ -97,12 +102,16 @@ 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); } @@ -116,6 +125,7 @@ * Destructor */ Engine::~Engine() { + MidiInputPort::RemoveSysexListener(this); if (pDiskThread) { dmsg(1,("Stopping disk thread...")); pDiskThread->StopThread(); @@ -131,7 +141,7 @@ if (pEventGenerator) delete pEventGenerator; if (pVoiceStealingQueue) delete pVoiceStealingQueue; if (pSysexBuffer) delete pSysexBuffer; - EngineFactory::Destroy(this); + Unregister(); } void Engine::Enable() { @@ -165,9 +175,14 @@ /** * Reset all voices and disk thread and clear input event queue and all - * control and status variables. This method is not thread safe! + * control and status variables. This method is protected by a mutex. */ void Engine::ResetInternal() { + ResetInternalMutex.Lock(); + + // make sure that the engine does not get any sysex messages + // while it's reseting + bool sysexDisabled = MidiInputPort::RemoveSysexListener(this); ActiveVoiceCount = 0; ActiveVoiceCountMax = 0; @@ -191,6 +206,8 @@ // delete all input events pEventQueue->init(); pSysexBuffer->init(); + if (sysexDisabled) MidiInputPort::AddSysexListener(this); + ResetInternalMutex.Unlock(); } /** @@ -220,7 +237,7 @@ } catch (AudioOutputException e) { String msg = "Audio output device unable to provide 2 audio channels, cause: " + e.Message(); - throw LinuxSamplerException(msg); + throw Exception(msg); } this->MaxSamplesPerCycle = pAudioOutputDevice->MaxSamplesPerCycle(); @@ -249,7 +266,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); @@ -298,7 +316,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 @@ -321,17 +339,18 @@ } /** - * Let this engine proceed to render the given amount of sample points. The - * calculated audio data of all voices of this engine will be placed into - * the engine's audio sum buffer which has to be copied and eventually be - * converted to the appropriate value range by the audio output class (e.g. - * AlsaIO or JackIO) right after. + * Let this engine proceed to render the given amount of sample points. + * The engine will iterate through all engine channels and render audio + * for each engine channel independently. The calculated audio data of + * all voices of each engine channel will be placed into the audio sum + * buffers of the respective audio output device, connected to the + * respective engine channel. * * @param Samples - number of sample points to be rendered * @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()) { @@ -368,24 +387,60 @@ // 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; + + // 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]); } @@ -504,6 +559,7 @@ 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) { @@ -523,6 +579,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. @@ -599,6 +707,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]; @@ -634,7 +747,7 @@ { const ::gig::Instrument* pInstrument = pEngineChannel->pInstrument; if (key >= pInstrument->DimensionKeyRange.low && key <= pInstrument->DimensionKeyRange.high) - pEngineChannel->CurrentKeyDimension = ((key - pInstrument->DimensionKeyRange.low) * 128) / + pEngineChannel->CurrentKeyDimension = float(key - pInstrument->DimensionKeyRange.low) / (pInstrument->DimensionKeyRange.high - pInstrument->DimensionKeyRange.low + 1); } @@ -686,6 +799,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 @@ -696,7 +812,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; @@ -759,7 +875,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) { @@ -862,14 +978,14 @@ DimValues[i] = itNoteOnEvent->Param.Note.Velocity; break; case ::gig::dimension_channelaftertouch: - DimValues[i] = 0; //TODO: we currently ignore this dimension + DimValues[i] = pEngineChannel->ControllerTable[128]; break; case ::gig::dimension_releasetrigger: VoiceType = (ReleaseTriggerVoice) ? Voice::type_release_trigger : (!iLayer) ? Voice::type_release_trigger_required : Voice::type_normal; DimValues[i] = (uint) ReleaseTriggerVoice; break; case ::gig::dimension_keyboard: - DimValues[i] = (uint) pEngineChannel->CurrentKeyDimension; + DimValues[i] = (uint) (pEngineChannel->CurrentKeyDimension * pRegion->pDimensionDefinitions[i].zones); break; case ::gig::dimension_roundrobin: DimValues[i] = (uint) pEngineChannel->pMIDIKeyInfo[MIDIKey].RoundRobinIndex; // incremented for each note on @@ -954,6 +1070,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 @@ -1183,6 +1305,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); @@ -1227,14 +1356,27 @@ // 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); + } + 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; } @@ -1336,6 +1478,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 @@ -1349,7 +1499,9 @@ break; } case 123: { // all notes off + #if CONFIG_PROCESS_ALL_NOTES_OFF ReleaseAllVoices(pEngineChannel, itControlChangeEvent); + #endif // CONFIG_PROCESS_ALL_NOTES_OFF break; } case 126: { // mono mode on @@ -1363,6 +1515,15 @@ 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); + } + } } /** @@ -1371,7 +1532,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; @@ -1390,7 +1551,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")); @@ -1437,8 +1598,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); @@ -1557,13 +1718,18 @@ } String Engine::Version() { - String s = "$Revision: 1.58 $"; + String s = "$Revision: 1.74 $"; 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()); + const float* Engine::CrossfadeCurve(InitCrossfadeCurve()); float* Engine::InitVolumeCurve() { // line-segment approximation @@ -1584,6 +1750,14 @@ return InitCurve(segments, 129); } + float* Engine::InitCrossfadeCurve() { + // line-segment approximation + const float segments[] = { + 0, 0, 1, 0.03, 10, 0.1, 51, 0.58, 127, 1 + }; + return InitCurve(segments); + } + float* Engine::InitCurve(const float* segments, int size) { float* y = new float[size]; for (int x = 0 ; x < size ; x++) { @@ -1594,4 +1768,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