From 3bf0663e94b6335cb748a50a8b95e8a98d2a0630 Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Thu, 24 Jan 2013 18:07:04 +0000
Subject: folded kinect into main branch

---
 liveengineUnmapped/src/testApp.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'liveengineUnmapped/src/testApp.h')

diff --git a/liveengineUnmapped/src/testApp.h b/liveengineUnmapped/src/testApp.h
index e3ca574..3c9dfc1 100755
--- a/liveengineUnmapped/src/testApp.h
+++ b/liveengineUnmapped/src/testApp.h
@@ -140,7 +140,6 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		bool fullscreenoutput;
 
 		float lastnoteTime;
-		float decayTime;
 
 		int fadetime;
 		int rotate;
@@ -178,6 +177,8 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		ofxButton resetFBscale;
 		ofxIntSlider fS;
 		ofxParameter<int> fadeScale;
+		ofxFloatSlider dT;
+		ofxParameter<float> decayTime;
 		ofxToggle oscScale;
 		ofxToggle breakOsc;
 		ofxToggle randomOsc;
-- 
cgit v1.2.3