Version 4.0

src/Instrmnt.cpp

@@ -1,45 +1,42 @@
-/******************************************/
-/*  Instrument SuperClass for Toolkit96   */
-/*  Perry R. Cook, Princeton University   */
-/******************************************/
-
-#include "Instrmnt.h"
-
-Instrmnt :: Instrmnt()
-{
-}
-
-Instrmnt :: ~Instrmnt()
-{
-}
-
-void Instrmnt :: noteOn(MY_FLOAT freq, MY_FLOAT amp)
-{
-    printf("Warning!! Instrument Class noteOn here!! %f %f\n",freq,amp);
-}
-
-void Instrmnt :: noteOff(MY_FLOAT amp)
-{
-    printf("Warning!! Instrument Class noteOff here!! %f\n",amp);
-}
-
-void Instrmnt :: setFreq(MY_FLOAT freq)
-{
-    printf("Warning!! Instrument Class setFreq here!! %f\n",freq);
-}
-
-MY_FLOAT Instrmnt :: tick()
-{
-    printf("Warning!! Instrument Class tick here!!\n");
-    return lastOutput;
-}
-
-MY_FLOAT Instrmnt :: lastOut()
-{
-    return lastOutput;
-}
-
-void Instrmnt :: controlChange(int number, MY_FLOAT value)
-{
-    printf("Warning!! Instrument Class Control Change here!! %i %f\n",number,value);
-}
+/***************************************************/
+/*! \class Instrmnt
+    \brief STK instrument abstract base class.
+
+    This class provides a common interface for
+    all STK instruments.
+
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2002.
+*/
+/***************************************************/
+
+#include "Instrmnt.h"
+
+Instrmnt :: Instrmnt()
+{
+}
+
+Instrmnt :: ~Instrmnt()
+{
+}
+
+void Instrmnt :: setFrequency(MY_FLOAT frequency)
+{
+  cerr << "Instrmnt: virtual setFrequency function call!" << endl;
+}
+
+MY_FLOAT Instrmnt :: lastOut() const
+{
+  return lastOutput;
+}
+
+MY_FLOAT *Instrmnt :: tick(MY_FLOAT *vector, unsigned int vectorSize)
+{
+  for (unsigned int i=0; i<vectorSize; i++)
+    vector[i] = tick();
+
+  return vector;
+}
+
+void Instrmnt :: controlChange(int number, MY_FLOAT value)
+{
+}