clean unnecessary libs includes; add missing amplitude param to Synth class

Author: pd3v

generator.cpp

@@ -7,8 +7,11 @@
 //
 
 #include "generator.h"
+#include "note.h"
 #include <vector>
 #include <math.h>
+#include <math.h>
+#include <cstdlib>
 
 using namespace std;
 
@@ -27,13 +30,19 @@ Gen& Gen::instance(vector<int> scale, function<vector<int>(void)> f)  {
 double Gen::midi_to_freq(double midiNote) {
    return (pow(2, ((midiNote - 69.0) / 12)) * 440.0);
 }
+
+double Gen::midi_to_amp(double midiNote) {
+  double v = midiNote / 127.;
+  
+  return v;
+}
 
 note_t Gen::note()  {
   vector<int> n = Gen::_f();
   note_t note;
- 
+
   note.note = midi_to_freq(n[0] + 12 * n[3]);
-  note.vel = n[1];
+  note.vel = midi_to_amp(n[1]);
   note.dur = n[2];
 
   return note;

generator.h

@@ -9,28 +9,20 @@
 #ifndef generator_h
 #define generator_h
 
-#include <stdio.h>
 #include <vector>
 #include <functional>
 
-using namespace std;
-
-struct note_t {
-  double note;
-  int dur;
-  int vel;
-  int oct;
-};
+class note_t;
 
 class Gen {
-  static vector<int>_scale;
-  static function<vector<int>(void)> _f;
+  static std::vector<int>_scale;
+  static std::function<std::vector<int>(void)> _f;
 
 public:
-  static Gen& instance(vector<int> scale, function<vector<int>(void)> f);
+  static Gen& instance(std::vector<int> scale, std::function<std::vector<int>(void)> f);
   static double midi_to_freq(double midiNote);
+  static double midi_to_amp(double midiNote);
   static note_t note();
 };
 
-
 #endif /* generator_h */

helpers.h

@@ -9,8 +9,6 @@
 #ifndef helpers_hpp
 #define helpers_hpp
 
-#include <stdio.h>
-
 namespace hlp {
   float rand(float min, float max);
   float midi_to_amp(int value);

sequencer.cpp

@@ -6,7 +6,11 @@
 //
 //
 
+#include "maximilian.h"
+#include "note.h"
 #include "sequencer.h"
+#include "generator.h"
+#include "synth.h"
 
 maxiOsc Seq::_tick;
 float Seq::_tempo;
@@ -55,6 +59,5 @@ double Seq::output() {
     _note = _gen.note();
     lastCount = counter;
   }
-  
-  return synth.output(_note.note);
+  return synth.output(_note);
 }

sequencer.h

@@ -9,21 +9,18 @@
 #ifndef sequencer_h
 #define sequencer_h
 
-#include <stdio.h>
-#include <vector>
-#include <functional>
-#include "generator.h"
-#include "synth.h"
-
-using namespace std;
+class maxiOsc;
+class note_t;
+class Gen;
+class Synth;
 
 class Seq {
   static maxiOsc _tick;
   static float _tempo;
   static int _pattern;
-  static vector<int> _scale;
+  static std::vector<int> _scale;
   static note_t _note;
-  static function<vector<int>(void)> _f;
+  static std::function<std::vector<int>(void)> _f;
   static Gen _gen;
 
 public:
@@ -34,7 +31,7 @@ class Seq {
 
   static Seq& instance();
   static Seq& start(float tempo, float pattern);
-  static Seq& gen(vector<int> scale, std::function<vector<int>(void)> f);
+  static Seq& gen(std::vector<int> scale, std::function<std::vector<int>(void)> f);
   static Seq& synthOut();
   static double output();
 

synth.cpp

@@ -8,9 +8,14 @@
 
 #include "synth.h"
 #include "maximilian.h"
+#include "note.h"
 
 maxiOsc _osc;
-  
+
 double Synth::output(double freq) {
   return _osc.triangle(freq);
 }
+
+double Synth::output(note_t note) {
+  return _osc.triangle(note.note)*note.vel;
+}

synth.h

@@ -9,15 +9,19 @@
 #ifndef synth_h
 #define synth_h
 
-#include <stdio.h>
 #include "maximilian.h"
 
+class note_t;
+
 class Synth {
   maxiOsc _osc;
 
 public:
-  Synth() {}
+  Synth() {
+    _osc.triangle(0);
+  }
   double output(double freq);
+  double output(note_t note);
 };
 
 #endif /* synth_h */