--- linuxsampler/trunk/src/engines/gig/Voice.cpp 2004/09/19 14:12:55 246 +++ linuxsampler/trunk/src/engines/gig/Voice.cpp 2005/05/22 20:43:32 563 @@ -3,6 +3,7 @@ * LinuxSampler - modular, streaming capable sampler * * * * Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck * + * Copyright (C) 2005 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 * @@ -22,6 +23,8 @@ #include "EGADSR.h" #include "Manipulator.h" +#include "../../common/Features.h" +#include "Synthesizer.h" #include "Voice.h" @@ -32,20 +35,20 @@ const int Voice::FILTER_UPDATE_MASK(CalculateFilterUpdateMask()); float Voice::CalculateFilterCutoffCoeff() { - return log(FILTER_CUTOFF_MIN / FILTER_CUTOFF_MAX); + return log(CONFIG_FILTER_CUTOFF_MIN / CONFIG_FILTER_CUTOFF_MAX); } int Voice::CalculateFilterUpdateMask() { - if (FILTER_UPDATE_PERIOD <= 0) return 0; + if (CONFIG_FILTER_UPDATE_STEPS <= 0) return 0; int power_of_two; - for (power_of_two = 0; 1<::Iterator& itNoteOnEvent, int PitchBend, ::gig::Instrument* pInstrument, int iLayer, bool ReleaseTriggerVoice, bool VoiceStealingAllowed) { + this->pEngineChannel = pEngineChannel; if (!pInstrument) { dmsg(1,("voice::trigger: !pInstrument\n")); exit(EXIT_FAILURE); } + #if CONFIG_DEVMODE + if (itNoteOnEvent->FragmentPos() > pEngine->MaxSamplesPerCycle) { // just a sanity check for debugging + dmsg(1,("Voice::Trigger(): ERROR, TriggerDelay > Totalsamples\n")); + } + #endif // CONFIG_DEVMODE Type = type_normal; - Active = true; - MIDIKey = pNoteOnEvent->Param.Note.Key; + MIDIKey = itNoteOnEvent->Param.Note.Key; pRegion = pInstrument->GetRegion(MIDIKey); - PlaybackState = playback_state_ram; // we always start playback from RAM cache and switch then to disk if needed - Delay = pNoteOnEvent->FragmentPos(); - pTriggerEvent = pNoteOnEvent; - pKillEvent = NULL; + PlaybackState = playback_state_init; // mark voice as triggered, but no audio rendered yet + Delay = itNoteOnEvent->FragmentPos(); + itTriggerEvent = itNoteOnEvent; + itKillEvent = Pool::Iterator(); if (!pRegion) { - std::cerr << "gig::Voice: No Region defined for MIDI key " << MIDIKey << std::endl << std::flush; - KillImmediately(); + dmsg(4, ("gig::Voice: No Region defined for MIDI key %d\n", MIDIKey)); return -1; } - KeyGroup = pRegion->KeyGroup; + // only mark the first voice of a layered voice (group) to be in a + // key group, so the layered voices won't kill each other + KeyGroup = (iLayer == 0 && !ReleaseTriggerVoice) ? pRegion->KeyGroup : 0; // get current dimension values to select the right dimension region //FIXME: controller values for selecting the dimension region here are currently not sample accurate - uint DimValues[5] = {0,0,0,0,0}; + uint DimValues[8] = { 0 }; for (int i = pRegion->Dimensions - 1; i >= 0; i--) { switch (pRegion->pDimensionDefinitions[i].dimension) { case ::gig::dimension_samplechannel: @@ -143,13 +167,9 @@ break; case ::gig::dimension_layer: DimValues[i] = iLayer; - // if this is the 1st layer then spawn further voices for all the other layers - if (iLayer == 0) - for (int iNewLayer = 1; iNewLayer < pRegion->pDimensionDefinitions[i].zones; iNewLayer++) - pEngine->LaunchVoice(pNoteOnEvent, iNewLayer, ReleaseTriggerVoice); break; case ::gig::dimension_velocity: - DimValues[i] = pNoteOnEvent->Param.Note.Velocity; + DimValues[i] = itNoteOnEvent->Param.Note.Velocity; break; case ::gig::dimension_channelaftertouch: DimValues[i] = 0; //TODO: we currently ignore this dimension @@ -159,76 +179,83 @@ DimValues[i] = (uint) ReleaseTriggerVoice; break; case ::gig::dimension_keyboard: - DimValues[i] = (uint) pNoteOnEvent->Param.Note.Key; + DimValues[i] = (uint) pEngineChannel->CurrentKeyDimension; + break; + case ::gig::dimension_roundrobin: + DimValues[i] = (uint) pEngineChannel->pMIDIKeyInfo[MIDIKey].RoundRobinIndex; // incremented for each note on + break; + case ::gig::dimension_random: + pEngine->RandomSeed = pEngine->RandomSeed * 1103515245 + 12345; // classic pseudo random number generator + DimValues[i] = (uint) pEngine->RandomSeed >> (32 - pRegion->pDimensionDefinitions[i].bits); // highest bits are most random break; case ::gig::dimension_modwheel: - DimValues[i] = pEngine->ControllerTable[1]; + DimValues[i] = pEngineChannel->ControllerTable[1]; break; case ::gig::dimension_breath: - DimValues[i] = pEngine->ControllerTable[2]; + DimValues[i] = pEngineChannel->ControllerTable[2]; break; case ::gig::dimension_foot: - DimValues[i] = pEngine->ControllerTable[4]; + DimValues[i] = pEngineChannel->ControllerTable[4]; break; case ::gig::dimension_portamentotime: - DimValues[i] = pEngine->ControllerTable[5]; + DimValues[i] = pEngineChannel->ControllerTable[5]; break; case ::gig::dimension_effect1: - DimValues[i] = pEngine->ControllerTable[12]; + DimValues[i] = pEngineChannel->ControllerTable[12]; break; case ::gig::dimension_effect2: - DimValues[i] = pEngine->ControllerTable[13]; + DimValues[i] = pEngineChannel->ControllerTable[13]; break; case ::gig::dimension_genpurpose1: - DimValues[i] = pEngine->ControllerTable[16]; + DimValues[i] = pEngineChannel->ControllerTable[16]; break; case ::gig::dimension_genpurpose2: - DimValues[i] = pEngine->ControllerTable[17]; + DimValues[i] = pEngineChannel->ControllerTable[17]; break; case ::gig::dimension_genpurpose3: - DimValues[i] = pEngine->ControllerTable[18]; + DimValues[i] = pEngineChannel->ControllerTable[18]; break; case ::gig::dimension_genpurpose4: - DimValues[i] = pEngine->ControllerTable[19]; + DimValues[i] = pEngineChannel->ControllerTable[19]; break; case ::gig::dimension_sustainpedal: - DimValues[i] = pEngine->ControllerTable[64]; + DimValues[i] = pEngineChannel->ControllerTable[64]; break; case ::gig::dimension_portamento: - DimValues[i] = pEngine->ControllerTable[65]; + DimValues[i] = pEngineChannel->ControllerTable[65]; break; case ::gig::dimension_sostenutopedal: - DimValues[i] = pEngine->ControllerTable[66]; + DimValues[i] = pEngineChannel->ControllerTable[66]; break; case ::gig::dimension_softpedal: - DimValues[i] = pEngine->ControllerTable[67]; + DimValues[i] = pEngineChannel->ControllerTable[67]; break; case ::gig::dimension_genpurpose5: - DimValues[i] = pEngine->ControllerTable[80]; + DimValues[i] = pEngineChannel->ControllerTable[80]; break; case ::gig::dimension_genpurpose6: - DimValues[i] = pEngine->ControllerTable[81]; + DimValues[i] = pEngineChannel->ControllerTable[81]; break; case ::gig::dimension_genpurpose7: - DimValues[i] = pEngine->ControllerTable[82]; + DimValues[i] = pEngineChannel->ControllerTable[82]; break; case ::gig::dimension_genpurpose8: - DimValues[i] = pEngine->ControllerTable[83]; + DimValues[i] = pEngineChannel->ControllerTable[83]; break; case ::gig::dimension_effect1depth: - DimValues[i] = pEngine->ControllerTable[91]; + DimValues[i] = pEngineChannel->ControllerTable[91]; break; case ::gig::dimension_effect2depth: - DimValues[i] = pEngine->ControllerTable[92]; + DimValues[i] = pEngineChannel->ControllerTable[92]; break; case ::gig::dimension_effect3depth: - DimValues[i] = pEngine->ControllerTable[93]; + DimValues[i] = pEngineChannel->ControllerTable[93]; break; case ::gig::dimension_effect4depth: - DimValues[i] = pEngine->ControllerTable[94]; + DimValues[i] = pEngineChannel->ControllerTable[94]; break; case ::gig::dimension_effect5depth: - DimValues[i] = pEngine->ControllerTable[95]; + DimValues[i] = pEngineChannel->ControllerTable[95]; break; case ::gig::dimension_none: std::cerr << "gig::Voice::Trigger() Error: dimension=none\n" << std::flush; @@ -237,7 +264,13 @@ std::cerr << "gig::Voice::Trigger() Error: Unknown dimension\n" << std::flush; } } - pDimRgn = pRegion->GetDimensionRegionByValue(DimValues[4],DimValues[3],DimValues[2],DimValues[1],DimValues[0]); + pDimRgn = pRegion->GetDimensionRegionByValue(DimValues); + + pSample = pDimRgn->pSample; // sample won't change until the voice is finished + if (!pSample || !pSample->SamplesTotal) return -1; // no need to continue if sample is silent + + // select channel mode (mono or stereo) + SYNTHESIS_MODE_SET_CHANNELS(SynthesisMode, pSample->Channels == 2); // get starting crossfade volume level switch (pDimRgn->AttenuationController.type) { @@ -245,20 +278,18 @@ CrossfadeVolume = 1.0f; //TODO: aftertouch not supported yet break; case ::gig::attenuation_ctrl_t::type_velocity: - CrossfadeVolume = CrossfadeAttenuation(pNoteOnEvent->Param.Note.Velocity); + CrossfadeVolume = CrossfadeAttenuation(itNoteOnEvent->Param.Note.Velocity); break; case ::gig::attenuation_ctrl_t::type_controlchange: //FIXME: currently not sample accurate - CrossfadeVolume = CrossfadeAttenuation(pEngine->ControllerTable[pDimRgn->AttenuationController.controller_number]); + CrossfadeVolume = CrossfadeAttenuation(pEngineChannel->ControllerTable[pDimRgn->AttenuationController.controller_number]); break; case ::gig::attenuation_ctrl_t::type_none: // no crossfade defined default: CrossfadeVolume = 1.0f; } - PanLeft = float(RTMath::Max(pDimRgn->Pan, 0)) / -64.0f; - PanRight = float(RTMath::Min(pDimRgn->Pan, 0)) / 63.0f; - - pSample = pDimRgn->pSample; // sample won't change until the voice is finished + PanLeft = 1.0f - float(RTMath::Max(pDimRgn->Pan, 0)) / 63.0f; + PanRight = 1.0f - float(RTMath::Min(pDimRgn->Pan, 0)) / -64.0f; Pos = pDimRgn->SampleStartOffset; // offset where we should start playback of sample (0 - 2000 sample points) @@ -267,7 +298,7 @@ DiskVoice = cachedsamples < pSample->SamplesTotal; if (DiskVoice) { // voice to be streamed from disk - MaxRAMPos = cachedsamples - (pEngine->MaxSamplesPerCycle << MAX_PITCH) / pSample->Channels; //TODO: this calculation is too pessimistic and may better be moved to Render() method, so it calculates MaxRAMPos dependent to the current demand of sample points to be rendered (e.g. in case of JACK) + MaxRAMPos = cachedsamples - (pEngine->MaxSamplesPerCycle << CONFIG_MAX_PITCH) / pSample->Channels; //TODO: this calculation is too pessimistic and may better be moved to Render() method, so it calculates MaxRAMPos dependent to the current demand of sample points to be rendered (e.g. in case of JACK) // check if there's a loop defined which completely fits into the cached (RAM) part of the sample if (pSample->Loops && pSample->LoopEnd <= MaxRAMPos) { @@ -296,15 +327,15 @@ // calculate initial pitch value { - double pitchbasecents = pDimRgn->FineTune * 10 + (int) pEngine->ScaleTuning[MIDIKey % 12]; + double pitchbasecents = pDimRgn->FineTune + (int) pEngine->ScaleTuning[MIDIKey % 12]; if (pDimRgn->PitchTrack) pitchbasecents += (MIDIKey - (int) pDimRgn->UnityNote) * 100; this->PitchBase = RTMath::CentsToFreqRatio(pitchbasecents) * (double(pSample->SamplesPerSecond) / double(pEngine->pAudioOutputDevice->SampleRate())); this->PitchBend = RTMath::CentsToFreqRatio(((double) PitchBend / 8192.0) * 200.0); // pitchbend wheel +-2 semitones = 200 cents } + Volume = pDimRgn->GetVelocityAttenuation(itNoteOnEvent->Param.Note.Velocity) / 32768.0f; // we downscale by 32768 to convert from int16 value range to DSP value range (which is -1.0..1.0) - Volume = pDimRgn->GetVelocityAttenuation(pNoteOnEvent->Param.Note.Velocity) / 32768.0f; // we downscale by 32768 to convert from int16 value range to DSP value range (which is -1.0..1.0) - + Volume *= pDimRgn->SampleAttenuation; // setup EG 1 (VCA EG) { @@ -318,10 +349,10 @@ eg1controllervalue = 0; // TODO: aftertouch not yet supported break; case ::gig::eg1_ctrl_t::type_velocity: - eg1controllervalue = pNoteOnEvent->Param.Note.Velocity; + eg1controllervalue = itNoteOnEvent->Param.Note.Velocity; break; case ::gig::eg1_ctrl_t::type_controlchange: // MIDI control change controller - eg1controllervalue = pEngine->ControllerTable[pDimRgn->EG1Controller.controller_number]; + eg1controllervalue = pEngineChannel->ControllerTable[pDimRgn->EG1Controller.controller_number]; break; } if (pDimRgn->EG1ControllerInvert) eg1controllervalue = 127 - eg1controllervalue; @@ -340,11 +371,13 @@ pDimRgn->EG1InfiniteSustain, pDimRgn->EG1Sustain, pDimRgn->EG1Release + eg1release, - Delay); + // the SSE synthesis implementation requires + // the vca start to be 16 byte aligned + SYNTHESIS_MODE_GET_IMPLEMENTATION(SynthesisMode) ? + Delay & 0xfffffffc : Delay); } - #if ENABLE_FILTER // setup EG 2 (VCF Cutoff EG) { // get current value of EG2 controller @@ -357,10 +390,10 @@ eg2controllervalue = 0; // TODO: aftertouch not yet supported break; case ::gig::eg2_ctrl_t::type_velocity: - eg2controllervalue = pNoteOnEvent->Param.Note.Velocity; + eg2controllervalue = itNoteOnEvent->Param.Note.Velocity; break; case ::gig::eg2_ctrl_t::type_controlchange: // MIDI control change controller - eg2controllervalue = pEngine->ControllerTable[pDimRgn->EG2Controller.controller_number]; + eg2controllervalue = pEngineChannel->ControllerTable[pDimRgn->EG2Controller.controller_number]; break; } if (pDimRgn->EG2ControllerInvert) eg2controllervalue = 127 - eg2controllervalue; @@ -381,7 +414,6 @@ pDimRgn->EG2Release + eg2release, Delay); } - #endif // ENABLE_FILTER // setup EG 3 (VCO EG) @@ -422,13 +454,13 @@ pLFO1->Trigger(pDimRgn->LFO1Frequency, lfo1_internal_depth, pDimRgn->LFO1ControlDepth, - pEngine->ControllerTable[pLFO1->ExtController], + pEngineChannel->ControllerTable[pLFO1->ExtController], pDimRgn->LFO1FlipPhase, pEngine->SampleRate, Delay); } - #if ENABLE_FILTER + // setup LFO 2 (VCF Cutoff LFO) { uint16_t lfo2_internal_depth; @@ -460,12 +492,12 @@ pLFO2->Trigger(pDimRgn->LFO2Frequency, lfo2_internal_depth, pDimRgn->LFO2ControlDepth, - pEngine->ControllerTable[pLFO2->ExtController], + pEngineChannel->ControllerTable[pLFO2->ExtController], pDimRgn->LFO2FlipPhase, pEngine->SampleRate, Delay); } - #endif // ENABLE_FILTER + // setup LFO 3 (VCO LFO) { @@ -498,21 +530,22 @@ pLFO3->Trigger(pDimRgn->LFO3Frequency, lfo3_internal_depth, pDimRgn->LFO3ControlDepth, - pEngine->ControllerTable[pLFO3->ExtController], + pEngineChannel->ControllerTable[pLFO3->ExtController], false, pEngine->SampleRate, Delay); } - #if ENABLE_FILTER - #if FORCE_FILTER_USAGE - FilterLeft.Enabled = FilterRight.Enabled = true; + + #if CONFIG_FORCE_FILTER + const bool bUseFilter = true; #else // use filter only if instrument file told so - FilterLeft.Enabled = FilterRight.Enabled = pDimRgn->VCFEnabled; - #endif // FORCE_FILTER_USAGE - if (pDimRgn->VCFEnabled) { - #ifdef OVERRIDE_FILTER_CUTOFF_CTRL - VCFCutoffCtrl.controller = OVERRIDE_FILTER_CUTOFF_CTRL; + const bool bUseFilter = pDimRgn->VCFEnabled; + #endif // CONFIG_FORCE_FILTER + SYNTHESIS_MODE_SET_FILTER(SynthesisMode, bUseFilter); + if (bUseFilter) { + #ifdef CONFIG_OVERRIDE_CUTOFF_CTRL + VCFCutoffCtrl.controller = CONFIG_OVERRIDE_CUTOFF_CTRL; #else // use the one defined in the instrument file switch (pDimRgn->VCFCutoffController) { case ::gig::vcf_cutoff_ctrl_modwheel: @@ -548,10 +581,10 @@ VCFCutoffCtrl.controller = 0; break; } - #endif // OVERRIDE_FILTER_CUTOFF_CTRL + #endif // CONFIG_OVERRIDE_CUTOFF_CTRL - #ifdef OVERRIDE_FILTER_RES_CTRL - VCFResonanceCtrl.controller = OVERRIDE_FILTER_RES_CTRL; + #ifdef CONFIG_OVERRIDE_RESONANCE_CTRL + VCFResonanceCtrl.controller = CONFIG_OVERRIDE_RESONANCE_CTRL; #else // use the one defined in the instrument file switch (pDimRgn->VCFResonanceController) { case ::gig::vcf_res_ctrl_genpurpose3: @@ -570,44 +603,40 @@ default: VCFResonanceCtrl.controller = 0; } - #endif // OVERRIDE_FILTER_RES_CTRL + #endif // CONFIG_OVERRIDE_RESONANCE_CTRL - #ifndef OVERRIDE_FILTER_TYPE + #ifndef CONFIG_OVERRIDE_FILTER_TYPE FilterLeft.SetType(pDimRgn->VCFType); FilterRight.SetType(pDimRgn->VCFType); #else // override filter type - FilterLeft.SetType(OVERRIDE_FILTER_TYPE); - FilterRight.SetType(OVERRIDE_FILTER_TYPE); - #endif // OVERRIDE_FILTER_TYPE + FilterLeft.SetType(CONFIG_OVERRIDE_FILTER_TYPE); + FilterRight.SetType(CONFIG_OVERRIDE_FILTER_TYPE); + #endif // CONFIG_OVERRIDE_FILTER_TYPE - VCFCutoffCtrl.value = pEngine->ControllerTable[VCFCutoffCtrl.controller]; - VCFResonanceCtrl.value = pEngine->ControllerTable[VCFResonanceCtrl.controller]; + VCFCutoffCtrl.value = pEngineChannel->ControllerTable[VCFCutoffCtrl.controller]; + VCFResonanceCtrl.value = pEngineChannel->ControllerTable[VCFResonanceCtrl.controller]; // calculate cutoff frequency float cutoff = (!VCFCutoffCtrl.controller) - ? exp((float) (127 - pNoteOnEvent->Param.Note.Velocity) * (float) pDimRgn->VCFVelocityScale * 6.2E-5f * FILTER_CUTOFF_COEFF) * FILTER_CUTOFF_MAX - : exp((float) VCFCutoffCtrl.value * 0.00787402f * FILTER_CUTOFF_COEFF) * FILTER_CUTOFF_MAX; + ? exp((float) (127 - itNoteOnEvent->Param.Note.Velocity) * (float) pDimRgn->VCFVelocityScale * 6.2E-5f * FILTER_CUTOFF_COEFF) * CONFIG_FILTER_CUTOFF_MAX + : exp((float) VCFCutoffCtrl.value * 0.00787402f * FILTER_CUTOFF_COEFF) * CONFIG_FILTER_CUTOFF_MAX; // calculate resonance float resonance = (float) VCFResonanceCtrl.value * 0.00787f; // 0.0..1.0 if (pDimRgn->VCFKeyboardTracking) { - resonance += (float) (pNoteOnEvent->Param.Note.Key - pDimRgn->VCFKeyboardTrackingBreakpoint) * 0.00787f; + resonance += (float) (itNoteOnEvent->Param.Note.Key - pDimRgn->VCFKeyboardTrackingBreakpoint) * 0.00787f; } Constrain(resonance, 0.0, 1.0); // correct resonance if outside allowed value range (0.0..1.0) - VCFCutoffCtrl.fvalue = cutoff - FILTER_CUTOFF_MIN; + VCFCutoffCtrl.fvalue = cutoff - CONFIG_FILTER_CUTOFF_MIN; VCFResonanceCtrl.fvalue = resonance; - FilterLeft.SetParameters(cutoff, resonance, pEngine->SampleRate); - FilterRight.SetParameters(cutoff, resonance, pEngine->SampleRate); - FilterUpdateCounter = -1; } else { VCFCutoffCtrl.controller = 0; VCFResonanceCtrl.controller = 0; } - #endif // ENABLE_FILTER return 0; // success } @@ -625,42 +654,50 @@ */ void Voice::Render(uint Samples) { + // select default values for synthesis mode bits + SYNTHESIS_MODE_SET_INTERPOLATE(SynthesisMode, (PitchBase * PitchBend) != 1.0f); + SYNTHESIS_MODE_SET_CONSTPITCH(SynthesisMode, true); + SYNTHESIS_MODE_SET_LOOP(SynthesisMode, false); + // Reset the synthesis parameter matrix - pEngine->ResetSynthesisParameters(Event::destination_vca, this->Volume * this->CrossfadeVolume * pEngine->GlobalVolume); + + pEngine->ResetSynthesisParameters(Event::destination_vca, this->Volume * this->CrossfadeVolume * pEngineChannel->GlobalVolume); pEngine->ResetSynthesisParameters(Event::destination_vco, this->PitchBase); - #if ENABLE_FILTER pEngine->ResetSynthesisParameters(Event::destination_vcfc, VCFCutoffCtrl.fvalue); pEngine->ResetSynthesisParameters(Event::destination_vcfr, VCFResonanceCtrl.fvalue); - #endif // ENABLE_FILTER - // Apply events to the synthesis parameter matrix ProcessEvents(Samples); - // Let all modulators write their parameter changes to the synthesis parameter matrix for the current audio fragment - pEG1->Process(Samples, pEngine->pMIDIKeyInfo[MIDIKey].pEvents, pTriggerEvent, this->Pos, this->PitchBase * this->PitchBend, pKillEvent); - #if ENABLE_FILTER - pEG2->Process(Samples, pEngine->pMIDIKeyInfo[MIDIKey].pEvents, pTriggerEvent, this->Pos, this->PitchBase * this->PitchBend); - #endif // ENABLE_FILTER - pEG3->Process(Samples); + pEG1->Process(Samples, pEngineChannel->pMIDIKeyInfo[MIDIKey].pEvents, itTriggerEvent, this->Pos, this->PitchBase * this->PitchBend, itKillEvent); + pEG2->Process(Samples, pEngineChannel->pMIDIKeyInfo[MIDIKey].pEvents, itTriggerEvent, this->Pos, this->PitchBase * this->PitchBend); + if (pEG3->Process(Samples)) { // if pitch EG is active + SYNTHESIS_MODE_SET_INTERPOLATE(SynthesisMode, true); + SYNTHESIS_MODE_SET_CONSTPITCH(SynthesisMode, false); + } pLFO1->Process(Samples); - #if ENABLE_FILTER pLFO2->Process(Samples); - #endif // ENABLE_FILTER - pLFO3->Process(Samples); - - - #if ENABLE_FILTER - CalculateBiquadParameters(Samples); // calculate the final biquad filter parameters - #endif // ENABLE_FILTER + if (pLFO3->Process(Samples)) { // if pitch LFO modulation is active + SYNTHESIS_MODE_SET_INTERPOLATE(SynthesisMode, true); + SYNTHESIS_MODE_SET_CONSTPITCH(SynthesisMode, false); + } + if (SYNTHESIS_MODE_GET_FILTER(SynthesisMode)) + CalculateBiquadParameters(Samples); // calculate the final biquad filter parameters switch (this->PlaybackState) { + case playback_state_init: + this->PlaybackState = playback_state_ram; // we always start playback from RAM cache and switch then to disk if needed + // no break - continue with playback_state_ram + case playback_state_ram: { - if (RAMLoop) InterpolateAndLoop(Samples, (sample_t*) pSample->GetCache().pStart, Delay); - else InterpolateNoLoop(Samples, (sample_t*) pSample->GetCache().pStart, Delay); + if (RAMLoop) SYNTHESIS_MODE_SET_LOOP(SynthesisMode, true); // enable looping + + // render current fragment + Synthesize(Samples, (sample_t*) pSample->GetCache().pStart, Delay); + if (DiskVoice) { // check if we reached the allowed limit of the sample RAM cache if (Pos > MaxRAMPos) { @@ -683,43 +720,58 @@ KillImmediately(); return; } - DiskStreamRef.pStream->IncrementReadPos(pSample->Channels * (RTMath::DoubleToInt(Pos) - MaxRAMPos)); - Pos -= RTMath::DoubleToInt(Pos); + DiskStreamRef.pStream->IncrementReadPos(pSample->Channels * (int(Pos) - MaxRAMPos)); + Pos -= int(Pos); + RealSampleWordsLeftToRead = -1; // -1 means no silence has been added yet } + const int sampleWordsLeftToRead = DiskStreamRef.pStream->GetReadSpace(); + // add silence sample at the end if we reached the end of the stream (for the interpolator) - if (DiskStreamRef.State == Stream::state_end && DiskStreamRef.pStream->GetReadSpace() < (pEngine->MaxSamplesPerCycle << MAX_PITCH) / pSample->Channels) { - DiskStreamRef.pStream->WriteSilence((pEngine->MaxSamplesPerCycle << MAX_PITCH) / pSample->Channels); - this->PlaybackState = playback_state_end; + if (DiskStreamRef.State == Stream::state_end) { + const int maxSampleWordsPerCycle = (pEngine->MaxSamplesPerCycle << CONFIG_MAX_PITCH) * pSample->Channels + 6; // +6 for the interpolator algorithm + if (sampleWordsLeftToRead <= maxSampleWordsPerCycle) { + // remember how many sample words there are before any silence has been added + if (RealSampleWordsLeftToRead < 0) RealSampleWordsLeftToRead = sampleWordsLeftToRead; + DiskStreamRef.pStream->WriteSilence(maxSampleWordsPerCycle - sampleWordsLeftToRead); + } } sample_t* ptr = DiskStreamRef.pStream->GetReadPtr(); // get the current read_ptr within the ringbuffer where we read the samples from - InterpolateNoLoop(Samples, ptr, Delay); - DiskStreamRef.pStream->IncrementReadPos(RTMath::DoubleToInt(Pos) * pSample->Channels); - Pos -= RTMath::DoubleToInt(Pos); + + // render current audio fragment + Synthesize(Samples, ptr, Delay); + + const int iPos = (int) Pos; + const int readSampleWords = iPos * pSample->Channels; // amount of sample words actually been read + DiskStreamRef.pStream->IncrementReadPos(readSampleWords); + Pos -= iPos; // just keep fractional part of Pos + + // change state of voice to 'end' if we really reached the end of the sample data + if (RealSampleWordsLeftToRead >= 0) { + RealSampleWordsLeftToRead -= readSampleWords; + if (RealSampleWordsLeftToRead <= 0) this->PlaybackState = playback_state_end; + } } break; case playback_state_end: - KillImmediately(); // free voice + std::cerr << "gig::Voice::Render(): entered with playback_state_end, this is a bug!\n" << std::flush; break; } - // Reset synthesis event lists (except VCO, as VCO events apply channel wide currently) - pEngine->pSynthesisEvents[Event::destination_vca]->clear(); - #if ENABLE_FILTER - pEngine->pSynthesisEvents[Event::destination_vcfc]->clear(); - pEngine->pSynthesisEvents[Event::destination_vcfr]->clear(); - #endif // ENABLE_FILTER + pEngineChannel->pSynthesisEvents[Event::destination_vca]->clear(); + pEngineChannel->pSynthesisEvents[Event::destination_vcfc]->clear(); + pEngineChannel->pSynthesisEvents[Event::destination_vcfr]->clear(); // Reset delay Delay = 0; - pTriggerEvent = NULL; + itTriggerEvent = Pool::Iterator(); - // If release stage finished, let the voice be killed - if (pEG1->GetStage() == EGADSR::stage_end) this->PlaybackState = playback_state_end; + // If sample stream or release stage finished, kill the voice + if (PlaybackState == playback_state_end || pEG1->GetStage() == EGADSR::stage_end) KillImmediately(); } /** @@ -730,11 +782,15 @@ pLFO1->Reset(); pLFO2->Reset(); pLFO3->Reset(); + FilterLeft.Reset(); + FilterRight.Reset(); DiskStreamRef.pStream = NULL; DiskStreamRef.hStream = 0; DiskStreamRef.State = Stream::state_unused; DiskStreamRef.OrderID = 0; - Active = false; + PlaybackState = playback_state_end; + itTriggerEvent = Pool::Iterator(); + itKillEvent = Pool::Iterator(); } /** @@ -747,282 +803,219 @@ void Voice::ProcessEvents(uint Samples) { // dispatch control change events - Event* pCCEvent = pEngine->pCCEvents->first(); + RTList::Iterator itCCEvent = pEngineChannel->pCCEvents->first(); if (Delay) { // skip events that happened before this voice was triggered - while (pCCEvent && pCCEvent->FragmentPos() <= Delay) pCCEvent = pEngine->pCCEvents->next(); + while (itCCEvent && itCCEvent->FragmentPos() <= Delay) ++itCCEvent; } - while (pCCEvent) { - if (pCCEvent->Param.CC.Controller) { // if valid MIDI controller - #if ENABLE_FILTER - if (pCCEvent->Param.CC.Controller == VCFCutoffCtrl.controller) { - pEngine->pSynthesisEvents[Event::destination_vcfc]->alloc_assign(*pCCEvent); + while (itCCEvent) { + if (itCCEvent->Param.CC.Controller) { // if valid MIDI controller + if (itCCEvent->Param.CC.Controller == VCFCutoffCtrl.controller) { + *pEngineChannel->pSynthesisEvents[Event::destination_vcfc]->allocAppend() = *itCCEvent; } - if (pCCEvent->Param.CC.Controller == VCFResonanceCtrl.controller) { - pEngine->pSynthesisEvents[Event::destination_vcfr]->alloc_assign(*pCCEvent); + if (itCCEvent->Param.CC.Controller == VCFResonanceCtrl.controller) { + *pEngineChannel->pSynthesisEvents[Event::destination_vcfr]->allocAppend() = *itCCEvent; } - #endif // ENABLE_FILTER - if (pCCEvent->Param.CC.Controller == pLFO1->ExtController) { - pLFO1->SendEvent(pCCEvent); + if (itCCEvent->Param.CC.Controller == pLFO1->ExtController) { + pLFO1->SendEvent(itCCEvent); } - #if ENABLE_FILTER - if (pCCEvent->Param.CC.Controller == pLFO2->ExtController) { - pLFO2->SendEvent(pCCEvent); + if (itCCEvent->Param.CC.Controller == pLFO2->ExtController) { + pLFO2->SendEvent(itCCEvent); } - #endif // ENABLE_FILTER - if (pCCEvent->Param.CC.Controller == pLFO3->ExtController) { - pLFO3->SendEvent(pCCEvent); + if (itCCEvent->Param.CC.Controller == pLFO3->ExtController) { + pLFO3->SendEvent(itCCEvent); } if (pDimRgn->AttenuationController.type == ::gig::attenuation_ctrl_t::type_controlchange && - pCCEvent->Param.CC.Controller == pDimRgn->AttenuationController.controller_number) { // if crossfade event - pEngine->pSynthesisEvents[Event::destination_vca]->alloc_assign(*pCCEvent); + itCCEvent->Param.CC.Controller == pDimRgn->AttenuationController.controller_number) { // if crossfade event + *pEngineChannel->pSynthesisEvents[Event::destination_vca]->allocAppend() = *itCCEvent; } } - pCCEvent = pEngine->pCCEvents->next(); + ++itCCEvent; } // process pitch events { - RTEList* pVCOEventList = pEngine->pSynthesisEvents[Event::destination_vco]; - Event* pVCOEvent = pVCOEventList->first(); + RTList* pVCOEventList = pEngineChannel->pSynthesisEvents[Event::destination_vco]; + RTList::Iterator itVCOEvent = pVCOEventList->first(); if (Delay) { // skip events that happened before this voice was triggered - while (pVCOEvent && pVCOEvent->FragmentPos() <= Delay) pVCOEvent = pVCOEventList->next(); + while (itVCOEvent && itVCOEvent->FragmentPos() <= Delay) ++itVCOEvent; } // apply old pitchbend value until first pitch event occurs if (this->PitchBend != 1.0) { - uint end = (pVCOEvent) ? pVCOEvent->FragmentPos() : Samples; + uint end = (itVCOEvent) ? itVCOEvent->FragmentPos() : Samples; for (uint i = Delay; i < end; i++) { pEngine->pSynthesisParameters[Event::destination_vco][i] *= this->PitchBend; } } float pitch; - while (pVCOEvent) { - Event* pNextVCOEvent = pVCOEventList->next(); + while (itVCOEvent) { + RTList::Iterator itNextVCOEvent = itVCOEvent; + ++itNextVCOEvent; // calculate the influence length of this event (in sample points) - uint end = (pNextVCOEvent) ? pNextVCOEvent->FragmentPos() : Samples; + uint end = (itNextVCOEvent) ? itNextVCOEvent->FragmentPos() : Samples; - pitch = RTMath::CentsToFreqRatio(((double) pVCOEvent->Param.Pitch.Pitch / 8192.0) * 200.0); // +-two semitones = +-200 cents + pitch = RTMath::CentsToFreqRatio(((double) itVCOEvent->Param.Pitch.Pitch / 8192.0) * 200.0); // +-two semitones = +-200 cents // apply pitch value to the pitch parameter sequence - for (uint i = pVCOEvent->FragmentPos(); i < end; i++) { + for (uint i = itVCOEvent->FragmentPos(); i < end; i++) { pEngine->pSynthesisParameters[Event::destination_vco][i] *= pitch; } - pVCOEvent = pNextVCOEvent; + itVCOEvent = itNextVCOEvent; + } + if (!pVCOEventList->isEmpty()) { + this->PitchBend = pitch; + SYNTHESIS_MODE_SET_INTERPOLATE(SynthesisMode, true); + SYNTHESIS_MODE_SET_CONSTPITCH(SynthesisMode, false); } - if (pVCOEventList->last()) this->PitchBend = pitch; } // process volume / attenuation events (TODO: we only handle and _expect_ crossfade events here ATM !) { - RTEList* pVCAEventList = pEngine->pSynthesisEvents[Event::destination_vca]; - Event* pVCAEvent = pVCAEventList->first(); + RTList* pVCAEventList = pEngineChannel->pSynthesisEvents[Event::destination_vca]; + RTList::Iterator itVCAEvent = pVCAEventList->first(); if (Delay) { // skip events that happened before this voice was triggered - while (pVCAEvent && pVCAEvent->FragmentPos() <= Delay) pVCAEvent = pVCAEventList->next(); + while (itVCAEvent && itVCAEvent->FragmentPos() <= Delay) ++itVCAEvent; } float crossfadevolume; - while (pVCAEvent) { - Event* pNextVCAEvent = pVCAEventList->next(); + while (itVCAEvent) { + RTList::Iterator itNextVCAEvent = itVCAEvent; + ++itNextVCAEvent; // calculate the influence length of this event (in sample points) - uint end = (pNextVCAEvent) ? pNextVCAEvent->FragmentPos() : Samples; + uint end = (itNextVCAEvent) ? itNextVCAEvent->FragmentPos() : Samples; - crossfadevolume = CrossfadeAttenuation(pVCAEvent->Param.CC.Value); + crossfadevolume = CrossfadeAttenuation(itVCAEvent->Param.CC.Value); - float effective_volume = crossfadevolume * this->Volume * pEngine->GlobalVolume; + float effective_volume = crossfadevolume * this->Volume * pEngineChannel->GlobalVolume; // apply volume value to the volume parameter sequence - for (uint i = pVCAEvent->FragmentPos(); i < end; i++) { + for (uint i = itVCAEvent->FragmentPos(); i < end; i++) { pEngine->pSynthesisParameters[Event::destination_vca][i] = effective_volume; } - pVCAEvent = pNextVCAEvent; + itVCAEvent = itNextVCAEvent; } - if (pVCAEventList->last()) this->CrossfadeVolume = crossfadevolume; + if (!pVCAEventList->isEmpty()) this->CrossfadeVolume = crossfadevolume; } - #if ENABLE_FILTER // process filter cutoff events { - RTEList* pCutoffEventList = pEngine->pSynthesisEvents[Event::destination_vcfc]; - Event* pCutoffEvent = pCutoffEventList->first(); + RTList* pCutoffEventList = pEngineChannel->pSynthesisEvents[Event::destination_vcfc]; + RTList::Iterator itCutoffEvent = pCutoffEventList->first(); if (Delay) { // skip events that happened before this voice was triggered - while (pCutoffEvent && pCutoffEvent->FragmentPos() <= Delay) pCutoffEvent = pCutoffEventList->next(); + while (itCutoffEvent && itCutoffEvent->FragmentPos() <= Delay) ++itCutoffEvent; } float cutoff; - while (pCutoffEvent) { - Event* pNextCutoffEvent = pCutoffEventList->next(); + while (itCutoffEvent) { + RTList::Iterator itNextCutoffEvent = itCutoffEvent; + ++itNextCutoffEvent; // calculate the influence length of this event (in sample points) - uint end = (pNextCutoffEvent) ? pNextCutoffEvent->FragmentPos() : Samples; + uint end = (itNextCutoffEvent) ? itNextCutoffEvent->FragmentPos() : Samples; - cutoff = exp((float) pCutoffEvent->Param.CC.Value * 0.00787402f * FILTER_CUTOFF_COEFF) * FILTER_CUTOFF_MAX - FILTER_CUTOFF_MIN; + cutoff = exp((float) itCutoffEvent->Param.CC.Value * 0.00787402f * FILTER_CUTOFF_COEFF) * CONFIG_FILTER_CUTOFF_MAX - CONFIG_FILTER_CUTOFF_MIN; // apply cutoff frequency to the cutoff parameter sequence - for (uint i = pCutoffEvent->FragmentPos(); i < end; i++) { + for (uint i = itCutoffEvent->FragmentPos(); i < end; i++) { pEngine->pSynthesisParameters[Event::destination_vcfc][i] = cutoff; } - pCutoffEvent = pNextCutoffEvent; + itCutoffEvent = itNextCutoffEvent; } - if (pCutoffEventList->last()) VCFCutoffCtrl.fvalue = cutoff; // needed for initialization of parameter matrix next time + if (!pCutoffEventList->isEmpty()) VCFCutoffCtrl.fvalue = cutoff; // needed for initialization of parameter matrix next time } // process filter resonance events { - RTEList* pResonanceEventList = pEngine->pSynthesisEvents[Event::destination_vcfr]; - Event* pResonanceEvent = pResonanceEventList->first(); + RTList* pResonanceEventList = pEngineChannel->pSynthesisEvents[Event::destination_vcfr]; + RTList::Iterator itResonanceEvent = pResonanceEventList->first(); if (Delay) { // skip events that happened before this voice was triggered - while (pResonanceEvent && pResonanceEvent->FragmentPos() <= Delay) pResonanceEvent = pResonanceEventList->next(); + while (itResonanceEvent && itResonanceEvent->FragmentPos() <= Delay) ++itResonanceEvent; } - while (pResonanceEvent) { - Event* pNextResonanceEvent = pResonanceEventList->next(); + while (itResonanceEvent) { + RTList::Iterator itNextResonanceEvent = itResonanceEvent; + ++itNextResonanceEvent; // calculate the influence length of this event (in sample points) - uint end = (pNextResonanceEvent) ? pNextResonanceEvent->FragmentPos() : Samples; + uint end = (itNextResonanceEvent) ? itNextResonanceEvent->FragmentPos() : Samples; // convert absolute controller value to differential - int ctrldelta = pResonanceEvent->Param.CC.Value - VCFResonanceCtrl.value; - VCFResonanceCtrl.value = pResonanceEvent->Param.CC.Value; + int ctrldelta = itResonanceEvent->Param.CC.Value - VCFResonanceCtrl.value; + VCFResonanceCtrl.value = itResonanceEvent->Param.CC.Value; float resonancedelta = (float) ctrldelta * 0.00787f; // 0.0..1.0 // apply cutoff frequency to the cutoff parameter sequence - for (uint i = pResonanceEvent->FragmentPos(); i < end; i++) { + for (uint i = itResonanceEvent->FragmentPos(); i < end; i++) { pEngine->pSynthesisParameters[Event::destination_vcfr][i] += resonancedelta; } - pResonanceEvent = pNextResonanceEvent; + itResonanceEvent = itNextResonanceEvent; } - if (pResonanceEventList->last()) VCFResonanceCtrl.fvalue = pResonanceEventList->last()->Param.CC.Value * 0.00787f; // needed for initialization of parameter matrix next time + if (!pResonanceEventList->isEmpty()) VCFResonanceCtrl.fvalue = pResonanceEventList->last()->Param.CC.Value * 0.00787f; // needed for initialization of parameter matrix next time } - #endif // ENABLE_FILTER } - #if ENABLE_FILTER /** * Calculate all necessary, final biquad filter parameters. * * @param Samples - number of samples to be rendered in this audio fragment cycle */ void Voice::CalculateBiquadParameters(uint Samples) { - if (!FilterLeft.Enabled) return; - biquad_param_t bqbase; biquad_param_t bqmain; float prev_cutoff = pEngine->pSynthesisParameters[Event::destination_vcfc][0]; float prev_res = pEngine->pSynthesisParameters[Event::destination_vcfr][0]; - FilterLeft.SetParameters(&bqbase, &bqmain, prev_cutoff, prev_res, pEngine->SampleRate); + FilterLeft.SetParameters( &bqbase, &bqmain, prev_cutoff + CONFIG_FILTER_CUTOFF_MIN, prev_res, pEngine->SampleRate); + FilterRight.SetParameters(&bqbase, &bqmain, prev_cutoff + CONFIG_FILTER_CUTOFF_MIN, prev_res, pEngine->SampleRate); pEngine->pBasicFilterParameters[0] = bqbase; pEngine->pMainFilterParameters[0] = bqmain; float* bq; for (int i = 1; i < Samples; i++) { // recalculate biquad parameters if cutoff or resonance differ from previous sample point - if (!(i & FILTER_UPDATE_MASK)) if (pEngine->pSynthesisParameters[Event::destination_vcfr][i] != prev_res || - pEngine->pSynthesisParameters[Event::destination_vcfc][i] != prev_cutoff) { - prev_cutoff = pEngine->pSynthesisParameters[Event::destination_vcfc][i]; - prev_res = pEngine->pSynthesisParameters[Event::destination_vcfr][i]; - FilterLeft.SetParameters(&bqbase, &bqmain, prev_cutoff, prev_res, pEngine->SampleRate); + if (!(i & FILTER_UPDATE_MASK)) { + if (pEngine->pSynthesisParameters[Event::destination_vcfr][i] != prev_res || + pEngine->pSynthesisParameters[Event::destination_vcfc][i] != prev_cutoff) + { + prev_cutoff = pEngine->pSynthesisParameters[Event::destination_vcfc][i]; + prev_res = pEngine->pSynthesisParameters[Event::destination_vcfr][i]; + FilterLeft.SetParameters( &bqbase, &bqmain, prev_cutoff + CONFIG_FILTER_CUTOFF_MIN, prev_res, pEngine->SampleRate); + FilterRight.SetParameters(&bqbase, &bqmain, prev_cutoff + CONFIG_FILTER_CUTOFF_MIN, prev_res, pEngine->SampleRate); + } } //same as 'pEngine->pBasicFilterParameters[i] = bqbase;' bq = (float*) &pEngine->pBasicFilterParameters[i]; - bq[0] = bqbase.a1; - bq[1] = bqbase.a2; - bq[2] = bqbase.b0; - bq[3] = bqbase.b1; - bq[4] = bqbase.b2; + bq[0] = bqbase.b0; + bq[1] = bqbase.b1; + bq[2] = bqbase.b2; + bq[3] = bqbase.a1; + bq[4] = bqbase.a2; // same as 'pEngine->pMainFilterParameters[i] = bqmain;' bq = (float*) &pEngine->pMainFilterParameters[i]; - bq[0] = bqmain.a1; - bq[1] = bqmain.a2; - bq[2] = bqmain.b0; - bq[3] = bqmain.b1; - bq[4] = bqmain.b2; - } - } - #endif // ENABLE_FILTER - - /** - * Interpolates the input audio data (without looping). - * - * @param Samples - number of sample points to be rendered in this audio - * fragment cycle - * @param pSrc - pointer to input sample data - * @param Skip - number of sample points to skip in output buffer - */ - void Voice::InterpolateNoLoop(uint Samples, sample_t* pSrc, uint Skip) { - int i = Skip; - - // FIXME: assuming either mono or stereo - if (this->pSample->Channels == 2) { // Stereo Sample - while (i < Samples) InterpolateStereo(pSrc, i); - } - else { // Mono Sample - while (i < Samples) InterpolateMono(pSrc, i); + bq[0] = bqmain.b0; + bq[1] = bqmain.b1; + bq[2] = bqmain.b2; + bq[3] = bqmain.a1; + bq[4] = bqmain.a2; } } /** - * Interpolates the input audio data, this method honors looping. + * Synthesizes the current audio fragment for this voice. * * @param Samples - number of sample points to be rendered in this audio * fragment cycle * @param pSrc - pointer to input sample data * @param Skip - number of sample points to skip in output buffer */ - void Voice::InterpolateAndLoop(uint Samples, sample_t* pSrc, uint Skip) { - int i = Skip; - - // FIXME: assuming either mono or stereo - if (pSample->Channels == 2) { // Stereo Sample - if (pSample->LoopPlayCount) { - // render loop (loop count limited) - while (i < Samples && LoopCyclesLeft) { - InterpolateStereo(pSrc, i); - if (Pos > pSample->LoopEnd) { - Pos = pSample->LoopStart + fmod(Pos - pSample->LoopEnd, pSample->LoopSize);; - LoopCyclesLeft--; - } - } - // render on without loop - while (i < Samples) InterpolateStereo(pSrc, i); - } - else { // render loop (endless loop) - while (i < Samples) { - InterpolateStereo(pSrc, i); - if (Pos > pSample->LoopEnd) { - Pos = pSample->LoopStart + fmod(Pos - pSample->LoopEnd, pSample->LoopSize); - } - } - } - } - else { // Mono Sample - if (pSample->LoopPlayCount) { - // render loop (loop count limited) - while (i < Samples && LoopCyclesLeft) { - InterpolateMono(pSrc, i); - if (Pos > pSample->LoopEnd) { - Pos = pSample->LoopStart + fmod(Pos - pSample->LoopEnd, pSample->LoopSize);; - LoopCyclesLeft--; - } - } - // render on without loop - while (i < Samples) InterpolateMono(pSrc, i); - } - else { // render loop (endless loop) - while (i < Samples) { - InterpolateMono(pSrc, i); - if (Pos > pSample->LoopEnd) { - Pos = pSample->LoopStart + fmod(Pos - pSample->LoopEnd, pSample->LoopSize);; - } - } - } - } + void Voice::Synthesize(uint Samples, sample_t* pSrc, uint Skip) { + RunSynthesisFunction(SynthesisMode, *this, Samples, pSrc, Skip); } /** @@ -1047,11 +1040,16 @@ * of a voice, a kill process cannot be cancalled and is therefore * usually used for voice stealing and key group conflicts. * - * @param pKillEvent - event which caused the voice to be killed + * @param itKillEvent - event which caused the voice to be killed */ - void Voice::Kill(Event* pKillEvent) { - if (pTriggerEvent && pKillEvent->FragmentPos() <= pTriggerEvent->FragmentPos()) return; - this->pKillEvent = pKillEvent; + void Voice::Kill(Pool::Iterator& itKillEvent) { + #if CONFIG_DEVMODE + if (!itKillEvent) dmsg(1,("gig::Voice::Kill(): ERROR, !itKillEvent !!!\n")); + if (itKillEvent && !itKillEvent.isValid()) dmsg(1,("gig::Voice::Kill(): ERROR, itKillEvent invalid !!!\n")); + #endif // CONFIG_DEVMODE + + if (itTriggerEvent && itKillEvent->FragmentPos() <= itTriggerEvent->FragmentPos()) return; + this->itKillEvent = itKillEvent; } }} // namespace LinuxSampler::gig