resolving merge conflict

1 files changed, 14 insertions, 5 deletions

diff --git a/maximilian_examples/4.AM2.cpp b/maximilian_examples/4.AM2.cpp
index 4e783d3..2827a28 100755
--- a/maximilian_examples/4.AM2.cpp
+++ b/maximilian_examples/4.AM2.cpp
@@ -1,16 +1,25 @@
 #include "maximilian.h"
 
-//This shows how to use maximilian to do basic amplitude modulation
+//This shows how to use maximilian to do basic amplitude modulation.
+//It also shows what happens when you modulate waves with waves that have frequencies over 20 hz.
+//You start to get interesting effects.
 
 maxiOsc mySine,myOtherSine,myPhasor;//Three oscillators. They can be called anything. They can be any of the available waveforms.
 
 
 void setup() {//some inits
-	//nothing to go here this time	
+    //nothing to go here this time
 }
 
 void play(double *output) {
-	
-	*output=mySine.sinewave(440)*myOtherSine.sinewave(myPhasor.phasor(0.1,0,440));
-	
+    
+    //Using the phasor we can create a ramp, and use this ramp to set the frequency of one of the waves.
+    //When the frequency of the lower waveform passes over the threshold of 20hz, we start to hear two new waveforms.
+    //The frequency of the first new wave is the sum of the two original waves.
+    //The frequency of the second new wave is the difference of the two original waves.
+    //So you hear two new waves, one going up, one going down.
+    
+    output[0]=mySine.sinewave(440)*myOtherSine.sinewave(myPhasor.phasor(0.01,0,440));
+    output[1]=output[0];
+    
 }