Version 4.2.1

include/Modulate.h

@@ -6,7 +6,7 @@
     modulations to give a nice, natural human
     modulation function.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2004.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2005.
 */
 /***************************************************/
 
@@ -14,7 +14,7 @@
 #define STK_MODULATE_H
 
 #include "Generator.h"
-#include "WaveLoop.h"
+#include "SineWave.h"
 #include "SubNoise.h"
 #include "OnePole.h"
 
@@ -42,23 +42,11 @@ class Modulate : public Generator
   //! Set the random modulation gain.
   void setRandomGain(StkFloat gain);
 
-  //! Compute one output sample.
-  StkFloat tick();
-
-  //! Compute \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 );
-
  protected:
-  WaveLoop *vibrato_;
+
+  StkFloat computeSample( void );
+
+  SineWave vibrato_;
   SubNoise noise_;
   OnePole  filter_;
   StkFloat vibratoGain_;