--- linuxsampler/trunk/src/engines/gig/Voice.cpp 2006/01/15 18:23:11 830 +++ linuxsampler/trunk/src/engines/gig/Voice.cpp 2006/06/25 13:54:17 877 @@ -29,12 +29,6 @@ namespace LinuxSampler { namespace gig { - const float Voice::FILTER_CUTOFF_COEFF(CalculateFilterCutoffCoeff()); - - float Voice::CalculateFilterCutoffCoeff() { - return log(CONFIG_FILTER_CUTOFF_MAX / CONFIG_FILTER_CUTOFF_MIN); - } - Voice::Voice() { pEngine = NULL; pDiskThread = NULL; @@ -104,9 +98,9 @@ // calculate volume 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) + float 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; + volume *= pDimRgn->SampleAttenuation; // the volume of release triggered samples depends on note length if (Type == type_release_trigger) { @@ -114,30 +108,37 @@ pEngineChannel->pMIDIKeyInfo[MIDIKey].NoteOnTime) / pEngine->SampleRate; float attenuation = 1 - 0.01053 * (256 >> pDimRgn->ReleaseTriggerDecay) * noteLength; if (attenuation <= 0) return -1; - Volume *= attenuation; + volume *= attenuation; } // select channel mode (mono or stereo) SYNTHESIS_MODE_SET_CHANNELS(SynthesisMode, pSample->Channels == 2); // get starting crossfade volume level + float crossfadeVolume; switch (pDimRgn->AttenuationController.type) { case ::gig::attenuation_ctrl_t::type_channelaftertouch: - CrossfadeVolume = 1.0f; //TODO: aftertouch not supported yet + crossfadeVolume = 1.0f; //TODO: aftertouch not supported yet break; case ::gig::attenuation_ctrl_t::type_velocity: - CrossfadeVolume = CrossfadeAttenuation(itNoteOnEvent->Param.Note.Velocity); + crossfadeVolume = Engine::CrossfadeCurve[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]); + crossfadeVolume = Engine::CrossfadeCurve[CrossfadeAttenuation(pEngineChannel->ControllerTable[pDimRgn->AttenuationController.controller_number])]; break; case ::gig::attenuation_ctrl_t::type_none: // no crossfade defined default: - CrossfadeVolume = 1.0f; + 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; + VolumeLeft = volume * Engine::PanCurve[64 - pDimRgn->Pan]; + VolumeRight = volume * Engine::PanCurve[64 + pDimRgn->Pan]; + + float subfragmentRate = pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE; + CrossfadeSmoother.trigger(crossfadeVolume, subfragmentRate); + VolumeSmoother.trigger(pEngineChannel->GlobalVolume, subfragmentRate); + PanLeftSmoother.trigger(pEngineChannel->GlobalPanLeft, subfragmentRate); + PanRightSmoother.trigger(pEngineChannel->GlobalPanRight, subfragmentRate); finalSynthesisParameters.dPos = pDimRgn->SampleStartOffset; // offset where we should start playback of sample (0 - 2000 sample points) Pos = pDimRgn->SampleStartOffset; @@ -146,13 +147,15 @@ long cachedsamples = pSample->GetCache().Size / pSample->FrameSize; DiskVoice = cachedsamples < pSample->SamplesTotal; + const DLS::sample_loop_t& loopinfo = pDimRgn->pSampleLoops[0]; + if (DiskVoice) { // voice to be streamed from disk 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 - RAMLoop = (pSample->Loops && pSample->LoopEnd <= MaxRAMPos); + RAMLoop = (pDimRgn->SampleLoops && (loopinfo.LoopStart + loopinfo.LoopLength) <= MaxRAMPos); - if (pDiskThread->OrderNewStream(&DiskStreamRef, pSample, MaxRAMPos, !RAMLoop) < 0) { + if (pDiskThread->OrderNewStream(&DiskStreamRef, pDimRgn, MaxRAMPos, !RAMLoop) < 0) { dmsg(1,("Disk stream order failed!\n")); KillImmediately(); return -1; @@ -161,15 +164,15 @@ } else { // RAM only voice MaxRAMPos = cachedsamples; - RAMLoop = (pSample->Loops != 0); + RAMLoop = (pDimRgn->SampleLoops != 0); dmsg(4,("RAM only voice launched (Looping: %s)\n", (RAMLoop) ? "yes" : "no")); } if (RAMLoop) { loop.uiTotalCycles = pSample->LoopPlayCount; loop.uiCyclesLeft = pSample->LoopPlayCount; - loop.uiStart = pSample->LoopStart; - loop.uiEnd = pSample->LoopEnd; - loop.uiSize = pSample->LoopSize; + loop.uiStart = loopinfo.LoopStart; + loop.uiEnd = loopinfo.LoopStart + loopinfo.LoopLength; + loop.uiSize = loopinfo.LoopLength; } // calculate initial pitch value @@ -223,11 +226,23 @@ pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE); } +#ifdef CONFIG_INTERPOLATE_VOLUME // setup initial volume in synthesis parameters - fFinalVolume = getVolume() * EG1.getLevel(); - finalSynthesisParameters.fFinalVolumeLeft = fFinalVolume * PanLeft; - finalSynthesisParameters.fFinalVolumeRight = fFinalVolume * PanRight; +#ifdef CONFIG_PROCESS_MUTED_CHANNELS + if (pEngineChannel->GetMute()) { + finalSynthesisParameters.fFinalVolumeLeft = 0; + finalSynthesisParameters.fFinalVolumeRight = 0; + } + else +#else + { + float finalVolume = pEngineChannel->GlobalVolume * crossfadeVolume * EG1.getLevel(); + finalSynthesisParameters.fFinalVolumeLeft = finalVolume * VolumeLeft * pEngineChannel->GlobalPanLeft; + finalSynthesisParameters.fFinalVolumeRight = finalVolume * VolumeRight * pEngineChannel->GlobalPanRight; + } +#endif +#endif // setup EG 2 (VCF Cutoff EG) { @@ -316,12 +331,15 @@ pLFO1->ExtController = 0; // no external controller bLFO1Enabled = false; } - if (bLFO1Enabled) pLFO1->trigger(pDimRgn->LFO1Frequency, - start_level_max, - lfo1_internal_depth, - pDimRgn->LFO1ControlDepth, - pDimRgn->LFO1FlipPhase, - pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE); + if (bLFO1Enabled) { + pLFO1->trigger(pDimRgn->LFO1Frequency, + start_level_max, + lfo1_internal_depth, + pDimRgn->LFO1ControlDepth, + pDimRgn->LFO1FlipPhase, + pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE); + pLFO1->update(pLFO1->ExtController ? pEngineChannel->ControllerTable[pLFO1->ExtController] : 0); + } } @@ -359,12 +377,15 @@ pLFO2->ExtController = 0; // no external controller bLFO2Enabled = false; } - if (bLFO2Enabled) pLFO2->trigger(pDimRgn->LFO2Frequency, - start_level_max, - lfo2_internal_depth, - pDimRgn->LFO2ControlDepth, - pDimRgn->LFO2FlipPhase, - pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE); + if (bLFO2Enabled) { + pLFO2->trigger(pDimRgn->LFO2Frequency, + start_level_max, + lfo2_internal_depth, + pDimRgn->LFO2ControlDepth, + pDimRgn->LFO2FlipPhase, + pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE); + pLFO2->update(pLFO2->ExtController ? pEngineChannel->ControllerTable[pLFO2->ExtController] : 0); + } } @@ -402,12 +423,15 @@ pLFO3->ExtController = 0; // no external controller bLFO3Enabled = false; } - if (bLFO3Enabled) pLFO3->trigger(pDimRgn->LFO3Frequency, - start_level_mid, - lfo3_internal_depth, - pDimRgn->LFO3ControlDepth, - false, - pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE); + if (bLFO3Enabled) { + pLFO3->trigger(pDimRgn->LFO3Frequency, + start_level_mid, + lfo3_internal_depth, + pDimRgn->LFO3ControlDepth, + false, + pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE); + pLFO3->update(pLFO3->ExtController ? pEngineChannel->ControllerTable[pLFO3->ExtController] : 0); + } } @@ -507,15 +531,13 @@ else { cvalue = pDimRgn->VCFCutoff; } - cutoff *= float(cvalue) * 0.00787402f; // (1 / 127) - if (cutoff > 1.0) cutoff = 1.0; - cutoff = (cutoff < 0.5 ? cutoff * 4826 - 1 : cutoff * 5715 - 449); - if (cutoff < 1.0) cutoff = 1.0; + cutoff *= float(cvalue); + if (cutoff > 127.0f) cutoff = 127.0f; // calculate resonance - float resonance = (float) (VCFResonanceCtrl.controller ? VCFResonanceCtrl.value : pDimRgn->VCFResonance) * 0.00787f; // 0.0..1.0 + float resonance = (float) (VCFResonanceCtrl.controller ? VCFResonanceCtrl.value : pDimRgn->VCFResonance); - VCFCutoffCtrl.fvalue = cutoff - 1.0; + VCFCutoffCtrl.fvalue = cutoff; VCFResonanceCtrl.fvalue = resonance; } else { @@ -645,7 +667,7 @@ * for the given time. * * @param itEvent - iterator pointing to the next event to be processed - * @param End - youngest time stamp where processing should be stopped + * @param End - youngest time stamp where processing should be stopped */ void Voice::processTransitionEvents(RTList::Iterator& itEvent, uint End) { for (; itEvent && itEvent->FragmentPos() <= End; ++itEvent) { @@ -664,7 +686,7 @@ * the given time. * * @param itEvent - iterator pointing to the next event to be processed - * @param End - youngest time stamp where processing should be stopped + * @param End - youngest time stamp where processing should be stopped */ void Voice::processCCEvents(RTList::Iterator& itEvent, uint End) { for (; itEvent && itEvent->FragmentPos() <= End; ++itEvent) { @@ -687,7 +709,13 @@ } if (pDimRgn->AttenuationController.type == ::gig::attenuation_ctrl_t::type_controlchange && itEvent->Param.CC.Controller == pDimRgn->AttenuationController.controller_number) { - processCrossFadeEvent(itEvent); + CrossfadeSmoother.update(Engine::CrossfadeCurve[CrossfadeAttenuation(itEvent->Param.CC.Value)]); + } + if (itEvent->Param.CC.Controller == 7) { // volume + VolumeSmoother.update(Engine::VolumeCurve[itEvent->Param.CC.Value] * CONFIG_GLOBAL_ATTENUATION); + } else if (itEvent->Param.CC.Controller == 10) { // panpot + PanLeftSmoother.update(Engine::PanCurve[128 - itEvent->Param.CC.Value]); + PanRightSmoother.update(Engine::PanCurve[itEvent->Param.CC.Value]); } } else if (itEvent->Type == Event::type_pitchbend) { // if pitch bend event processPitchEvent(itEvent); @@ -701,31 +729,16 @@ PitchBend = pitch; } - void Voice::processCrossFadeEvent(RTList::Iterator& itEvent) { - CrossfadeVolume = CrossfadeAttenuation(itEvent->Param.CC.Value); - fFinalVolume = getVolume(); - } - - float Voice::getVolume() { - #if CONFIG_PROCESS_MUTED_CHANNELS - return pEngineChannel->GetMute() ? 0 : (Volume * CrossfadeVolume * pEngineChannel->GlobalVolume); - #else - return Volume * CrossfadeVolume * pEngineChannel->GlobalVolume; - #endif - } - void Voice::processCutoffEvent(RTList::Iterator& itEvent) { int ccvalue = itEvent->Param.CC.Value; if (VCFCutoffCtrl.value == ccvalue) return; VCFCutoffCtrl.value == ccvalue; if (pDimRgn->VCFCutoffControllerInvert) ccvalue = 127 - ccvalue; if (ccvalue < pDimRgn->VCFVelocityScale) ccvalue = pDimRgn->VCFVelocityScale; - float cutoff = CutoffBase * float(ccvalue) * 0.00787402f; // (1 / 127) - if (cutoff > 1.0) cutoff = 1.0; - cutoff = (cutoff < 0.5 ? cutoff * 4826 - 1 : cutoff * 5715 - 449); - if (cutoff < 1.0) cutoff = 1.0; + float cutoff = CutoffBase * float(ccvalue); + if (cutoff > 127.0f) cutoff = 127.0f; - VCFCutoffCtrl.fvalue = cutoff - 1.0; // needed for initialization of fFinalCutoff next time + VCFCutoffCtrl.fvalue = cutoff; // needed for initialization of fFinalCutoff next time fFinalCutoff = cutoff; } @@ -733,10 +746,10 @@ // convert absolute controller value to differential const int ctrldelta = itEvent->Param.CC.Value - VCFResonanceCtrl.value; VCFResonanceCtrl.value = itEvent->Param.CC.Value; - const float resonancedelta = (float) ctrldelta * 0.00787f; // 0.0..1.0 + const float resonancedelta = (float) ctrldelta; fFinalResonance += resonancedelta; // needed for initialization of parameter - VCFResonanceCtrl.fvalue = itEvent->Param.CC.Value * 0.00787f; + VCFResonanceCtrl.fvalue = itEvent->Param.CC.Value; } /** @@ -769,13 +782,17 @@ // initialize all final synthesis parameters finalSynthesisParameters.fFinalPitch = PitchBase * PitchBend; - fFinalVolume = getVolume(); fFinalCutoff = VCFCutoffCtrl.fvalue; fFinalResonance = VCFResonanceCtrl.fvalue; // process MIDI control change and pitchbend events for this subfragment processCCEvents(itCCEvent, iSubFragmentEnd); + float fFinalVolume = VolumeSmoother.render() * CrossfadeSmoother.render(); +#ifdef CONFIG_PROCESS_MUTED_CHANNELS + if (pEngineChannel->GetMute()) fFinalVolume = 0; +#endif + // process transition events (note on, note off & sustain pedal) processTransitionEvents(itNoteEvent, iSubFragmentEnd); @@ -817,8 +834,8 @@ // if filter enabled then update filter coefficients if (SYNTHESIS_MODE_GET_FILTER(SynthesisMode)) { - finalSynthesisParameters.filterLeft.SetParameters(fFinalCutoff + 1.0, fFinalResonance, pEngine->SampleRate); - finalSynthesisParameters.filterRight.SetParameters(fFinalCutoff + 1.0, fFinalResonance, pEngine->SampleRate); + finalSynthesisParameters.filterLeft.SetParameters(fFinalCutoff, fFinalResonance, pEngine->SampleRate); + finalSynthesisParameters.filterRight.SetParameters(fFinalCutoff, fFinalResonance, pEngine->SampleRate); } // do we need resampling? @@ -832,12 +849,16 @@ finalSynthesisParameters.uiToGo = iSubFragmentEnd - i; #ifdef CONFIG_INTERPOLATE_VOLUME finalSynthesisParameters.fFinalVolumeDeltaLeft = - (fFinalVolume * PanLeft - finalSynthesisParameters.fFinalVolumeLeft) / finalSynthesisParameters.uiToGo; + (fFinalVolume * VolumeLeft * PanLeftSmoother.render() - + finalSynthesisParameters.fFinalVolumeLeft) / finalSynthesisParameters.uiToGo; finalSynthesisParameters.fFinalVolumeDeltaRight = - (fFinalVolume * PanRight - finalSynthesisParameters.fFinalVolumeRight) / finalSynthesisParameters.uiToGo; + (fFinalVolume * VolumeRight * PanRightSmoother.render() - + finalSynthesisParameters.fFinalVolumeRight) / finalSynthesisParameters.uiToGo; #else - finalSynthesisParameters.fFinalVolumeLeft = fFinalVolume * PanLeft; - finalSynthesisParameters.fFinalVolumeRight = fFinalVolume * PanRight; + finalSynthesisParameters.fFinalVolumeLeft = + fFinalVolume * VolumeLeft * PanLeftSmoother.render(); + finalSynthesisParameters.fFinalVolumeRight = + fFinalVolume * VolumeRight * PanRightSmoother.render(); #endif // render audio for one subfragment RunSynthesisFunction(SynthesisMode, &finalSynthesisParameters, &loop); @@ -851,7 +872,7 @@ if (EG1.active()) { // if sample has a loop and loop start has been reached in this subfragment, send a special event to EG1 to let it finish the attack hold stage - if (pSample->Loops && Pos <= pSample->LoopStart && pSample->LoopStart < newPos) { + if (pDimRgn->SampleLoops && Pos <= pDimRgn->pSampleLoops[0].LoopStart && pDimRgn->pSampleLoops[0].LoopStart < newPos) { EG1.update(EGADSR::event_hold_end, pEngine->SampleRate / CONFIG_DEFAULT_SUBFRAGMENT_SIZE); }