refined old envelopes

1 files changed, 9 insertions, 9 deletions

diff --git a/main.cpp b/main.cpp
index d7ca862..ac320ba 100755
--- a/main.cpp
+++ b/main.cpp
@@ -1,21 +1,21 @@
 #include "maximilian.h"
 
-maxiSample beats; //We give our sample a name. It's called beats this time. We could have loads of them, but they have to have different names.
+maxiOsc myOsc;
+maxiEnvelope myEnv;
+int counter;
+double tv[8] = {1,1,0,1,1,2,0,4};
 
 void setup() {//some inits
     
-    beats.load("/Users/michaelgrierson/Documents/workspace/Maximilian/beat2.wav");//load in your samples. Provide the full path to a wav file.
-    printf("Summary:\n%s", beats.getSummary());//get info on samples if you like.
-    cout << beats.getLength();
-    
 }
 
 void play(double *output) {//this is where the magic happens. Very slow magic.
     
-    //output[0]=beats.play();//just play the file. Looping is default for all play functions.
-    output[0]=beats.play(0.68);//play the file with a speed setting. 1. is normal speed.
-    //output[0]=beats.play(0.5,0,44100);//linear interpolationplay with a frequency input, start point and end point. Useful for syncing.
-    //output[0]=beats.play4(0.5,0,44100);//cubic interpolation play with a frequency input, start point and end point. Useful for syncing.
+    
+    
+    double out = myEnv.ramps(tv);
+    
+    output[0]=myOsc.sinewave(440)*out;
     
     output[1]=output[0];
 }