Version 4.4.0

This commit is contained in:
Gary Scavone
2013-09-29 23:11:39 +02:00
committed by Stephen Sinclair
parent d199342e86
commit eccd8c9981
287 changed files with 11712 additions and 7676 deletions

View File

@@ -1,3 +1,10 @@
#ifndef STK_TUBEBELL_H
#define STK_TUBEBELL_H
#include "FM.h"
namespace stk {
/***************************************************/
/*! \class TubeBell
\brief STK tubular bell (orchestral chime) FM
@@ -26,15 +33,10 @@
type who should worry about this (making
money) worry away.
by Perry R. Cook and Gary P. Scavone, 1995 - 2007.
by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
*/
/***************************************************/
#ifndef STK_TUBEBELL_H
#define STK_TUBEBELL_H
#include "FM.h"
class TubeBell : public FM
{
public:
@@ -42,17 +44,45 @@ class TubeBell : public FM
/*!
An StkError will be thrown if the rawwave path is incorrectly set.
*/
TubeBell();
TubeBell( void );
//! Class destructor.
~TubeBell();
~TubeBell( void );
//! Start a note with the given frequency and amplitude.
void noteOn(StkFloat frequency, StkFloat amplitude);
void noteOn( StkFloat frequency, StkFloat amplitude );
//! Compute and return one output sample.
StkFloat tick( unsigned int channel = 0 );
protected:
StkFloat computeSample( void );
};
inline StkFloat TubeBell :: tick( unsigned int )
{
StkFloat temp, temp2;
temp = gains_[1] * adsr_[1]->tick() * waves_[1]->tick();
temp = temp * control1_;
waves_[0]->addPhaseOffset( temp );
waves_[3]->addPhaseOffset( twozero_.lastOut() );
temp = gains_[3] * adsr_[3]->tick() * waves_[3]->tick();
twozero_.tick( temp );
waves_[2]->addPhaseOffset( temp );
temp = ( 1.0 - (control2_ * 0.5)) * gains_[0] * adsr_[0]->tick() * waves_[0]->tick();
temp += control2_ * 0.5 * gains_[2] * adsr_[2]->tick() * waves_[2]->tick();
// Calculate amplitude modulation and apply it to output.
temp2 = vibrato_.tick() * modDepth_;
temp = temp * (1.0 + temp2);
lastFrame_[0] = temp * 0.5;
return lastFrame_[0];
}
} // stk namespace
#endif