--- linuxsampler/trunk/src/engines/gig/Engine.cpp 2006/01/14 14:07:47 829 +++ linuxsampler/trunk/src/engines/gig/Engine.cpp 2006/12/27 16:17:08 1001 @@ -97,8 +97,8 @@ 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); pVoiceStealingQueue = new RTList(pEventPool); @@ -116,6 +116,7 @@ * Destructor */ Engine::~Engine() { + MidiInputPort::RemoveSysexListener(this); if (pDiskThread) { dmsg(1,("Stopping disk thread...")); pDiskThread->StopThread(); @@ -165,9 +166,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 +197,8 @@ // delete all input events pEventQueue->init(); pSysexBuffer->init(); + if (sysexDisabled) MidiInputPort::AddSysexListener(this); + ResetInternalMutex.Unlock(); } /** @@ -220,7 +228,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(); @@ -298,7 +306,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 +329,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()) { @@ -383,6 +392,12 @@ // 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 @@ -523,6 +538,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->CopyTo(pDstL, Samples); + pEngineChannel->pChannelRight->CopyTo(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->CopyTo(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->CopyTo(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. @@ -634,7 +701,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); } @@ -862,14 +929,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 @@ -1227,6 +1294,7 @@ // 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; @@ -1234,15 +1302,14 @@ } case 7: { // volume //TODO: not sample accurate yet - pEngineChannel->GlobalVolume = (float) itControlChangeEvent->Param.CC.Value / 127.0f * CONFIG_GLOBAL_ATTENUATION; + pEngineChannel->MidiVolume = VolumeCurve[itControlChangeEvent->Param.CC.Value]; pEngineChannel->bStatusChanged = true; // engine channel status has changed, so set notify flag break; } case 10: { // panpot //TODO: not sample accurate yet - const int pan = (int) itControlChangeEvent->Param.CC.Value - 64; - pEngineChannel->GlobalPanLeft = 1.0f - float(RTMath::Max(pan, 0)) / 63.0f; - pEngineChannel->GlobalPanRight = 1.0f - float(RTMath::Min(pan, 0)) / -64.0f; + pEngineChannel->GlobalPanLeft = PanCurve[128 - itControlChangeEvent->Param.CC.Value]; + pEngineChannel->GlobalPanRight = PanCurve[itControlChangeEvent->Param.CC.Value]; break; } case 64: { // sustain @@ -1350,7 +1417,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 @@ -1364,6 +1433,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); + } + } } /** @@ -1372,7 +1450,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; @@ -1391,7 +1469,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")); @@ -1438,8 +1516,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); @@ -1558,8 +1636,54 @@ } String Engine::Version() { - String s = "$Revision: 1.57 $"; + String s = "$Revision: 1.68 $"; 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 + const float segments[] = { + 0, 0, 2, 0.0046, 16, 0.016, 31, 0.051, 45, 0.115, 54.5, 0.2, + 64.5, 0.39, 74, 0.74, 92, 1.03, 114, 1.94, 119.2, 2.2, 127, 2.2 + }; + return InitCurve(segments); + } + + float* Engine::InitPanCurve() { + // line-segment approximation + const float segments[] = { + 0, 0, 1, 0, + 2, 0.05, 31.5, 0.7, 51, 0.851, 74.5, 1.12, + 127, 1.41, 128, 1.41 + }; + 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++) { + if (x > segments[2]) segments += 2; + y[x] = segments[1] + (x - segments[0]) * + (segments[3] - segments[1]) / (segments[2] - segments[0]); + } + return y; + } + }} // namespace LinuxSampler::gig