Version 4.2.1

include/Clarinet.h

@@ -18,7 +18,7 @@
        - Vibrato Gain = 1
        - Breath Pressure = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2004.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2005.
 */
 /***************************************************/
 
@@ -31,7 +31,7 @@
 #include "OneZero.h"
 #include "Envelope.h"
 #include "Noise.h"
-#include "WaveLoop.h"
+#include "SineWave.h"
 
 class Clarinet : public Instrmnt
 {
@@ -63,31 +63,19 @@ class Clarinet : public Instrmnt
   //! Stop a note with the given amplitude (speed of decay).
   void noteOff(StkFloat amplitude);
 
-  //! Compute one output sample.
-  StkFloat tick();
-
-  //! Computer \e vectorSize outputs and return them in \e vector.
-  StkFloat *tick(StkFloat *vector, unsigned int vectorSize);
-
-  //! Fill a channel of the StkFrames object with computed outputs.
-  /*!
-    The \c channel argument should be one or greater (the first
-    channel is specified by 1).  An StkError will be thrown if the \c
-    channel argument is zero or it is greater than the number of
-    channels in the StkFrames object.
-  */
-  StkFrames& tick( StkFrames& frames, unsigned int channel = 1 );
-
   //! Perform the control change specified by \e number and \e value (0.0 - 128.0).
   void controlChange(int number, StkFloat value);
 
  protected:
+
+  StkFloat computeSample( void );
+
   DelayL delayLine_;
   ReedTable reedTable_;
   OneZero filter_;
   Envelope envelope_;
   Noise noise_;
-  WaveLoop *vibrato_;
+  SineWave vibrato_;
   long length_;
   StkFloat outputGain_;
   StkFloat noiseGain_;