--- linuxsampler/trunk/src/engines/gig/Voice.cpp 2004/09/07 09:32:21 233 +++ linuxsampler/trunk/src/engines/gig/Voice.cpp 2005/03/14 22:35:44 460 @@ -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,13 +23,13 @@ #include "EGADSR.h" #include "Manipulator.h" +#include "../../common/Features.h" +#include "Synthesizer.h" #include "Voice.h" namespace LinuxSampler { namespace gig { - // TODO: no support for crossfades yet - const float Voice::FILTER_CUTOFF_COEFF(CalculateFilterCutoffCoeff()); const int Voice::FILTER_UPDATE_MASK(CalculateFilterUpdateMask()); @@ -47,7 +48,7 @@ Voice::Voice() { pEngine = NULL; pDiskThread = NULL; - Active = false; + PlaybackState = playback_state_end; pEG1 = NULL; pEG2 = NULL; pEG3 = NULL; @@ -57,6 +58,18 @@ pLFO1 = NULL; pLFO2 = NULL; pLFO3 = NULL; + KeyGroup = 0; + SynthesisMode = 0; // set all mode bits to 0 first + // select synthesis implementation (currently either pure C++ or MMX+SSE(1)) + #if ARCH_X86 + SYNTHESIS_MODE_SET_IMPLEMENTATION(SynthesisMode, Features::supportsMMX() && Features::supportsSSE()); + #else + SYNTHESIS_MODE_SET_IMPLEMENTATION(SynthesisMode, false); + #endif + SYNTHESIS_MODE_SET_PROFILING(SynthesisMode, true); + + FilterLeft.Reset(); + FilterRight.Reset(); } Voice::~Voice() { @@ -104,35 +117,47 @@ * Initializes and triggers the voice, a disk stream will be launched if * needed. * - * @param pNoteOnEvent - event that caused triggering of this voice - * @param PitchBend - MIDI detune factor (-8192 ... +8191) - * @param pInstrument - points to the loaded instrument which provides sample wave(s) and articulation data - * @param iLayer - layer number this voice refers to (only if this is a layered sound of course) - * @returns 0 on success, a value < 0 if something failed + * @param pEngineChannel - engine channel on which this voice was ordered + * @param itNoteOnEvent - event that caused triggering of this voice + * @param PitchBend - MIDI detune factor (-8192 ... +8191) + * @param pInstrument - points to the loaded instrument which provides sample wave(s) and articulation data + * @param iLayer - layer number this voice refers to (only if this is a layered sound of course) + * @param ReleaseTriggerVoice - if this new voice is a release trigger voice (optional, default = false) + * @param VoiceStealingAllowed - wether the voice is allowed to steal voices for further subvoices + * @returns 0 on success, a value < 0 if the voice wasn't triggered + * (either due to an error or e.g. because no region is + * defined for the given key) */ - int Voice::Trigger(Event* pNoteOnEvent, int PitchBend, ::gig::Instrument* pInstrument, int iLayer) { + int Voice::Trigger(EngineChannel* pEngineChannel, Pool::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 (itNoteOnEvent->FragmentPos() > pEngine->MaxSamplesPerCycle) { // FIXME: should be removed before the final release (purpose: just a sanity check for debugging) + dmsg(1,("Voice::Trigger(): ERROR, TriggerDelay > Totalsamples\n")); + } - Active = true; - MIDIKey = pNoteOnEvent->Key; + Type = type_normal; + 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 - Pos = 0; - Delay = pNoteOnEvent->FragmentPos(); - pTriggerEvent = pNoteOnEvent; + 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; - Kill(); + dmsg(4, ("gig::Voice: No Region defined for MIDI key %d\n", MIDIKey)); return -1; } + // 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: @@ -140,91 +165,95 @@ 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); break; case ::gig::dimension_velocity: - DimValues[i] = pNoteOnEvent->Velocity; + DimValues[i] = itNoteOnEvent->Param.Note.Velocity; break; case ::gig::dimension_channelaftertouch: DimValues[i] = 0; //TODO: we currently ignore this dimension break; case ::gig::dimension_releasetrigger: - DimValues[i] = 0; //TODO: we currently ignore this dimension + Type = (ReleaseTriggerVoice) ? type_release_trigger : (!iLayer) ? type_release_trigger_required : type_normal; + DimValues[i] = (uint) ReleaseTriggerVoice; break; case ::gig::dimension_keyboard: - DimValues[i] = (uint) pNoteOnEvent->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; @@ -233,9 +262,34 @@ std::cerr << "gig::Voice::Trigger() Error: Unknown dimension\n" << std::flush; } } - ::gig::DimensionRegion* 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) { + case ::gig::attenuation_ctrl_t::type_channelaftertouch: + CrossfadeVolume = 1.0f; //TODO: aftertouch not supported yet + break; + case ::gig::attenuation_ctrl_t::type_velocity: + CrossfadeVolume = CrossfadeAttenuation(itNoteOnEvent->Param.Note.Velocity); + break; + case ::gig::attenuation_ctrl_t::type_controlchange: //FIXME: currently not sample accurate + CrossfadeVolume = CrossfadeAttenuation(pEngineChannel->ControllerTable[pDimRgn->AttenuationController.controller_number]); + break; + case ::gig::attenuation_ctrl_t::type_none: // no crossfade defined + default: + CrossfadeVolume = 1.0f; + } + + 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) // Check if the sample needs disk streaming or is too short for that long cachedsamples = pSample->GetCache().Size / pSample->FrameSize; @@ -253,7 +307,7 @@ if (pDiskThread->OrderNewStream(&DiskStreamRef, pSample, MaxRAMPos, !RAMLoop) < 0) { dmsg(1,("Disk stream order failed!\n")); - Kill(); + KillImmediately(); return -1; } dmsg(4,("Disk voice launched (cached samples: %d, total Samples: %d, MaxRAMPos: %d, RAMLooping: %s)\n", cachedsamples, pSample->SamplesTotal, MaxRAMPos, (RAMLoop) ? "yes" : "no")); @@ -271,15 +325,15 @@ // calculate initial pitch value { - double pitchbasecents = pDimRgn->FineTune * 10; + 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->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) { @@ -293,10 +347,10 @@ eg1controllervalue = 0; // TODO: aftertouch not yet supported break; case ::gig::eg1_ctrl_t::type_velocity: - eg1controllervalue = pNoteOnEvent->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; @@ -315,11 +369,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 @@ -332,10 +388,10 @@ eg2controllervalue = 0; // TODO: aftertouch not yet supported break; case ::gig::eg2_ctrl_t::type_velocity: - eg2controllervalue = pNoteOnEvent->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; @@ -356,7 +412,6 @@ pDimRgn->EG2Release + eg2release, Delay); } - #endif // ENABLE_FILTER // setup EG 3 (VCO EG) @@ -397,13 +452,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; @@ -435,12 +490,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) { @@ -473,19 +528,20 @@ 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; + const bool bUseFilter = true; #else // use filter only if instrument file told so - FilterLeft.Enabled = FilterRight.Enabled = pDimRgn->VCFEnabled; + const bool bUseFilter = pDimRgn->VCFEnabled; #endif // FORCE_FILTER_USAGE - if (pDimRgn->VCFEnabled) { + SYNTHESIS_MODE_SET_FILTER(SynthesisMode, bUseFilter); + if (bUseFilter) { #ifdef OVERRIDE_FILTER_CUTOFF_CTRL VCFCutoffCtrl.controller = OVERRIDE_FILTER_CUTOFF_CTRL; #else // use the one defined in the instrument file @@ -555,38 +611,30 @@ FilterRight.SetType(OVERRIDE_FILTER_TYPE); #endif // 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->Velocity) * (float) pDimRgn->VCFVelocityScale * 6.2E-5f * FILTER_CUTOFF_COEFF) * FILTER_CUTOFF_MAX + ? exp((float) (127 - itNoteOnEvent->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; // calculate resonance float resonance = (float) VCFResonanceCtrl.value * 0.00787f; // 0.0..1.0 if (pDimRgn->VCFKeyboardTracking) { - resonance += (float) (pNoteOnEvent->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; 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 - - // ************************************************ - // TODO: ARTICULATION DATA HANDLING IS MISSING HERE - // ************************************************ return 0; // success } @@ -604,42 +652,46 @@ */ 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 * 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); - #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_ram: { - if (RAMLoop) InterpolateAndLoop(Samples, (sample_t*) pSample->GetCache().pStart, Delay); - else Interpolate(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) { @@ -659,45 +711,61 @@ DiskStreamRef.pStream = pDiskThread->AskForCreatedStream(DiskStreamRef.OrderID); if (!DiskStreamRef.pStream) { std::cout << stderr << "Disk stream not available in time!" << std::endl << std::flush; - Kill(); + 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 << 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 - Interpolate(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: - Kill(); // free voice + std::cerr << "gig::Voice::Render(): entered with playback_state_end, this is a bug!\n" << std::flush; break; } - - #if ENABLE_FILTER // Reset synthesis event lists (except VCO, as VCO events apply channel wide currently) - 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(); } /** @@ -708,11 +776,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(); } /** @@ -725,301 +797,252 @@ 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->Controller) { // if valid MIDI controller - #if ENABLE_FILTER - if (pCCEvent->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 (itCCEvent->Param.CC.Controller == VCFResonanceCtrl.controller) { + *pEngineChannel->pSynthesisEvents[Event::destination_vcfr]->allocAppend() = *itCCEvent; } - if (pCCEvent->Controller == VCFResonanceCtrl.controller) { - pEngine->pSynthesisEvents[Event::destination_vcfr]->alloc_assign(*pCCEvent); + if (itCCEvent->Param.CC.Controller == pLFO1->ExtController) { + pLFO1->SendEvent(itCCEvent); } - #endif // ENABLE_FILTER - if (pCCEvent->Controller == pLFO1->ExtController) { - pLFO1->SendEvent(pCCEvent); + if (itCCEvent->Param.CC.Controller == pLFO2->ExtController) { + pLFO2->SendEvent(itCCEvent); } - #if ENABLE_FILTER - if (pCCEvent->Controller == pLFO2->ExtController) { - pLFO2->SendEvent(pCCEvent); + if (itCCEvent->Param.CC.Controller == pLFO3->ExtController) { + pLFO3->SendEvent(itCCEvent); } - #endif // ENABLE_FILTER - if (pCCEvent->Controller == pLFO3->ExtController) { - pLFO3->SendEvent(pCCEvent); + if (pDimRgn->AttenuationController.type == ::gig::attenuation_ctrl_t::type_controlchange && + 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->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 !) + { + RTList* pVCAEventList = pEngineChannel->pSynthesisEvents[Event::destination_vca]; + RTList::Iterator itVCAEvent = pVCAEventList->first(); + if (Delay) { // skip events that happened before this voice was triggered + while (itVCAEvent && itVCAEvent->FragmentPos() <= Delay) ++itVCAEvent; + } + float crossfadevolume; + while (itVCAEvent) { + RTList::Iterator itNextVCAEvent = itVCAEvent; + ++itNextVCAEvent; + + // calculate the influence length of this event (in sample points) + uint end = (itNextVCAEvent) ? itNextVCAEvent->FragmentPos() : Samples; + + crossfadevolume = CrossfadeAttenuation(itVCAEvent->Param.CC.Value); + + float effective_volume = crossfadevolume * this->Volume * pEngineChannel->GlobalVolume; + + // apply volume value to the volume parameter sequence + for (uint i = itVCAEvent->FragmentPos(); i < end; i++) { + pEngine->pSynthesisParameters[Event::destination_vca][i] = effective_volume; + } + + itVCAEvent = itNextVCAEvent; + } + 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->Value * 0.00787402f * FILTER_CUTOFF_COEFF) * FILTER_CUTOFF_MAX - FILTER_CUTOFF_MIN; + cutoff = exp((float) itCutoffEvent->Param.CC.Value * 0.00787402f * FILTER_CUTOFF_COEFF) * FILTER_CUTOFF_MAX - 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->Value - VCFResonanceCtrl.value; - VCFResonanceCtrl.value = pResonanceEvent->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()->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 + FILTER_CUTOFF_MIN, prev_res, pEngine->SampleRate); + FilterRight.SetParameters(&bqbase, &bqmain, prev_cutoff + 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 + FILTER_CUTOFF_MIN, prev_res, pEngine->SampleRate); + FilterRight.SetParameters(&bqbase, &bqmain, prev_cutoff + 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; + bq[0] = bqmain.b0; + bq[1] = bqmain.b1; + bq[2] = bqmain.b2; + bq[3] = bqmain.a1; + bq[4] = bqmain.a2; } } - #endif // ENABLE_FILTER /** - * Interpolates the input audio data (no loop). + * 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::Interpolate(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) { - InterpolateOneStep_Stereo(pSrc, i, - pEngine->pSynthesisParameters[Event::destination_vca][i], - pEngine->pSynthesisParameters[Event::destination_vco][i], - pEngine->pBasicFilterParameters[i], - pEngine->pMainFilterParameters[i]); - } - } - else { // Mono Sample - while (i < Samples) { - InterpolateOneStep_Mono(pSrc, i, - pEngine->pSynthesisParameters[Event::destination_vca][i], - pEngine->pSynthesisParameters[Event::destination_vco][i], - pEngine->pBasicFilterParameters[i], - pEngine->pMainFilterParameters[i]); - } - } + void Voice::Synthesize(uint Samples, sample_t* pSrc, uint Skip) { + RunSynthesisFunction(SynthesisMode, *this, Samples, pSrc, Skip); } /** - * Interpolates the input audio data, this method honors looping. + * Immediately kill the voice. This method should not be used to kill + * a normal, active voice, because it doesn't take care of things like + * fading down the volume level to avoid clicks and regular processing + * until the kill event actually occured! * - * @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 + * @see Kill() */ - 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) { - InterpolateOneStep_Stereo(pSrc, i, - pEngine->pSynthesisParameters[Event::destination_vca][i], - pEngine->pSynthesisParameters[Event::destination_vco][i], - pEngine->pBasicFilterParameters[i], - pEngine->pMainFilterParameters[i]); - if (Pos > pSample->LoopEnd) { - Pos = pSample->LoopStart + fmod(Pos - pSample->LoopEnd, pSample->LoopSize);; - LoopCyclesLeft--; - } - } - // render on without loop - while (i < Samples) { - InterpolateOneStep_Stereo(pSrc, i, - pEngine->pSynthesisParameters[Event::destination_vca][i], - pEngine->pSynthesisParameters[Event::destination_vco][i], - pEngine->pBasicFilterParameters[i], - pEngine->pMainFilterParameters[i]); - } - } - else { // render loop (endless loop) - while (i < Samples) { - InterpolateOneStep_Stereo(pSrc, i, - pEngine->pSynthesisParameters[Event::destination_vca][i], - pEngine->pSynthesisParameters[Event::destination_vco][i], - pEngine->pBasicFilterParameters[i], - pEngine->pMainFilterParameters[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) { - InterpolateOneStep_Mono(pSrc, i, - pEngine->pSynthesisParameters[Event::destination_vca][i], - pEngine->pSynthesisParameters[Event::destination_vco][i], - pEngine->pBasicFilterParameters[i], - pEngine->pMainFilterParameters[i]); - if (Pos > pSample->LoopEnd) { - Pos = pSample->LoopStart + fmod(Pos - pSample->LoopEnd, pSample->LoopSize);; - LoopCyclesLeft--; - } - } - // render on without loop - while (i < Samples) { - InterpolateOneStep_Mono(pSrc, i, - pEngine->pSynthesisParameters[Event::destination_vca][i], - pEngine->pSynthesisParameters[Event::destination_vco][i], - pEngine->pBasicFilterParameters[i], - pEngine->pMainFilterParameters[i]); - } - } - else { // render loop (endless loop) - while (i < Samples) { - InterpolateOneStep_Mono(pSrc, i, - pEngine->pSynthesisParameters[Event::destination_vca][i], - pEngine->pSynthesisParameters[Event::destination_vco][i], - pEngine->pBasicFilterParameters[i], - pEngine->pMainFilterParameters[i]); - if (Pos > pSample->LoopEnd) { - Pos = pSample->LoopStart + fmod(Pos - pSample->LoopEnd, pSample->LoopSize);; - } - } - } + void Voice::KillImmediately() { + if (DiskVoice && DiskStreamRef.State != Stream::state_unused) { + pDiskThread->OrderDeletionOfStream(&DiskStreamRef); } + Reset(); } /** - * Immediately kill the voice. + * Kill the voice in regular sense. Let the voice render audio until + * the kill event actually occured and then fade down the volume level + * very quickly and let the voice die finally. Unlike a normal release + * of a voice, a kill process cannot be cancalled and is therefore + * usually used for voice stealing and key group conflicts. + * + * @param itKillEvent - event which caused the voice to be killed */ - void Voice::Kill() { - if (DiskVoice && DiskStreamRef.State != Stream::state_unused) { - pDiskThread->OrderDeletionOfStream(&DiskStreamRef); - } - Reset(); + void Voice::Kill(Pool::Iterator& itKillEvent) { + //FIXME: just two sanity checks for debugging, can be removed + if (!itKillEvent) dmsg(1,("gig::Voice::Kill(): ERROR, !itKillEvent !!!\n")); + if (itKillEvent && !itKillEvent.isValid()) dmsg(1,("gig::Voice::Kill(): ERROR, itKillEvent invalid !!!\n")); + + if (itTriggerEvent && itKillEvent->FragmentPos() <= itTriggerEvent->FragmentPos()) return; + this->itKillEvent = itKillEvent; } }} // namespace LinuxSampler::gig