From 809d05f2b17409c0b18951c0107c7fc275621b0c Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Wed, 29 May 2013 14:47:17 +0100
Subject: drag drop palettes

---
 src/viewport.h | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/viewport.h')

diff --git a/src/viewport.h b/src/viewport.h
index 1e3e8a8..88e9835 100755
--- a/src/viewport.h
+++ b/src/viewport.h
@@ -5,8 +5,9 @@
 #include "ofxXmlSettings.h"
 
 static int bufferSize = 2048;
-static int oversample = 8;	
+static int oversample = 8;
 static int windowsize = 32;
+static int previewscale = 5;
 
 //make sure that windowsize*oversample*8 <= buffersize
 
@@ -82,14 +83,14 @@ class vpcontrol {
 			left.assign(bufferSize, 0.0);
 			right.assign(bufferSize, 0.0);
 			volHistory.assign(400, 0.0);
-			
+
 			bufferCounter	= 0;
 			drawCounter		= 0;
 			smoothedVol     = 0.0;
 			scaledVol		= 0.0;
 		}
 		void update(){
-					//lets scale the vol up to a 0-1 range 
+					//lets scale the vol up to a 0-1 range
 			scaledVol = ofMap(smoothedVol, 0.0, 0.17, 0.0, 1.0, true);
 
 			//lets record the volume into an array
@@ -112,10 +113,10 @@ class vpcontrol {
 		vector <float> left;
 		vector <float> right;
 		vector <float> volHistory;
-		
+
 		int 	bufferCounter;
 		int 	drawCounter;
-		
+
 		float smoothedVol;
 		float scaledVol;
 };
@@ -130,10 +131,11 @@ class viewport
 	    void drawport(vpcontrol &control);
 		void draw(uint8_t brightness,float scale=1.0f);
 		ofFbo rb1,rb2;
-		palette Palette;
+		palette Palette;
+		int w,h;
     protected:
     private:
-		int x,y,w,h,bw,bh,ox,oy,num;
+		int x,y,bw,bh,ox,oy,num;
 		float seed;
 };
 
-- 
cgit v1.2.3