performance 2.0

1 files changed, 5 insertions, 10 deletions

diff --git a/liveengine/src/testApp.h b/liveengine/src/testApp.h
index 5e050da..27380af 100755
--- a/liveengine/src/testApp.h
+++ b/liveengine/src/testApp.h
@@ -69,19 +69,12 @@ option to randomise colours on each note
 
 #define OF_ADDON_USING_OFXMIDIIN
 
-#define NUM_NOTES 64
-#define START_NOTE 36
-#define NUM_CONTROLLERS 6
-#define START_CONTROLLER 102
 
 #include "ofxMidi.h"
 #include "ofxFensterManager.h"
 
-#define NOTHING 0
-#define BLOCKS 1
-#define LIST 2
 
-#include "playlist.h"
+#include "viewport.h"
 
 class previewWindow: public ofxFensterListener{
 public:
@@ -132,6 +125,8 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		bool noteRandomiseColours;
 		bool transparentBlack;
 		
+		bool reversemain;
+		
 		bool fullscreenoutput;
 
 		float lastnoteTime;
@@ -139,13 +134,13 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 
 		int fadetime;
 		int rotate;
-		float scale;
+		float scale,fscale;
 
 		int xshift,yshift;
 
 		ofColor* controller_colours;
 
-		ofFbo rb1,rb2,rb3,rb4; //2 buffers * 2 outputs
+		viewport vp1,vp2;
 
 		previewWindow prevWin;