summaryrefslogtreecommitdiff
path: root/liveengine/src/testApp.h
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2012-09-05 13:37:00 +0100
committerTim Redfern <tim@eclectronics.org>2012-09-05 13:37:00 +0100
commit02dbff4e82603279a0b0c5062d20067b2614a15e (patch)
tree0f5cdfb018d8264b47ec1497850800c0d765a342 /liveengine/src/testApp.h
parent65cf7b27e9d2f9e59da322b4fbad1ed1df27eb8d (diff)
first show
Diffstat (limited to 'liveengine/src/testApp.h')
-rwxr-xr-xliveengine/src/testApp.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/liveengine/src/testApp.h b/liveengine/src/testApp.h
index af99c6a..4d769da 100755
--- a/liveengine/src/testApp.h
+++ b/liveengine/src/testApp.h
@@ -71,8 +71,9 @@ non random colours
#include "ofxMidi.h"
-#define BLOCKS 0
-#define LIST 1
+#define NOTHING 0
+#define BLOCKS 1
+#define LIST 2
#include "playlist.h"
@@ -110,6 +111,10 @@ class testApp : public ofBaseApp, public ofxMidiListener{
float lastnoteTime;
float decayTime;
+ int fadetime;
+ int rotate;
+ float scale;
+
int xshift,yshift;
ofColor* controller_colours;