summaryrefslogtreecommitdiff
path: root/liveengine/src/testApp.h
diff options
context:
space:
mode:
Diffstat (limited to 'liveengine/src/testApp.h')
-rwxr-xr-xliveengine/src/testApp.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/liveengine/src/testApp.h b/liveengine/src/testApp.h
index 7e0272f..0f97068 100755
--- a/liveengine/src/testApp.h
+++ b/liveengine/src/testApp.h
@@ -71,13 +71,10 @@ non random colours
#include "ofxMidi.h"
-
-#include "layers.h"
-
#define BLOCKS 0
#define LIST 1
-
+#include "playlist.h"
class testApp : public ofBaseApp, public ofxMidiListener{
@@ -101,12 +98,11 @@ class testApp : public ofBaseApp, public ofxMidiListener{
void toggleFPS();
bool showFPS;
- void loadplaylist(string _name);
-
ofxXmlSettings XML;
unsigned char* controllers;
- int note,mode;
+ int note,
+ mode;
float lastnoteTime;
float decayTime;
@@ -123,7 +119,7 @@ class testApp : public ofBaseApp, public ofxMidiListener{
void newMidiMessage(ofxMidiEventArgs& eventArgs);
- map<int,layer*> layers;
+ playlist list;
};