updated volts/octave class

Author: mars

LibSource/VoltsPerOctave.cpp

@@ -5,12 +5,12 @@
 #include <stdint.h>
 
 VoltsPerOctave::VoltsPerOctave() : tune(0.0) {
-  int32_t volts_offset, volts_scalar;
+  int32_t volts_offset = 0, volts_scalar = 0;
   void* args[] = {
     (void*)"VO", (void*)&volts_offset, 
     (void*)"VS", (void*)&volts_scalar
   };
-  int ret = getProgramVector()->serviceCall(OWL_SERVICE_GET_PARAMETERS, args, 2);
+  int ret = getProgramVector()->serviceCall(OWL_SERVICE_GET_PARAMETERS, args, 4);
   if(ret == OWL_SERVICE_OK){
     multiplier = (float)volts_scalar/INT32_MAX;
     offset = (float)volts_offset/INT32_MAX;
@@ -32,6 +32,10 @@ VoltsPerOctave::VoltsPerOctave(float o, float m)
 void VoltsPerOctave::getFrequency(FloatArray samples, FloatArray output){
   ASSERT(output.getSize() >= samples.getSize(), "Output buffer too short");
   // todo: block based implementation
+  // samples.add(-offset, output);
+  // samples.multiply(multiplier, output);
+  // for(int i=0; i<samples.getSize(); ++i)
+  //   output[i] = voltsToHertz(output[i]);
   for(int i=0; i<samples.getSize(); ++i)
     output[i] = getFrequency(samples[i]);
 }

LibSource/VoltsPerOctave.h

@@ -4,6 +4,10 @@
 #include "FloatArray.h"
 #include "basicmaths.h"
 
+/*
+ * Converts samples into volts and frequencies, following 1V/octave tuning.
+ * Tuned to 440Hz. Change base note with setTune(float octave).
+ */
 class VoltsPerOctave {
 private:
   float offset;
@@ -20,13 +24,13 @@ class VoltsPerOctave {
   float getFrequency(float sample){
     return voltsToHerz(sampleToVolts(sample)+tune);
   }
-  void getFrequency(FloatArray samples, FloatArray output);
   float sampleToVolts(float sample){
     return (sample-offset) * multiplier;
   }
   float voltsToHerz(float volts){
     return 440.f * powf(2, volts);
   }
+  void getFrequency(FloatArray samples, FloatArray output);
 };
 
 #endif /* __VoltsPerOctave_hpp__ */