passing parent pointer

1 files changed, 47 insertions, 26 deletions

diff --git a/liveengine/src/testApp.h b/liveengine/src/testApp.h
index 0da5eae..a03ad4b 100755
--- a/liveengine/src/testApp.h
+++ b/liveengine/src/testApp.h
@@ -28,6 +28,11 @@ object remembers playback head/ heads
 initial footage set for each track: program change?
 (does this leave any room for creative input) or set via gui?
 
+video playback object
+still image object
+
+load files in gui - loadable area
+
 creative input - alter layers live via AVS compatible system which also allows local MIDI control,
 scripting, manipulating layers etc
 
@@ -78,24 +83,17 @@ option to randomise colours on each note
 
 #include "viewport.h"
 
-class previewWindow: public ofxFensterListener{
-public:
-	~previewWindow();
-	ofFbo *rb;
-	void setup();
-	void setBuffer(ofFbo *buffer);
-	void draw();
-};
-
-class guiWindow: public ofxFensterListener{
-public:
-	~guiWindow();
-	ofxPanel *gui;
-	void setup();
-	void setGui(ofxPanel *panel);
-	void draw();
+/*
+enum PropertyAttribute {
+  None       = 0,
+  ReadOnly   = 1 << 0,
+  DontEnum   = 1 << 1,
+  DontDelete = 1 << 2
 };
+*/
 
+class previewWindow;
+class guiWindow;
 
 //#define GRAB_TEXTURE
 
@@ -115,9 +113,11 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		void mousePressed(int x, int y, int button);
 		void mouseReleased(int x, int y, int button);
 		void windowResized(int w, int h);
-		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
+		void dragEvent(ofDragInfo dragInfo);
+		void dragEvent(ofDragInfo dragInfo,ofxFenster* win);
 
+		void refDragEvent(ofDragInfo &args);
 		void mousePressedEvent(ofMouseEventArgs &args);
 		void keyPressedEvent(ofKeyEventArgs &args);
 
@@ -134,7 +134,7 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
         //to be moved into svg object gui
 
 		bool debug;
-		
+
 		bool fullscreenoutput;
 
 		float lastnoteTime;
@@ -147,16 +147,16 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		int xshift,yshift;
 
 		ofColor* controller_colours;
-		
+
 		float colShift;
 
 		viewport vp1,vp2;
 
-		previewWindow prevWin;
-		guiWindow guiWin;
-		
+		previewWindow *prevWin;
+		guiWindow *guiWin;
+
 		ofxFenster* win;
-		
+
 		int midiChannel;
 
 		ofxMidiIn	midiIn;
@@ -164,7 +164,7 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		void newMidiMessage(ofxMidiEventArgs& eventArgs);
 
 		playlist list;
-		
+
 		ofxPanel gui;
 		ofxToggle reversemain;
 		ofxToggle controlColours;
@@ -172,10 +172,31 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		ofxToggle transparentBlack;
 		ofxButton resetDrawscale;
 		ofxButton resetFBscale;
-		
+
 		void resetDrawscalePressed(bool & pressed);
 		void resetFBscalePressed(bool & pressed);
-		
 
+
+};
+
+
+class previewWindow: public ofxFensterListener{
+public:
+	~previewWindow();
+	ofFbo *rb;
+	void setup();
+	void setBuffer(ofFbo *buffer);
+	void draw();
+};
+
+class guiWindow: public ofxFensterListener{
+public:
+	~guiWindow();
+	testApp *parent;
+	void setup();
+	void setParent(testApp *p);
+	void draw();
+	void dragEvent(ofDragInfo dragInfo,ofxFenster* win);
 };
 
+