Version 4.4.0

include/Flute.h

@@ -1,3 +1,17 @@
+#ifndef STK_FLUTE_H
+#define STK_FLUTE_H
+
+#include "Instrmnt.h"
+#include "JetTable.h"
+#include "DelayL.h"
+#include "OnePole.h"
+#include "PoleZero.h"
+#include "Noise.h"
+#include "ADSR.h"
+#include "SineWave.h"
+
+namespace stk {
+
 /***************************************************/
 /*! \class Flute
     \brief STK flute physical model class.
@@ -18,22 +32,10 @@
        - Vibrato Gain = 1
        - Breath Pressure = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2007.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
 */
 /***************************************************/
 
-#ifndef STK_FLUTE_H
-#define STK_FLUTE_H
-
-#include "Instrmnt.h"
-#include "JetTable.h"
-#include "DelayL.h"
-#include "OnePole.h"
-#include "PoleZero.h"
-#include "Noise.h"
-#include "ADSR.h"
-#include "SineWave.h"
-
 class Flute : public Instrmnt
 {
  public:
@@ -41,45 +43,46 @@ class Flute : public Instrmnt
   /*!
     An StkError will be thrown if the rawwave path is incorrectly set.
   */
-  Flute(StkFloat lowestFrequency);
+  Flute( StkFloat lowestFrequency );
 
   //! Class destructor.
-  ~Flute();
+  ~Flute( void );
 
   //! Reset and clear all internal state.
-  void clear();
+  void clear( void );
 
   //! Set instrument parameters for a particular frequency.
-  void setFrequency(StkFloat frequency);
+  void setFrequency( StkFloat frequency );
 
   //! Set the reflection coefficient for the jet delay (-1.0 - 1.0).
-  void setJetReflection(StkFloat coefficient);
+  void setJetReflection( StkFloat coefficient );
 
   //! Set the reflection coefficient for the air column delay (-1.0 - 1.0).
-  void setEndReflection(StkFloat coefficient);
+  void setEndReflection( StkFloat coefficient );
 
   //! Set the length of the jet delay in terms of a ratio of jet delay to air column delay lengths.
-  void setJetDelay(StkFloat aRatio);
+  void setJetDelay( StkFloat aRatio );
 
   //! Apply breath velocity to instrument with given amplitude and rate of increase.
-  void startBlowing(StkFloat amplitude, StkFloat rate);
+  void startBlowing( StkFloat amplitude, StkFloat rate );
 
   //! Decrease breath velocity with given rate of decrease.
-  void stopBlowing(StkFloat rate);
+  void stopBlowing( StkFloat rate );
 
   //! Start a note with the given frequency and amplitude.
-  void noteOn(StkFloat frequency, StkFloat amplitude);
+  void noteOn( StkFloat frequency, StkFloat amplitude );
 
   //! Stop a note with the given amplitude (speed of decay).
-  void noteOff(StkFloat amplitude);
+  void noteOff( StkFloat amplitude );
 
   //! Perform the control change specified by \e number and \e value (0.0 - 128.0).
-  void controlChange(int number, StkFloat value);
+  void controlChange( int number, StkFloat value );
+
+  //! Compute and return one output sample.
+  StkFloat tick( unsigned int channel = 0 );
 
  protected:
 
-  StkFloat computeSample( void );
-
   DelayL   jetDelay_;
   DelayL   boreDelay_;
   JetTable jetTable_;
@@ -100,4 +103,27 @@ class Flute : public Instrmnt
 
 };
 
+inline StkFloat Flute :: tick( unsigned int )
+{
+  StkFloat pressureDiff;
+  StkFloat breathPressure;
+
+  // Calculate the breath pressure (envelope + noise + vibrato)
+  breathPressure = maxPressure_ * adsr_.tick();
+  breathPressure += breathPressure * ( noiseGain_ * noise_.tick() + vibratoGain_ * vibrato_.tick() );
+
+  StkFloat temp = filter_.tick( boreDelay_.lastOut() );
+  temp = dcBlock_.tick( temp ); // Block DC on reflection.
+
+  pressureDiff = breathPressure - (jetReflection_ * temp);
+  pressureDiff = jetDelay_.tick( pressureDiff );
+  pressureDiff = jetTable_.tick( pressureDiff ) + (endReflection_ * temp);
+  lastFrame_[0] = (StkFloat) 0.3 * boreDelay_.tick( pressureDiff );
+
+  lastFrame_[0] *= outputGain_;
+  return lastFrame_[0];
+}
+
+} // stk namespace
+
 #endif