mostly working

1 files changed, 41 insertions, 14 deletions

diff --git a/src/testApp.h b/src/testApp.h
index e154493..bea746c 100755
--- a/src/testApp.h
+++ b/src/testApp.h
@@ -6,15 +6,22 @@
 #include "boundary.h"
 #include "ofxXmlSettings.h"
 #include "ofxFensterManager.h"
-#include "ofxOsc.h"
+#include "ofxGui.h"
 
 #define COLOUR 1
 #define GREY 2
 #define DIFF 3
 
 //12-10-12
-//each area will trigger once and once only
+//each area will trigger 'once and once only' ?
 
+//overall:
+//
+//tweak opencv stuff
+//test performance
+
+
+class guiWindow;
 
 class testApp : public ofxFensterListener{
 
@@ -39,13 +46,6 @@ class testApp : public ofxFensterListener{
 		void loadSettings(string filename);
 		void saveSettings(string filename);
 
-		//destination for OSC
-		std::string host;
-		int port,channel;
-		ofxOscSender sender;
-
-		void sendNote(int note);
-
 		ofVideoGrabber 		vidGrabber;
 
 		int gw,gh;
@@ -60,14 +60,41 @@ class testApp : public ofxFensterListener{
 
 		int 				mode;
 
-		int 				threshold;
 		bool				bLearnBakground;
-
-        bool                bGrab;
-		bool				bFlip;
-		bool				bInvert;
+		bool 				flip,invert;
+
+		guiWindow *guiWin;
+		ofxPanel gui;
+		ofxFloatSlider vol;
+		ofxParameter<float> volume;
+		ofxToggle bFlip;
+		ofxToggle bInvert;
+		ofxIntSlider thresh;
+		ofxParameter<int> threshold;
+
+		// register any method of any class to an event.
+        // the method must provide one of the following
+        // signatures:
+        //     void method(ArgumentsType & args)
+        //     void method(const void * sender, ArgumentsType &args)
+        // ie:
+        //     ofAddListener(addon.newIntEvent, this, &Class::method)
+		void volumeChanged(float &v);
+
+		bool                		bGrab;
 
 		vector<boundary> boundaries;
 		int selectedBoundary;
 
+		vector<ofPoint> clicks;
+};
+
+class guiWindow: public ofxFensterListener{
+public:
+	~guiWindow();
+	testApp *parent;
+	void setup();
+	void setParent(testApp *p);
+	void draw();
 };
+