zynaddsubfx

ZynAddSubFX open source synthesizer
Log | Files | Refs | Submodules | LICENSE

commit fa3bcec57709af0cb8c741eebb73137981e573a7
parent 4415003986049b8fe9f01b7f3d722acf025cb948
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Thu, 10 Dec 2009 16:20:10 -0500

Merge branch 'master' into yoshimi

Diffstat:
MChangeLog | 1+
Msrc/DSP/Filter_.h | 2+-
Msrc/DSP/FormantFilter.cpp | 4++++
Msrc/DSP/FormantFilter.h | 1+
4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog @@ -975,4 +975,5 @@ 10 Dec 2009 (Mark McCurry) - Separated out Presets and arrayed Presets to reduce warnings from the Wextra flag + - Minor change to Filter_ and FormantFilter to reduce unwanted warnings diff --git a/src/DSP/Filter_.h b/src/DSP/Filter_.h @@ -33,7 +33,7 @@ class Filter_ virtual void setfreq(REALTYPE frequency) = 0; virtual void setfreq_and_q(REALTYPE frequency, REALTYPE q_) = 0; virtual void setq(REALTYPE q_) = 0; - virtual void setgain(REALTYPE dBgain) {} + virtual void setgain(REALTYPE dBgain) = 0; REALTYPE outgain; private: }; diff --git a/src/DSP/FormantFilter.cpp b/src/DSP/FormantFilter.cpp @@ -191,6 +191,10 @@ void FormantFilter::setq(REALTYPE q_) formant[i]->setq(Qfactor * currentformants[i].q); } +void FormantFilter::setgain(REALTYPE dBgain) +{} + + void FormantFilter::setfreq_and_q(REALTYPE frequency, REALTYPE q_) { Qfactor = q_; diff --git a/src/DSP/FormantFilter.h b/src/DSP/FormantFilter.h @@ -38,6 +38,7 @@ class FormantFilter:public Filter_ void setfreq(REALTYPE frequency); void setfreq_and_q(REALTYPE frequency, REALTYPE q_); void setq(REALTYPE q_); + void setgain(REALTYPE dBgain); void cleanup(); private: