2 files changed, 68 insertions, 8 deletions
diff --git a/main.cpp b/main.cpp
index ea51186..fefc261 100755
--- a/main.cpp
+++ b/main.cpp
@@ -1,21 +1,81 @@
 #include "maximilian.h"
 
-maxiSample mySample;
+//This shows how to use maximilian to build a polyphonic synth.
+
+//These are the synthesiser bits
+maxiOsc VCO1[6],VCO2[6],LFO1[6],LFO2[6];
+maxiFilter VCF[6];
+maxiEnv ADSR[6];
+
+//This is a bunch of control signals so that we can hear something
+
+maxiOsc timer;//this is the metronome
+int currentCount,lastCount,voice=0;//these values are used to check if we have a new beat this sample
+
+//and these are some variables we can use to pass stuff around
+
+double VCO1out[6],VCO2out[6],LFO1out[6],LFO2out[6],VCFout[6],ADSRout[6],mix,pitch[6];
 
 
 void setup() {//some inits
     
-    mySample.load("/Users/michaelgrierson/Documents/workspace/coursera2/full-stack-mooc-5/code/week2/music_machine_2015/public/bassline32bit.wav");
-    cout << mySample.myBitsPerSample;
-
+    for (int i=0;i<6;i++) {
+        
+        ADSR[i].setAttack(0);
+        ADSR[i].setDecay(200);
+        ADSR[i].setSustain(0.2);
+        ADSR[i].setRelease(2000);
+        
+    }
 }
 
 void play(double *output) {
     
+    mix=0;//we're adding up the samples each update and it makes sense to clear them each time first.
     
-    output[0]=mySample.play(2);
+    //so this first bit is just a basic metronome so we can hear what we're doing.
+    
+    currentCount=(int)timer.phasor(8);//this sets up a metronome that ticks 8 times a second
+    
+    if (lastCount!=currentCount) {//if we have a new timer int this sample, play the sound
+        
+        if (voice==6) {
+            voice=0;
+        }
+        
+        ADSR[voice].trigger=1;//trigger the envelope from the start
+        pitch[voice]=voice+1;
+        voice++;
+        
+    }
+    
+    //and this is where we build the synth
+    
+    for (int i=0; i<6; i++) {
+        
+        
+        ADSRout[i]=ADSR[i].adsr(1.,ADSR[i].trigger);//our ADSR env is passed a constant signal of 1 to generate the transient.
+        
+        LFO1out[i]=LFO1[i].sinebuf(0.2);//this lfo is a sinewave at 0.2 hz
+        
+        VCO1out[i]=VCO1[i].pulse(55*pitch[i],0.6);//here's VCO1. it's a pulse wave at 55 hz, with a pulse width of 0.6
+        VCO2out[i]=VCO2[i].pulse((110*pitch[i])+LFO1out[i],0.2);//here's VCO2. it's a pulse wave at 110hz with LFO modulation on the frequency, and width of 0.2
+        
+        
+        VCFout[i]=VCF[i].lores((VCO1out[i]+VCO2out[i])*0.5, 250+((pitch[i]+LFO1out[i])*1000), 10);//now we stick the VCO's into the VCF, using the ADSR as the filter cutoff
+        
+        mix+=VCFout[i]*ADSRout[i]/6;//finally we add the ADSR as an amplitude modulator
+        
+        
+    }
+    
+    output[0]=mix*0.5;//left channel
+    output[1]=mix*0.5;//right channel
+    
+    
+    // This just sends note-off messages.
+    for (int i=0; i<6; i++) {
+        ADSR[i].trigger=0;
+    }
     
-    output[1]=output[0];
-
 }
-
diff --git a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/michaelgrierson.xcuserdatad/UserInterfaceState.xcuserstate b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/michaelgrierson.xcuserdatad/UserInterfaceState.xcuserstate
index c3b8e23..86d07c4 100644
--- a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/michaelgrierson.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/michaelgrierson.xcuserdatad/UserInterfaceState.xcuserstate