Version 4.2.0

This commit is contained in:
Gary Scavone
2009-03-24 23:02:14 -04:00
committed by Stephen Sinclair
parent cf06b7598b
commit a6381b9d38
281 changed files with 17152 additions and 12000 deletions

View File

@@ -8,7 +8,7 @@
frequency response while maintaining a constant
filter gain.
by Perry R. Cook and Gary P. Scavone, 1995 - 2002.
by Perry R. Cook and Gary P. Scavone, 1995 - 2004.
*/
/***************************************************/
@@ -17,9 +17,11 @@
BiQuad :: BiQuad() : Filter()
{
MY_FLOAT B[3] = {1.0, 0.0, 0.0};
MY_FLOAT A[3] = {1.0, 0.0, 0.0};
Filter::setCoefficients( 3, B, 3, A );
std::vector<StkFloat> b(3, 0.0);
std::vector<StkFloat> a(3, 0.0);
b[0] = 1.0;
a[0] = 1.0;
Filter::setCoefficients( b, a );
}
BiQuad :: ~BiQuad()
@@ -31,90 +33,92 @@ void BiQuad :: clear(void)
Filter::clear();
}
void BiQuad :: setB0(MY_FLOAT b0)
void BiQuad :: setB0(StkFloat b0)
{
b[0] = b0;
b_[0] = b0;
}
void BiQuad :: setB1(MY_FLOAT b1)
void BiQuad :: setB1(StkFloat b1)
{
b[1] = b1;
b_[1] = b1;
}
void BiQuad :: setB2(MY_FLOAT b2)
void BiQuad :: setB2(StkFloat b2)
{
b[2] = b2;
b_[2] = b2;
}
void BiQuad :: setA1(MY_FLOAT a1)
void BiQuad :: setA1(StkFloat a1)
{
a[1] = a1;
a_[1] = a1;
}
void BiQuad :: setA2(MY_FLOAT a2)
void BiQuad :: setA2(StkFloat a2)
{
a[2] = a2;
a_[2] = a2;
}
void BiQuad :: setResonance(MY_FLOAT frequency, MY_FLOAT radius, bool normalize)
void BiQuad :: setResonance(StkFloat frequency, StkFloat radius, bool normalize)
{
a[2] = radius * radius;
a[1] = -2.0 * radius * cos(TWO_PI * frequency / Stk::sampleRate());
a_[2] = radius * radius;
a_[1] = -2.0 * radius * cos(TWO_PI * frequency / Stk::sampleRate());
if ( normalize ) {
// Use zeros at +- 1 and normalize the filter peak gain.
b[0] = 0.5 - 0.5 * a[2];
b[1] = 0.0;
b[2] = -b[0];
b_[0] = 0.5 - 0.5 * a_[2];
b_[1] = 0.0;
b_[2] = -b_[0];
}
}
void BiQuad :: setNotch(MY_FLOAT frequency, MY_FLOAT radius)
void BiQuad :: setNotch(StkFloat frequency, StkFloat radius)
{
// This method does not attempt to normalize the filter gain.
b[2] = radius * radius;
b[1] = (MY_FLOAT) -2.0 * radius * cos(TWO_PI * (double) frequency / Stk::sampleRate());
b_[2] = radius * radius;
b_[1] = (StkFloat) -2.0 * radius * cos(TWO_PI * (double) frequency / Stk::sampleRate());
}
void BiQuad :: setEqualGainZeroes()
{
b[0] = 1.0;
b[1] = 0.0;
b[2] = -1.0;
b_[0] = 1.0;
b_[1] = 0.0;
b_[2] = -1.0;
}
void BiQuad :: setGain(MY_FLOAT theGain)
void BiQuad :: setGain(StkFloat gain)
{
Filter::setGain(theGain);
Filter::setGain(gain);
}
MY_FLOAT BiQuad :: getGain(void) const
StkFloat BiQuad :: getGain(void) const
{
return Filter::getGain();
}
MY_FLOAT BiQuad :: lastOut(void) const
StkFloat BiQuad :: lastOut(void) const
{
return Filter::lastOut();
}
MY_FLOAT BiQuad :: tick(MY_FLOAT sample)
StkFloat BiQuad :: tick(StkFloat sample)
{
inputs[0] = gain * sample;
outputs[0] = b[0] * inputs[0] + b[1] * inputs[1] + b[2] * inputs[2];
outputs[0] -= a[2] * outputs[2] + a[1] * outputs[1];
inputs[2] = inputs[1];
inputs[1] = inputs[0];
outputs[2] = outputs[1];
outputs[1] = outputs[0];
inputs_[0] = gain_ * sample;
outputs_[0] = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
outputs_[0] -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
inputs_[2] = inputs_[1];
inputs_[1] = inputs_[0];
outputs_[2] = outputs_[1];
outputs_[1] = outputs_[0];
return outputs[0];
return outputs_[0];
}
MY_FLOAT *BiQuad :: tick(MY_FLOAT *vector, unsigned int vectorSize)
StkFloat *BiQuad :: tick(StkFloat *vector, unsigned int vectorSize)
{
for (unsigned int i=0; i<vectorSize; i++)
vector[i] = tick(vector[i]);
return vector;
return Filter::tick( vector, vectorSize );
}
StkFrames& BiQuad :: tick( StkFrames& frames, unsigned int channel )
{
return Filter::tick( frames, channel );
}