sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add v1 LFOs in voices

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-03-10 14:49:29 +01:00
parent 3957668d0f
commit ef1a548d98
2 changed files with 98 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/sfizz/Voice.cpp
View file

@ -241,6 +241,10 @@ struct Voice::Impl
std::vector<std::unique_ptr<LFO>> lfos_;
std::vector<std::unique_ptr<FlexEnvelope>> flexEGs_;
std::unique_ptr<LFO> lfoAmplitude_;
std::unique_ptr<LFO> lfoPitch_;
std::unique_ptr<LFO> lfoFilter_;
ADSREnvelope egAmplitude_;
std::unique_ptr<ADSREnvelope> egPitch_;
std::unique_ptr<ADSREnvelope> egFilter_;
@ -595,6 +599,12 @@ void Voice::setSampleRate(float sampleRate) noexcept
for (auto& lfo : impl.lfos_)
lfo->setSampleRate(sampleRate);
if (auto* lfo = impl.lfoAmplitude_.get())
lfo->setSampleRate(sampleRate);
if (auto* lfo = impl.lfoPitch_.get())
lfo->setSampleRate(sampleRate);
if (auto* lfo = impl.lfoFilter_.get())
lfo->setSampleRate(sampleRate);
for (auto& filter : impl.filters_)
filter.setSampleRate(sampleRate);
@ -1640,6 +1650,45 @@ void Voice::setFilterEGEnabledPerVoice(bool haveFilterEG)
impl.egFilter_.reset();
}
void Voice::setAmplitudeLFOEnabledPerVoice(bool haveAmplitudeLFO)
{
Impl& impl = *impl_;
Resources& res = impl.resources_;
if (haveAmplitudeLFO) {
LFO* lfo = new LFO(res.bufferPool, &res.beatClock, &res.modMatrix);
impl.lfoAmplitude_.reset(lfo);
lfo->setSampleRate(impl.sampleRate_);
}
else
impl.lfoAmplitude_.reset();
}
void Voice::setPitchLFOEnabledPerVoice(bool havePitchLFO)
{
Impl& impl = *impl_;
Resources& res = impl.resources_;
if (havePitchLFO) {
LFO* lfo = new LFO(res.bufferPool, &res.beatClock, &res.modMatrix);
impl.lfoPitch_.reset(lfo);
lfo->setSampleRate(impl.sampleRate_);
}
else
impl.lfoPitch_.reset();
}
void Voice::setFilterLFOEnabledPerVoice(bool haveFilterLFO)
{
Impl& impl = *impl_;
Resources& res = impl.resources_;
if (haveFilterLFO) {
LFO* lfo = new LFO(res.bufferPool, &res.beatClock, &res.modMatrix);
impl.lfoFilter_.reset(lfo);
lfo->setSampleRate(impl.sampleRate_);
}
else
impl.lfoFilter_.reset();
}
void Voice::Impl::setupOscillatorUnison()
{
const int m = region_->oscillatorMulti;
@ -1855,6 +1904,24 @@ Duration Voice::getLastPanningDuration() const noexcept
return impl.panningDuration_;
}
LFO* Voice::getAmplitudeLFO()
{
Impl& impl = *impl_;
return impl.lfoAmplitude_.get();
}
LFO* Voice::getPitchLFO()
{
Impl& impl = *impl_;
return impl.lfoPitch_.get();
}
LFO* Voice::getFilterLFO()
{
Impl& impl = *impl_;
return impl.lfoFilter_.get();
}
ADSREnvelope* Voice::getAmplitudeEG()
{
Impl& impl = *impl_;

31
src/sfizz/Voice.h
View file

@ -305,6 +305,24 @@ public:
* @param haveFilterEG
*/
void setFilterEGEnabledPerVoice(bool haveFilterEG);
/**
* @brief Set whether SFZv1 amplitude LFO is enabled on this voice
*
* @param haveAmplitudeLFO
*/
void setAmplitudeLFOEnabledPerVoice(bool haveAmplitudeLFO);
/**
* @brief Set whether SFZv1 pitch LFO is enabled on this voice
*
* @param havePitchLFO
*/
void setPitchLFOEnabledPerVoice(bool havePitchLFO);
/**
* @brief Set whether SFZv1 filter LFO is enabled on this voice
*
* @param haveFilterLFO
*/
void setFilterLFOEnabledPerVoice(bool haveFilterLFO);
/**
* @brief Release the voice after a given delay
*
@ -333,6 +351,19 @@ public:
Duration getLastFilterDuration() const noexcept;
Duration getLastPanningDuration() const noexcept;
/**
* @brief Get the SFZv1 amplitude LFO, if existing
*/
LFO* getAmplitudeLFO();
/**
* @brief Get the SFZv1 pitch LFO, if existing
*/
LFO* getPitchLFO();
/**
* @brief Get the SFZv1 filter LFO, if existing
*/
LFO* getFilterLFO();
/**
* @brief Get the SFZv1 amplitude EG, if existing
*/