--- linuxsampler/trunk/src/engines/gig/Voice.h 2005/10/02 14:40:52 783 +++ linuxsampler/trunk/src/engines/gig/Voice.h 2006/01/15 18:23:11 830 @@ -3,7 +3,7 @@ * LinuxSampler - modular, streaming capable sampler * * * * Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck * - * Copyright (C) 2005 Christian Schoenebeck * + * Copyright (C) 2005, 2006 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 * @@ -122,6 +122,8 @@ int Trigger(EngineChannel* pEngineChannel, Pool::Iterator& itNoteOnEvent, int PitchBend, ::gig::DimensionRegion* pDimRgn, type_t VoiceType, int iKeyGroup); inline bool IsActive() { return PlaybackState; } inline bool IsStealable() { return !itKillEvent && PlaybackState >= playback_state_ram; } + void UpdatePortamentoPos(Pool::Iterator& itNoteOffEvent); + //private: // Types enum playback_state_t { @@ -188,6 +190,7 @@ void processCrossFadeEvent(RTList::Iterator& itEvent); void processCutoffEvent(RTList::Iterator& itEvent); void processResonanceEvent(RTList::Iterator& itEvent); + float getVolume(); inline float CrossfadeAttenuation(uint8_t& CrossfadeControllerValue) { float att = (!pDimRgn->Crossfade.out_end) ? CrossfadeControllerValue / 127.0f /* 0,0,0,0 means no crossfade defined */