Version 4.4.3

This commit is contained in:
Gary Scavone
2013-09-29 23:21:29 +02:00
committed by Stephen Sinclair
parent baca57040b
commit 0aec39260a
223 changed files with 26190 additions and 11130 deletions

View File

@@ -15,9 +15,12 @@
- Bow Position = 4
- Vibrato Frequency = 11
- Vibrato Gain = 1
- Bow Velocity = 100
- Frequency = 101
- Volume = 128
by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
by Perry R. Cook and Gary P. Scavone, 1995-2011.
Contributions by Esteban Maestre, 2011.
*/
/***************************************************/
@@ -28,25 +31,41 @@ namespace stk {
Bowed :: Bowed( StkFloat lowestFrequency )
{
unsigned long length;
length = (long) ( Stk::sampleRate() / lowestFrequency + 1 );
neckDelay_.setMaximumDelay( length );
if ( lowestFrequency <= 0.0 ) {
oStream_ << "Bowed::Bowed: argument is less than or equal to zero!";
handleError( StkError::FUNCTION_ARGUMENT );
}
unsigned long nDelays = (unsigned long) ( Stk::sampleRate() / lowestFrequency );
neckDelay_.setMaximumDelay( nDelays + 1 );
neckDelay_.setDelay( 100.0 );
length >>= 1;
bridgeDelay_.setMaximumDelay( length );
bridgeDelay_.setMaximumDelay( nDelays + 1 );
bridgeDelay_.setDelay( 29.0 );
bowTable_.setSlope(3.0 );
bowTable_.setSlope( 3.0 );
bowTable_.setOffset( 0.001);
bowDown_ = false;
maxVelocity_ = 0.25;
vibrato_.setFrequency( 6.12723 );
vibratoGain_ = 0.0;
stringFilter_.setPole( 0.6 - (0.1 * 22050.0 / Stk::sampleRate()) );
stringFilter_.setPole( 0.75 - (0.2 * 22050.0 / Stk::sampleRate()) );
stringFilter_.setGain( 0.95 );
bodyFilter_.setResonance( 500.0, 0.85, true );
bodyFilter_.setGain( 0.2 );
// Old single body filter
//bodyFilter_.setResonance( 500.0, 0.85, true );
//bodyFilter_.setGain( 0.2 );
// New body filter provided by Esteban Maestre (cascade of second-order sections)
bodyFilters_[0].setCoefficients( 1.0, 1.5667, 0.3133, -0.5509, -0.3925 );
bodyFilters_[1].setCoefficients( 1.0, -1.9537, 0.9542, -1.6357, 0.8697 );
bodyFilters_[2].setCoefficients( 1.0, -1.6683, 0.8852, -1.7674, 0.8735 );
bodyFilters_[3].setCoefficients( 1.0, -1.8585, 0.9653, -1.8498, 0.9516 );
bodyFilters_[4].setCoefficients( 1.0, -1.9299, 0.9621, -1.9354, 0.9590 );
bodyFilters_[5].setCoefficients( 1.0, -1.9800, 0.9888, -1.9867, 0.9923 );
adsr_.setAllTimes( 0.02, 0.005, 0.9, 0.01 );
@@ -54,6 +73,7 @@ Bowed :: Bowed( StkFloat lowestFrequency )
// Necessary to initialize internal variables.
this->setFrequency( 220.0 );
this->clear();
}
Bowed :: ~Bowed( void )
@@ -64,19 +84,21 @@ void Bowed :: clear( void )
{
neckDelay_.clear();
bridgeDelay_.clear();
stringFilter_.clear();
for ( int i=0; i<6; i++ ) bodyFilters_[i].clear();
}
void Bowed :: setFrequency( StkFloat frequency )
{
StkFloat freakency = frequency;
#if defined(_STK_DEBUG_)
if ( frequency <= 0.0 ) {
errorString_ << "Bowed::setFrequency: parameter is less than or equal to zero!";
handleError( StkError::WARNING );
freakency = 220.0;
oStream_ << "Bowed::setFrequency: argument is less than or equal to zero!";
handleError( StkError::WARNING ); return;
}
#endif
// Delay = length - approximate filter delay.
baseDelay_ = Stk::sampleRate() / freakency - 4.0;
baseDelay_ = Stk::sampleRate() / frequency - 4.0;
if ( baseDelay_ <= 0.0 ) baseDelay_ = 0.3;
bridgeDelay_.setDelay( baseDelay_ * betaRatio_ ); // bow to bridge length
neckDelay_.setDelay( baseDelay_ * (1.0 - betaRatio_) ); // bow to nut (finger) length
@@ -84,13 +106,24 @@ void Bowed :: setFrequency( StkFloat frequency )
void Bowed :: startBowing( StkFloat amplitude, StkFloat rate )
{
if ( amplitude <= 0.0 || rate <= 0.0 ) {
oStream_ << "Bowed::startBowing: one or more arguments is less than or equal to zero!";
handleError( StkError::WARNING ); return;
}
adsr_.setAttackRate( rate );
adsr_.keyOn();
maxVelocity_ = 0.03 + ( 0.2 * amplitude );
maxVelocity_ = 0.03 + ( 0.2 * amplitude );
bowDown_ = true;
}
void Bowed :: stopBowing( StkFloat rate )
{
if ( rate <= 0.0 ) {
oStream_ << "Bowed::stopBowing: argument is less than or equal to zero!";
handleError( StkError::WARNING ); return;
}
adsr_.setReleaseRate( rate );
adsr_.keyOff();
}
@@ -99,63 +132,48 @@ void Bowed :: noteOn( StkFloat frequency, StkFloat amplitude )
{
this->startBowing( amplitude, amplitude * 0.001 );
this->setFrequency( frequency );
#if defined(_STK_DEBUG_)
errorString_ << "Bowed::NoteOn: frequency = " << frequency << ", amplitude = " << amplitude << ".";
handleError( StkError::DEBUG_WARNING );
#endif
}
void Bowed :: noteOff( StkFloat amplitude )
{
this->stopBowing( (1.0 - amplitude) * 0.005 );
#if defined(_STK_DEBUG_)
errorString_ << "Bowed::NoteOff: amplitude = " << amplitude << ".";
handleError( StkError::DEBUG_WARNING );
#endif
}
void Bowed :: setVibrato( StkFloat gain )
{
vibratoGain_ = gain;
}
void Bowed :: controlChange( int number, StkFloat value )
{
StkFloat norm = value * ONE_OVER_128;
if ( norm < 0 ) {
norm = 0.0;
errorString_ << "Bowed::controlChange: control value less than zero ... setting to zero!";
handleError( StkError::WARNING );
}
else if ( norm > 1.0 ) {
norm = 1.0;
errorString_ << "Bowed::controlChange: control value greater than 128.0 ... setting to 128.0!";
handleError( StkError::WARNING );
#if defined(_STK_DEBUG_)
if ( value < 0 || ( number != 101 && value > 128.0 ) ) {
oStream_ << "Bowed::controlChange: value (" << value << ") is out of range!";
handleError( StkError::WARNING ); return;
}
#endif
if (number == __SK_BowPressure_) // 2
bowTable_.setSlope( 5.0 - (4.0 * norm) );
else if (number == __SK_BowPosition_) { // 4
betaRatio_ = 0.027236 + (0.2 * norm);
StkFloat normalizedValue = value * ONE_OVER_128;
if ( number == __SK_BowPressure_ ) { // 2
if ( normalizedValue > 0.0 ) bowDown_ = true;
else bowDown_ = false;
bowTable_.setSlope( 5.0 - (4.0 * normalizedValue) );
}
else if ( number == __SK_BowPosition_ ) { // 4
betaRatio_ = normalizedValue;
bridgeDelay_.setDelay( baseDelay_ * betaRatio_ );
neckDelay_.setDelay( baseDelay_ * (1.0 - betaRatio_) );
}
else if (number == __SK_ModFrequency_) // 11
vibrato_.setFrequency( norm * 12.0 );
else if (number == __SK_ModWheel_) // 1
vibratoGain_ = ( norm * 0.4 );
else if ( number == __SK_ModFrequency_ ) // 11
vibrato_.setFrequency( normalizedValue * 12.0 );
else if ( number == __SK_ModWheel_ ) // 1
vibratoGain_ = ( normalizedValue * 0.4 );
else if ( number == 100 ) // 100: set instantaneous bow velocity
adsr_.setTarget( normalizedValue );
else if ( number == 101 ) // 101: set instantaneous value of frequency
this->setFrequency( value );
else if (number == __SK_AfterTouch_Cont_) // 128
adsr_.setTarget(norm);
adsr_.setTarget( normalizedValue );
#if defined(_STK_DEBUG_)
else {
errorString_ << "Bowed::controlChange: undefined control number (" << number << ")!";
oStream_ << "Bowed::controlChange: undefined control number (" << number << ")!";
handleError( StkError::WARNING );
}
#if defined(_STK_DEBUG_)
errorString_ << "Bowed::controlChange: number = " << number << ", value = " << value << ".";
handleError( StkError::DEBUG_WARNING );
#endif
}