Implement VCA as a generator.

Author: CarlColglazier

Makefile

@@ -1,6 +1,6 @@
 TARGET = olearia
 
-CPP_SOURCES = src/Olearia.cpp src/Osc.cpp src/Noise.cpp src/LPFilter.cpp
+CPP_SOURCES = src/Olearia.cpp src/Amp.cpp src/Osc.cpp src/Noise.cpp src/LPFilter.cpp
 
 LIBDAISY_DIR = ./libDaisy
 SYSTEM_FILES_DIR = $(LIBDAISY_DIR)/core

src/Amp.cpp

@@ -0,0 +1,13 @@
+#include "Amp.hpp"
+
+void Amp::Init(float sample_rate) {
+	// do nothing here.
+}
+
+void Amp::Control(float in) {
+	amp_ = in;
+}
+
+float Amp::Process(float in) {
+	return in * amp_;
+}

src/Amp.hpp

@@ -0,0 +1,19 @@
+#ifndef GENERATOR_
+#define GENERATOR_
+#include "Generator.hpp"
+#endif
+
+#ifndef VCA_H
+#define VCA_H
+
+class Amp: public Generator {
+public:
+	void Init(float sample_rate);
+	void Control(float in);
+	float Process(float in);
+private:
+	float amp_;
+};
+
+
+#endif

src/Olearia.cpp

@@ -8,15 +8,14 @@
 #include "Generator.hpp"
 #endif
 
+// import generators
+#include "Amp.hpp"
 #include "Osc.hpp"
 #include "Noise.hpp"
 #include "LPFilter.hpp"
 
 #define BUFF_SIZE 16
 
-//constexpr float TWO_PI_F     = (float)M_TWOPI;
-//constexpr float TWO_PI_RECIP = 1.0f / TWO_PI_F;
-
 using namespace daisy;
 
 static uint32_t DSY_QSPI_BSS buff[BUFF_SIZE];
@@ -58,6 +57,9 @@ class Applet {
 
 	void Init() {
 		switch (app) {
+		case App::VCA:
+			gen = new Amp();
+			break;
 		case App::VCO:
 			gen = new Osc();
 			break;
@@ -68,10 +70,7 @@ class Applet {
 			gen = new LPFilter();
 			break;
 		default:
-			gen = new Osc();
-			gen->Init(sample_rate);
-			return;
-			//gen = new Osc();
+			gen = new Amp();
 			break;
 		}
 		gen->Init(sample_rate);
@@ -145,11 +144,7 @@ static void AudioThrough(float **in, float **out, size_t size) {
 	for (int a = 0; a < 4; a++) {
 		applets[a].gen->Control(controls[a]);
 		for (size_t i = 0; i < size; i++) {
-			if (applets[a].app == App::VCA) {
-				out[a][i] = in[a][i] * controls[a];
-			} else {
-				out[a][i] = applets[a].gen->Process(in[a][i]);
-			}
+			out[a][i] = applets[a].gen->Process(in[a][i]);
 		}
 	}