summaryrefslogtreecommitdiff
path: root/liveengine/src
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2012-09-11 08:42:30 +0100
committerTim Redfern <tim@eclectronics.org>2012-09-11 08:42:30 +0100
commit8cba80bd1a624d424b1ef82b8c3394e30ae1bcf7 (patch)
tree8460c1c29e1fd1f29451728bd9537c150bf1c8c2 /liveengine/src
parent4a43e83a3c4a43925a0a99ceba7a292a58bbccf0 (diff)
making multiwindow
Diffstat (limited to 'liveengine/src')
-rw-r--r--liveengine/src/layers.cpp2
-rw-r--r--liveengine/src/layers.h6
-rwxr-xr-xliveengine/src/testApp.cpp4
-rwxr-xr-xliveengine/src/testApp.h19
4 files changed, 24 insertions, 7 deletions
diff --git a/liveengine/src/layers.cpp b/liveengine/src/layers.cpp
index d7c7d77..6ab91ca 100644
--- a/liveengine/src/layers.cpp
+++ b/liveengine/src/layers.cpp
@@ -8,7 +8,7 @@ svglayer::svglayer(string _f)
load(_f);
}
-int svglayer::load(string _f){
+void svglayer::load(string _f){
//check if files exits
svg.load(_f);
printf("%i paths\n",svg.getNumPath());
diff --git a/liveengine/src/layers.h b/liveengine/src/layers.h
index 2ebbd53..ae17989 100644
--- a/liveengine/src/layers.h
+++ b/liveengine/src/layers.h
@@ -12,10 +12,10 @@ class layer
virtual void load(string _f){};
virtual void draw(float a){};
virtual void draw(float a,unsigned char* controllers){ draw(a);};
- virtual bool getLoaded();
- protected:
- private:
+ bool getLoaded() {return isLoaded;};
+ protected:
bool isLoaded;
+ private:
};
class svglayer: public layer
diff --git a/liveengine/src/testApp.cpp b/liveengine/src/testApp.cpp
index 52a9cc3..4935803 100755
--- a/liveengine/src/testApp.cpp
+++ b/liveengine/src/testApp.cpp
@@ -61,7 +61,9 @@ void testApp::setup(){
*/
ofSetFrameRate(60);
rotate=0;
- scale=1.0f;
+ scale=1.0f;
+
+ prevWin.setup();
}
void testApp::makeColours() {
diff --git a/liveengine/src/testApp.h b/liveengine/src/testApp.h
index 4d769da..9104ac6 100755
--- a/liveengine/src/testApp.h
+++ b/liveengine/src/testApp.h
@@ -68,8 +68,8 @@ non random colours
#define NUM_CONTROLLERS 6
#define START_CONTROLLER 102
-
#include "ofxMidi.h"
+#include "ofxFensterManager.h"
#define NOTHING 0
#define BLOCKS 1
@@ -77,8 +77,21 @@ non random colours
#include "playlist.h"
+class previewWindow: public ofxFensterListener{
+public:
+ ~previewWindow(){
+ cout << "preview window destroyed" << endl;
+ }
+ void setup(){
+ }
+ void draw(ofTexture &grab){
+ grab.draw(0,0,ofGetWidth(),ofGetHeight());
+ }
+
+};
-class testApp : public ofBaseApp, public ofxMidiListener{
+
+class testApp : public ofxFensterListener, public ofxMidiListener{
public:
@@ -121,6 +134,8 @@ class testApp : public ofBaseApp, public ofxMidiListener{
ofTexture grab;
+ previewWindow prevWin;
+
int midiChannel;
ofxMidiIn midiIn;