From b356fea1008b13aac7f3d1df876bbce414aa18d7 Mon Sep 17 00:00:00 2001
From: Christian Colglazier <christian@cacolglazier.com>
Date: Sun, 20 Sep 2020 14:51:37 -0400
Subject: [PATCH] Cleaned code

---
 src/droplets/droplet.h         |  2 +-
 src/droplets/noise_droplet.cpp |  2 --
 src/droplets/noise_droplet.h   |  7 +++----
 src/droplets/vco_droplet.cpp   |  7 ++++---
 src/droplets/vco_droplet.h     |  6 +++---
 src/main.cpp                   | 13 +++----------
 src/main.h                     |  5 +++++
 7 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/droplets/droplet.h b/src/droplets/droplet.h
index c7b2306..bce38b0 100644
--- a/src/droplets/droplet.h
+++ b/src/droplets/droplet.h
@@ -14,7 +14,7 @@ using namespace daisy;
 enum class DropletState {kFull, kLeft, kRight};
 
 class Droplet {
- public:
+public:
   DaisyPatch* patch;
   DropletState state;
   Droplet(DaisyPatch*, DropletState);
diff --git a/src/droplets/noise_droplet.cpp b/src/droplets/noise_droplet.cpp
index 77a84f4..51ed5dc 100644
--- a/src/droplets/noise_droplet.cpp
+++ b/src/droplets/noise_droplet.cpp
@@ -1,12 +1,10 @@
 #include "noise_droplet.h"
 
 NoiseDroplet::NoiseDroplet(DaisyPatch* m_patch,
-			   float sample_rate,
 			   DropletState m_state) :
   Droplet(m_patch,
 	  m_state) {
   noise.Init();
-  filter.Init();
 }
 
 void NoiseDroplet::Control() {}
diff --git a/src/droplets/noise_droplet.h b/src/droplets/noise_droplet.h
index fc3dd9e..b1cdbe9 100644
--- a/src/droplets/noise_droplet.h
+++ b/src/droplets/noise_droplet.h
@@ -10,11 +10,10 @@
 #include "../util.h"
 
 class NoiseDroplet: public Droplet {
- private:
+private:
   daisysp::WhiteNoise noise;
-  daisysp::NlFilt filter;
- public:
-  NoiseDroplet(DaisyPatch*, float, DropletState);
+public:
+  NoiseDroplet(DaisyPatch*, DropletState);
   void Control();
   void Process(float**, float**, size_t);
   void Draw();
diff --git a/src/droplets/vco_droplet.cpp b/src/droplets/vco_droplet.cpp
index e8538ae..c8d143e 100644
--- a/src/droplets/vco_droplet.cpp
+++ b/src/droplets/vco_droplet.cpp
@@ -1,8 +1,8 @@
 #include "vco_droplet.h"
 
 VCODroplet::VCODroplet(DaisyPatch* m_patch,
-		       float sample_rate,
-		       DropletState m_state) :
+		       DropletState m_state,
+		       float sample_rate) :
   Droplet(m_patch,
 	  m_state){
   int num_waves = Oscillator::WAVE_LAST;
@@ -46,7 +46,8 @@ void VCODroplet::Process(float** in, float** out, size_t size) {
 
 void VCODroplet::Draw() {
   DrawName(patch, "VCO");
-  WriteString(*patch, 0, 54, Font_6x8, WaveToString(wavectrl.Process()));
+  WriteString(*patch, 0, 54, Font_6x8,
+	      WaveToString(wavectrl.Process()));
 }
 
 std::string VCODroplet::WaveToString(uint8_t wf) {
diff --git a/src/droplets/vco_droplet.h b/src/droplets/vco_droplet.h
index 31d9452..48ede1c 100644
--- a/src/droplets/vco_droplet.h
+++ b/src/droplets/vco_droplet.h
@@ -13,12 +13,12 @@ using namespace daisy;
 using namespace daisysp;
 
 class VCODroplet: public Droplet {
- private:
+private:
   Oscillator osc;
   Parameter freqctrl, wavectrl, ampctrl, finectrl;
   std::string WaveToString(uint8_t);
- public:
-  VCODroplet(DaisyPatch*, float, DropletState);
+public:
+  VCODroplet(DaisyPatch*, DropletState, float);
   void Control();
   void Process(float**, float**, size_t);
   void Draw();
diff --git a/src/main.cpp b/src/main.cpp
index 9cca60c..5f074b9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,14 +2,9 @@
 
 using namespace daisy;
 
-DaisyPatch patch;
-Menu menu(&patch);
-Droplet* droplet;
-float samplerate;
-
 int main(void) {
   patch.Init();
-  samplerate = patch.AudioSampleRate();
+  sample_rate = patch.AudioSampleRate();
   droplet = GetDroplet();
   patch.StartAdc();
   patch.StartAudio(AudioThrough);
@@ -56,7 +51,6 @@ void ProcessOled() {
 static void AudioThrough(float **in,
 			 float **out,
 			 size_t size) {
-  patch.UpdateAnalogControls();
   droplet->Process(in, out, size);
 }
 
@@ -64,12 +58,11 @@ Droplet* GetDroplet() {
   switch(menu.GetState()) {
   case MenuState::kVCO:
     return new VCODroplet(&patch,
-			  samplerate,
-			  DropletState::kFull);
+			  DropletState::kFull,
+			  sample_rate);
   case MenuState::kNoise:
   default:
     return new NoiseDroplet(&patch,
-			    samplerate,
 			    DropletState::kFull);
   }	
 }
diff --git a/src/main.h b/src/main.h
index de68220..c624118 100644
--- a/src/main.h
+++ b/src/main.h
@@ -14,6 +14,11 @@
 #include "droplets/noise_droplet.h"
 #include "droplets/vco_droplet.h"
 
+DaisyPatch patch;
+Menu menu(&patch);
+Droplet* droplet;
+float sample_rate;
+
 void ProcessControls();
 void ProcessOled();
 void ProcessOutputs();