Version 4.2.1

This commit is contained in:
Gary Scavone
2009-03-24 23:02:14 -04:00
committed by Stephen Sinclair
parent a6381b9d38
commit 2cbce2d8bd
275 changed files with 8949 additions and 6906 deletions

View File

@@ -19,7 +19,7 @@
type who should worry about this (making
money) worry away.
by Perry R. Cook and Gary P. Scavone, 1995 - 2004.
by Perry R. Cook and Gary P. Scavone, 1995 - 2005.
*/
/***************************************************/
@@ -37,9 +37,7 @@ FM :: FM( unsigned int operators )
twozero_.setB2( -1.0 );
twozero_.setGain( 0.0 );
// Concatenate the STK rawwave path to the rawwave file
vibrato_ = new WaveLoop( (Stk::rawwavePath() + "sinewave.raw").c_str(), true );
vibrato_->setFrequency( 6.0 );
vibrato_.setFrequency( 6.0 );
unsigned int j;
adsr_.resize( nOperators_ );
@@ -77,8 +75,6 @@ FM :: FM( unsigned int operators )
FM :: ~FM()
{
delete vibrato_;
for (unsigned int i=0; i<nOperators_; i++ ) {
delete waves_[i];
delete adsr_[i];
@@ -137,7 +133,7 @@ void FM :: setGain(unsigned int waveIndex, StkFloat gain)
void FM :: setModulationSpeed(StkFloat mSpeed)
{
vibrato_->setFrequency( mSpeed );
vibrato_.setFrequency( mSpeed );
}
void FM :: setModulationDepth(StkFloat mDepth)