From 818e004b46ec4b6b8d4f80eff32e3562c252bd89 Mon Sep 17 00:00:00 2001
From: mick <mickgrierson@gmail.com>
Date: Thu, 8 Jan 2015 15:49:42 +0000
Subject: just some stuff

---
 main.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index 60b2b6e..e0b1619 100755
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,7 @@
 #include "maximilian.h"
 
 maxiOsc myCounter,mySwitchableOsc;//
+maxiSample beat;
 int CurrentCount;//
 double myOscOutput,myFilteredOutput;//
 double myEnvelopeData[6] = {500,0,1000,500,0,500};//this data will be used to make an envelope. Value and time to value in ms.
@@ -9,6 +10,7 @@ maxiFilter myFilter;
 
 void setup() {//some inits
     myEnvelope.amplitude=myEnvelopeData[0]; //initialise the envelope
+    beat.load("/Users/mick/Documents/workspace/Maximilian/beat2.wav");
 }
 
 void play(double *output) {
@@ -29,5 +31,5 @@ void play(double *output) {
     
     myFilteredOutput=myFilter.lores(myOscOutput,(myEnvelope.line(6, myEnvelopeData)),10);//lores takes an audio input, a frequency and a resonance factor (1-100)
     
-    *output=myFilteredOutput;//point me at your speakers and fire.
+    *output=myFilteredOutput/2+beat.play(-1.,0,beat.length);//point me at your speakers and fire.
 }
-- 
cgit v1.3