From 1082e9eed74507b6eb5a3d0d7ab8a6cdecf40e19 Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Sun, 2 Mar 2014 22:14:34 +0000
Subject: working version for show

---
 basedProject/src/ofApp.h | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'basedProject/src/ofApp.h')

diff --git a/basedProject/src/ofApp.h b/basedProject/src/ofApp.h
index 3e45838..f1ab52a 100644
--- a/basedProject/src/ofApp.h
+++ b/basedProject/src/ofApp.h
@@ -30,12 +30,17 @@ have to track how many frames each key has been pressed for
 #include "ofEvents.h"
 #include "ofxXmlSettings.h"
 //#include "ofx3DModelLoader.h"
+#include "ofxBeat.h"
 
 #include "mapUtils.h"
 #include "viewpoint.h"
 
 #include "audioGlitcher.h"
 
+#define NUM_MODES 2
+#define MODE_RUN 0
+#define MODE_CALIB 1
+
 
 class ofApp : public ofBaseApp{
 
@@ -57,13 +62,19 @@ class ofApp : public ofBaseApp{
 		int activeView;
 		bool fullscreen;
 
-		ofImage xhair;
+		ofImage *checkers;
 
 		void audioIn(float * input, int bufferSize, int nChannels); 
 
-		audioGlitcher glitch;
+		audioGlitcher glitch1;
+		audioGlitcher glitch2;
+		audioGlitcher glitch3;
 
 		ofSoundStream soundStream;
 		vector<float> samples;
 
+		int mode;
+
+		ofxBeat beat;
+		bool kick,snare,hihat;
 };
-- 
cgit v1.2.3