More major repair work. New OS X 10.10 SDK example project. New project structure. New Tutorials / Examples.

1 files changed, 58 insertions, 51 deletions

diff --git a/maximilian_examples/15.polysynth.cpp b/maximilian_examples/15.polysynth.cpp
index 6cb5c44..3e278cb 100644
--- a/maximilian_examples/15.polysynth.cpp
+++ b/maximilian_examples/15.polysynth.cpp
@@ -5,11 +5,7 @@
 //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};
+maxiEnv ADSR[6];
 
 //This is a bunch of control signals so that we can hear something
 
@@ -22,53 +18,64 @@ double VCO1out[6],VCO2out[6],LFO1out[6],LFO2out[6],VCFout[6],ADSRout[6],mix,pitc
 
 
 void setup() {//some inits
-	
-	
+    
+    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.
-	
-	//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
-
+    
+    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=1;//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].adsr(1.,ADSR[i].trigger);//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
+    
+    for (int i=0; i<6; i++) {
+        ADSR[i].trigger=0;
+    }
+    
 }