Version 4.2.1

include/Whistle.h

@@ -23,7 +23,7 @@
 #include "Sphere.h"
 #include "Vector3D.h"
 #include "Noise.h"
-#include "WaveLoop.h"
+#include "SineWave.h"
 #include "OnePole.h"
 #include "Envelope.h"
 
@@ -57,25 +57,12 @@ public:
   //! 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:  
+protected:
+
+  StkFloat computeSample( void );
 
 	Vector3D *tempVectorP_;
   Vector3D tempVector_;
@@ -85,7 +72,7 @@ protected:
   Sphere can_;           // Declare a Spherical "can".
   Sphere pea_, bumper_;  // One spherical "pea", and a spherical "bumper".
 
-  WaveLoop *sine_;
+  SineWave sine_;
 
   StkFloat baseFrequency_;
   StkFloat noiseGain_;