--- linuxsampler/trunk/src/engines/gig/Voice.cpp 2005/02/23 19:14:14 407 +++ linuxsampler/trunk/src/engines/gig/Voice.cpp 2005/06/06 16:54:20 614 @@ -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 * @@ -34,13 +35,13 @@ 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 VoiceStealing) { + 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) + #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; 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 + PlaybackState = playback_state_init; // mark voice as triggered, but no audio rendered yet Delay = itNoteOnEvent->FragmentPos(); itTriggerEvent = itNoteOnEvent; itKillEvent = Pool::Iterator(); - itChildVoice = Pool::Iterator(); if (!pRegion) { 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 @@ -161,10 +167,6 @@ 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++) - itChildVoice = pEngine->LaunchVoice(itNoteOnEvent, iNewLayer, ReleaseTriggerVoice, VoiceStealing); break; case ::gig::dimension_velocity: DimValues[i] = itNoteOnEvent->Param.Note.Velocity; @@ -177,76 +179,83 @@ DimValues[i] = (uint) ReleaseTriggerVoice; break; case ::gig::dimension_keyboard: - DimValues[i] = (uint) pEngine->CurrentKeyDimension; + 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; @@ -272,7 +281,7 @@ 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: @@ -289,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) { @@ -324,10 +333,15 @@ 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) + const double velocityAttenuation = pDimRgn->GetVelocityAttenuation(itNoteOnEvent->Param.Note.Velocity); + + Volume = velocityAttenuation / 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; + // the length of the decay and release curves are dependent on the velocity + const double velrelease = 1 / pDimRgn->GetVelocityRelease(itNoteOnEvent->Param.Note.Velocity); + // setup EG 1 (VCA EG) { // get current value of EG1 controller @@ -343,7 +357,7 @@ 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; @@ -357,12 +371,16 @@ pDimRgn->EG1Attack + eg1attack, pDimRgn->EG1Hold, pSample->LoopStart, - pDimRgn->EG1Decay1 + eg1decay, - pDimRgn->EG1Decay2 + eg1decay, + (pDimRgn->EG1Decay1 + eg1decay) * velrelease, + (pDimRgn->EG1Decay2 + eg1decay) * velrelease, pDimRgn->EG1InfiniteSustain, pDimRgn->EG1Sustain, - pDimRgn->EG1Release + eg1release, - Delay); + (pDimRgn->EG1Release + eg1release) * velrelease, + // the SSE synthesis implementation requires + // the vca start to be 16 byte aligned + SYNTHESIS_MODE_GET_IMPLEMENTATION(SynthesisMode) ? + Delay & 0xfffffffc : Delay, + velocityAttenuation); } @@ -381,7 +399,7 @@ 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; @@ -395,12 +413,13 @@ pDimRgn->EG2Attack + eg2attack, false, pSample->LoopStart, - pDimRgn->EG2Decay1 + eg2decay, - pDimRgn->EG2Decay2 + eg2decay, + (pDimRgn->EG2Decay1 + eg2decay) * velrelease, + (pDimRgn->EG2Decay2 + eg2decay) * velrelease, pDimRgn->EG2InfiniteSustain, pDimRgn->EG2Sustain, - pDimRgn->EG2Release + eg2release, - Delay); + (pDimRgn->EG2Release + eg2release) * velrelease, + Delay, + velocityAttenuation); } @@ -442,7 +461,7 @@ pLFO1->Trigger(pDimRgn->LFO1Frequency, lfo1_internal_depth, pDimRgn->LFO1ControlDepth, - pEngine->ControllerTable[pLFO1->ExtController], + pEngineChannel->ControllerTable[pLFO1->ExtController], pDimRgn->LFO1FlipPhase, pEngine->SampleRate, Delay); @@ -480,7 +499,7 @@ pLFO2->Trigger(pDimRgn->LFO2Frequency, lfo2_internal_depth, pDimRgn->LFO2ControlDepth, - pEngine->ControllerTable[pLFO2->ExtController], + pEngineChannel->ControllerTable[pLFO2->ExtController], pDimRgn->LFO2FlipPhase, pEngine->SampleRate, Delay); @@ -518,22 +537,22 @@ pLFO3->Trigger(pDimRgn->LFO3Frequency, lfo3_internal_depth, pDimRgn->LFO3ControlDepth, - pEngine->ControllerTable[pLFO3->ExtController], + pEngineChannel->ControllerTable[pLFO3->ExtController], false, pEngine->SampleRate, Delay); } - #if FORCE_FILTER_USAGE + #if CONFIG_FORCE_FILTER const bool bUseFilter = true; #else // use filter only if instrument file told so const bool bUseFilter = pDimRgn->VCFEnabled; - #endif // FORCE_FILTER_USAGE + #endif // CONFIG_FORCE_FILTER SYNTHESIS_MODE_SET_FILTER(SynthesisMode, bUseFilter); if (bUseFilter) { - #ifdef OVERRIDE_FILTER_CUTOFF_CTRL - VCFCutoffCtrl.controller = OVERRIDE_FILTER_CUTOFF_CTRL; + #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: @@ -569,10 +588,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: @@ -591,23 +610,23 @@ 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 - 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; + ? 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 @@ -616,7 +635,7 @@ } 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; FilterUpdateCounter = -1; @@ -649,7 +668,7 @@ // 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); pEngine->ResetSynthesisParameters(Event::destination_vcfc, VCFCutoffCtrl.fvalue); pEngine->ResetSynthesisParameters(Event::destination_vcfr, VCFResonanceCtrl.fvalue); @@ -658,8 +677,8 @@ 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, itTriggerEvent, this->Pos, this->PitchBase * this->PitchBend, itKillEvent); - pEG2->Process(Samples, pEngine->pMIDIKeyInfo[MIDIKey].pEvents, itTriggerEvent, this->Pos, this->PitchBase * this->PitchBend); + 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); @@ -672,10 +691,14 @@ } if (SYNTHESIS_MODE_GET_FILTER(SynthesisMode)) - CalculateBiquadParameters(Samples); // calculate the final biquad filter parameters + 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) SYNTHESIS_MODE_SET_LOOP(SynthesisMode, true); // enable looping @@ -713,7 +736,7 @@ // add silence sample at the end if we reached the end of the stream (for the interpolator) if (DiskStreamRef.State == Stream::state_end) { - const int maxSampleWordsPerCycle = (pEngine->MaxSamplesPerCycle << MAX_PITCH) * pSample->Channels + 6; // +6 for the interpolator algorithm + 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; @@ -745,9 +768,9 @@ } // Reset synthesis event lists (except VCO, as VCO events apply channel wide currently) - pEngine->pSynthesisEvents[Event::destination_vca]->clear(); - pEngine->pSynthesisEvents[Event::destination_vcfc]->clear(); - pEngine->pSynthesisEvents[Event::destination_vcfr]->clear(); + pEngineChannel->pSynthesisEvents[Event::destination_vca]->clear(); + pEngineChannel->pSynthesisEvents[Event::destination_vcfc]->clear(); + pEngineChannel->pSynthesisEvents[Event::destination_vcfr]->clear(); // Reset delay Delay = 0; @@ -787,17 +810,17 @@ void Voice::ProcessEvents(uint Samples) { // dispatch control change events - RTList::Iterator itCCEvent = pEngine->pCCEvents->first(); + RTList::Iterator itCCEvent = pEngineChannel->pCCEvents->first(); if (Delay) { // skip events that happened before this voice was triggered while (itCCEvent && itCCEvent->FragmentPos() <= Delay) ++itCCEvent; } while (itCCEvent) { if (itCCEvent->Param.CC.Controller) { // if valid MIDI controller if (itCCEvent->Param.CC.Controller == VCFCutoffCtrl.controller) { - *pEngine->pSynthesisEvents[Event::destination_vcfc]->allocAppend() = *itCCEvent; + *pEngineChannel->pSynthesisEvents[Event::destination_vcfc]->allocAppend() = *itCCEvent; } if (itCCEvent->Param.CC.Controller == VCFResonanceCtrl.controller) { - *pEngine->pSynthesisEvents[Event::destination_vcfr]->allocAppend() = *itCCEvent; + *pEngineChannel->pSynthesisEvents[Event::destination_vcfr]->allocAppend() = *itCCEvent; } if (itCCEvent->Param.CC.Controller == pLFO1->ExtController) { pLFO1->SendEvent(itCCEvent); @@ -810,7 +833,7 @@ } if (pDimRgn->AttenuationController.type == ::gig::attenuation_ctrl_t::type_controlchange && itCCEvent->Param.CC.Controller == pDimRgn->AttenuationController.controller_number) { // if crossfade event - *pEngine->pSynthesisEvents[Event::destination_vca]->allocAppend() = *itCCEvent; + *pEngineChannel->pSynthesisEvents[Event::destination_vca]->allocAppend() = *itCCEvent; } } @@ -820,7 +843,7 @@ // process pitch events { - RTList* pVCOEventList = pEngine->pSynthesisEvents[Event::destination_vco]; + RTList* pVCOEventList = pEngineChannel->pSynthesisEvents[Event::destination_vco]; RTList::Iterator itVCOEvent = pVCOEventList->first(); if (Delay) { // skip events that happened before this voice was triggered while (itVCOEvent && itVCOEvent->FragmentPos() <= Delay) ++itVCOEvent; @@ -858,7 +881,7 @@ // process volume / attenuation events (TODO: we only handle and _expect_ crossfade events here ATM !) { - RTList* pVCAEventList = pEngine->pSynthesisEvents[Event::destination_vca]; + 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; @@ -873,7 +896,7 @@ 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 = itVCAEvent->FragmentPos(); i < end; i++) { @@ -887,7 +910,7 @@ // process filter cutoff events { - RTList* pCutoffEventList = pEngine->pSynthesisEvents[Event::destination_vcfc]; + RTList* pCutoffEventList = pEngineChannel->pSynthesisEvents[Event::destination_vcfc]; RTList::Iterator itCutoffEvent = pCutoffEventList->first(); if (Delay) { // skip events that happened before this voice was triggered while (itCutoffEvent && itCutoffEvent->FragmentPos() <= Delay) ++itCutoffEvent; @@ -900,7 +923,7 @@ // calculate the influence length of this event (in sample points) uint end = (itNextCutoffEvent) ? itNextCutoffEvent->FragmentPos() : Samples; - cutoff = exp((float) itCutoffEvent->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 = itCutoffEvent->FragmentPos(); i < end; i++) { @@ -914,7 +937,7 @@ // process filter resonance events { - RTList* pResonanceEventList = pEngine->pSynthesisEvents[Event::destination_vcfr]; + RTList* pResonanceEventList = pEngineChannel->pSynthesisEvents[Event::destination_vcfr]; RTList::Iterator itResonanceEvent = pResonanceEventList->first(); if (Delay) { // skip events that happened before this voice was triggered while (itResonanceEvent && itResonanceEvent->FragmentPos() <= Delay) ++itResonanceEvent; @@ -953,8 +976,8 @@ 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 + FILTER_CUTOFF_MIN, prev_res, pEngine->SampleRate); - FilterRight.SetParameters(&bqbase, &bqmain, prev_cutoff + FILTER_CUTOFF_MIN, 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; @@ -967,8 +990,8 @@ { 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); + 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); } } @@ -1027,9 +1050,10 @@ * @param itKillEvent - event which caused the voice to be killed */ void Voice::Kill(Pool::Iterator& itKillEvent) { - //FIXME: just two sanity checks for debugging, can be removed + #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;