From d6a8d1d93c6b5abd8b69985f182667c2994f13fd Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Wed, 29 May 2013 00:28:36 +0100
Subject: nearly ready

---
 src/testApp.h | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'src/testApp.h')

diff --git a/src/testApp.h b/src/testApp.h
index 376cdee..3148eb2 100755
--- a/src/testApp.h
+++ b/src/testApp.h
@@ -63,10 +63,16 @@ class testApp : public ofxFensterListener {
 		ofxIntSlider bS;
 		ofxParameter<int> brightSlider;
 
-		ofxToggle fillgrey;
+		ofxToggle fill;
+
+		ofxFloatSlider sF;
+		ofxParameter<float> slidFreq;
+
+		ofxToggle wave;
+
+		ofxFloatSlider sT;
+		ofxParameter<float> slidThickness;
 
-		ofxFloatSlider gF;
-		ofxParameter<float> greyFreq;
 
 		void create1port(bool & pressed);
 		void create2port(bool & pressed);
@@ -76,11 +82,14 @@ class testApp : public ofxFensterListener {
 
 		vector<viewport> viewports;
 		vpcontrol control;
-		int windowsize;
+		int windowsize,previewscale;
 
-		vector<ofColor> palette;
+		//
 
-		void loadfilepalette(string &palette);
+		void audioIn(float * input, int bufferSize, int nChannels); 
+	
+		
+		ofSoundStream soundStream;
 };
 
 
-- 
cgit v1.2.3