--- linuxsampler/trunk/src/engines/gig/Voice.h 2005/06/21 13:33:19 669 +++ linuxsampler/trunk/src/engines/gig/Voice.h 2005/08/16 17:14:25 738 @@ -33,24 +33,40 @@ #include "../../common/Pool.h" #include "../../drivers/audio/AudioOutputDevice.h" #include "../common/BiquadFilter.h" -//#include "EngineGlobals.h" #include "Engine.h" #include "EngineChannel.h" #include "Stream.h" #include "DiskThread.h" - +#include "EGADSR.h" #include "EGDecay.h" #include "Filter.h" -#include "../common/LFO.h" +#include "../common/LFOBase.h" + +// include the appropriate (unsigned) triangle LFO implementation +#if CONFIG_UNSIGNED_TRIANG_ALGO == INT_MATH_SOLUTION +# include "../common/LFOTriangleIntMath.h" +#elif CONFIG_UNSIGNED_TRIANG_ALGO == INT_ABS_MATH_SOLUTION +# include "../common/LFOTriangleIntAbsMath.h" +#elif CONFIG_UNSIGNED_TRIANG_ALGO == DI_HARMONIC_SOLUTION +# include "../common/LFOTriangleDiHarmonic.h" +#else +# error "Unknown or no (unsigned) triangle LFO implementation selected!" +#endif + +// include the appropriate (signed) triangle LFO implementation +#if CONFIG_SIGNED_TRIANG_ALGO == INT_MATH_SOLUTION +# include "../common/LFOTriangleIntMath.h" +#elif CONFIG_SIGNED_TRIANG_ALGO == INT_ABS_MATH_SOLUTION +# include "../common/LFOTriangleIntAbsMath.h" +#elif CONFIG_SIGNED_TRIANG_ALGO == DI_HARMONIC_SOLUTION +# include "../common/LFOTriangleDiHarmonic.h" +#else +# error "Unknown or no (signed) triangle LFO implementation selected!" +#endif namespace LinuxSampler { namespace gig { class Engine; - class EGADSR; - class EGDecay; - class VCAManipulator; - class VCFCManipulator; - class VCOManipulator; /// Reflects a MIDI controller struct midi_ctrl { @@ -59,6 +75,22 @@ float fvalue; ///< Transformed / effective value (e.g. volume level or filter cutoff frequency) }; + #if CONFIG_UNSIGNED_TRIANG_ALGO == INT_MATH_SOLUTION + typedef LFOTriangleIntMath LFOUnsigned; + #elif CONFIG_UNSIGNED_TRIANG_ALGO == INT_ABS_MATH_SOLUTION + typedef LFOTriangleIntAbsMath LFOUnsigned; + #elif CONFIG_UNSIGNED_TRIANG_ALGO == DI_HARMONIC_SOLUTION + typedef LFOTriangleDiHarmonic LFOUnsigned; + #endif + + #if CONFIG_SIGNED_TRIANG_ALGO == INT_MATH_SOLUTION + typedef LFOTriangleIntMath LFOSigned; + #elif CONFIG_SIGNED_TRIANG_ALGO == INT_ABS_MATH_SOLUTION + typedef LFOTriangleIntAbsMath LFOSigned; + #elif CONFIG_SIGNED_TRIANG_ALGO == DI_HARMONIC_SOLUTION + typedef LFOTriangleDiHarmonic LFOSigned; + #endif + /** Gig Voice * * Renders a voice for the Gigasampler format. @@ -71,7 +103,7 @@ type_release_trigger_required, ///< If the key of this voice will be released, it causes a release triggered voice to be spawned type_release_trigger ///< Release triggered voice which cannot be killed by releasing its key }; - + // Attributes type_t Type; ///< Voice Type int MIDIKey; ///< MIDI key number of the key that triggered the voice @@ -108,6 +140,7 @@ double Pos; ///< Current playback position in sample float PitchBase; ///< Basic pitch depth, stays the same for the whole life time of the voice float PitchBend; ///< Current pitch value of the pitchbend wheel + float CutoffBase; ///< Cutoff frequency before control change, EG and LFO are applied ::gig::Sample* pSample; ///< Pointer to the sample to be played back ::gig::DimensionRegion* pDimRgn; ///< Pointer to the articulation information of current dimension region of this voice playback_state_t PlaybackState; ///< When a sample will be triggered, it will be first played from RAM cache and after a couple of sample points it will switch to disk streaming and at the end of a disk stream we have to add null samples, so the interpolator can do it's work correctly @@ -118,37 +151,45 @@ bool RAMLoop; ///< If this voice has a loop defined which completely fits into the cached RAM part of the sample, in this case we handle the looping within the voice class, else if the loop is located in the disk stream part, we let the disk stream handle the looping uint LoopCyclesLeft; ///< In case there is a RAMLoop and it's not an endless loop; reflects number of loop cycles left to be passed uint Delay; ///< Number of sample points the rendering process of this voice should be delayed (jitter correction), will be set to 0 after the first audio fragment cycle - EGADSR* pEG1; ///< Envelope Generator 1 (Amplification) - EGADSR* pEG2; ///< Envelope Generator 2 (Filter cutoff frequency) - EGDecay* pEG3; ///< Envelope Generator 3 (Pitch) + EGADSR EG1; ///< Envelope Generator 1 (Amplification) + EGADSR EG2; ///< Envelope Generator 2 (Filter cutoff frequency) + EGDecay EG3; ///< Envelope Generator 3 (Pitch) Filter FilterLeft; Filter FilterRight; midi_ctrl VCFCutoffCtrl; midi_ctrl VCFResonanceCtrl; - int FilterUpdateCounter; ///< Used to update filter parameters all FILTER_UPDATE_PERIOD samples static const float FILTER_CUTOFF_COEFF; - static const int FILTER_UPDATE_MASK; - VCAManipulator* pVCAManipulator; - VCFCManipulator* pVCFCManipulator; - VCOManipulator* pVCOManipulator; - LFO* pLFO1; ///< Low Frequency Oscillator 1 (Amplification) - LFO* pLFO2; ///< Low Frequency Oscillator 2 (Filter cutoff frequency) - LFO* pLFO3; ///< Low Frequency Oscillator 3 (Pitch) + LFOUnsigned* pLFO1; ///< Low Frequency Oscillator 1 (Amplification) + LFOUnsigned* pLFO2; ///< Low Frequency Oscillator 2 (Filter cutoff frequency) + LFOSigned* pLFO3; ///< Low Frequency Oscillator 3 (Pitch) + bool bLFO1Enabled; ///< Should we use the Amplitude LFO for this voice? + bool bLFO2Enabled; ///< Should we use the Filter Cutoff LFO for this voice? + bool bLFO3Enabled; ///< Should we use the Pitch LFO for this voice? Pool::Iterator itTriggerEvent; ///< First event on the key's list the voice should process (only needed for the first audio fragment in which voice was triggered, after that it will be set to NULL). //public: // FIXME: just made public for debugging (sanity check in Engine::RenderAudio()), should be changed to private before the final release Pool::Iterator itKillEvent; ///< Event which caused this voice to be killed //private: int SynthesisMode; + + float fFinalPitch; + float fFinalVolume; + float fFinalCutoff; + float fFinalResonance; + // Static Methods static float CalculateFilterCutoffCoeff(); - static int CalculateFilterUpdateMask(); // Methods void KillImmediately(); void ProcessEvents(uint Samples); - void CalculateBiquadParameters(uint Samples); void Synthesize(uint Samples, sample_t* pSrc, uint Skip); + void processTransitionEvents(RTList::Iterator& itEvent, uint End); + void processCCEvents(RTList::Iterator& itEvent, uint End); + void processPitchEvent(RTList::Iterator& itEvent); + void processCrossFadeEvent(RTList::Iterator& itEvent); + void processCutoffEvent(RTList::Iterator& itEvent); + void processResonanceEvent(RTList::Iterator& itEvent); inline float CrossfadeAttenuation(uint8_t& CrossfadeControllerValue) { float att = (!pDimRgn->Crossfade.out_end) ? CrossfadeControllerValue / 127.0f /* 0,0,0,0 means no crossfade defined */