3 files changed, 72 insertions, 8 deletions

diff --git a/main.cpp b/main.cpp
index 059adda..8c975b1 100755
--- a/main.cpp
+++ b/main.cpp
@@ -1,10 +1,74 @@
-currentCount=(int)timer.phasor(8);//this sets up a metronome that ticks 8 times a second
+#include "maximilian.h"
 
+//This shows how to use maximilian to build a polyphonic synth.
 
-if (lastCount!=currentCount) {//if we have a new timer int this sample, play the sound
+//These are the synthesiser bits
+maxiOsc VCO1[6],VCO2[6],LFO1[6],LFO2[6];
+maxiFilter VCF[6];
+maxiEnvelope ADSR[6];
+
+//These are the control values for the envelope
+
+double adsrEnv[8]={1,5,0.125,100,0.125,200,0,1000};
+
+//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
+	
+	
+}
+
+void play(double *output) {
+	
+	mix=0;//we're adding up the samples each update and it makes sense to clear them each time first.
+	
+	//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(0, adsrEnv[0]);//trigger the envelope from the start
+		pitch[voice]=voice+1;
+		voice++;
+        
+		lastCount=0;
+        
+	}
+    
+	//and this is where we build the synth
+	
+	for (int i=0; i<6; i++) {
+		
+        
+        ADSRout[i]=ADSR[i].line(8,adsrEnv);//our ADSR env has 8 value/time pairs.
+        
+        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
     
-    kicktrigger=hit[playHead%16];//get the value out of the array for the kick
-    snaretrigger=snarehit[playHead%16];//same for the snare
-    playHead++;//iterate the playhead
-    lastCount=0;//reset the metrotest
-}
\ No newline at end of file
+}
diff --git a/maximilian.cpp b/maximilian.cpp
index a09df77..56190c6 100644
--- a/maximilian.cpp
+++ b/maximilian.cpp
@@ -379,7 +379,7 @@ bool maxiSample::loadOgg(string fileName, int channel) {
     bool result;
 	readChannel=channel;
     int channelx;
-    cout << fileName << endl;
+//    cout << fileName << endl;
     myDataSize = stb_vorbis_decode_filename(const_cast<char*>(fileName.c_str()), &channelx, &temp);
     result = myDataSize > 0;
     printf("\nchannels = %d\nlength = %d",channelx,myDataSize);
diff --git a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate
index f23697c..8cdac65 100644
--- a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate