switched main and gui windows

1 files changed, 17 insertions, 17 deletions

diff --git a/le_new/src/ofApp.h b/le_new/src/ofApp.h
index fc07f9b..99cfbdf 100644
--- a/le_new/src/ofApp.h
+++ b/le_new/src/ofApp.h
@@ -14,9 +14,9 @@
 //
 
 class previewWindow;
-class guiWindow;
+class outputWindow;
 
-class ofApp : public ofxMidiListener{
+class ofApp : public ofBaseApp, public ofxMidiListener{
 
 	public:
 
@@ -73,8 +73,8 @@ class ofApp : public ofxMidiListener{
 		viewport vp1,vp2;
 		vector<viewport*> viewports;
 
+		outputWindow *outWin;
 		previewWindow *prevWin;
-		guiWindow *guiWin;
 
 		int midiChannel;
 
@@ -86,26 +86,27 @@ class ofApp : public ofxMidiListener{
 
 
 		ofxPanel gui;
-		ofxToggle reverse;
-		ofxToggle reversemain;
-		ofxToggle controlColours;
-		ofxToggle noteRandomiseColours;
-		ofxToggle transparentBlack;
+		ofParameter<bool> reverse;
+		//ofxToggle reverse;
+		ofParameter<bool> reversemain;
+		ofParameter<bool> controlColours;
+		ofParameter<bool> noteRandomiseColours;
+		ofParameter<bool> transparentBlack;
 		ofxButton resetDrawscale;
 		ofxButton resetFBscale;
 		ofxIntSlider fS;
-		ofxParameter<int> fadeScale;
+		ofParameter<int> fadeScale;
 		ofxIntSlider fB;
-		ofxParameter<int> fadeBackground;
+		ofParameter<int> fadeBackground;
 		ofxFloatSlider dT;
-		ofxParameter<float> decayTime;
+		ofParameter<float> decayTime;
 		ofxToggle oscScale;
 		ofxToggle breakOsc;
 		ofxToggle randomOsc;
 		ofxFloatSlider sA;
-		ofxParameter<float> scaleAmplitude;
+		ofParameter<float> scaleAmplitude;
 		ofxFloatSlider sF;
-		ofxParameter<float> scaleFrequency;
+		ofParameter<float> scaleFrequency;
 
 		float randOffs;
 
@@ -125,18 +126,17 @@ public:
 	void setup();
 	void setBuffer(ofFbo *buffer);
 	void draw();
-	void keyPressed(int key, ofxFenster* win);
 };
 
-class guiWindow: public ofxFenster{
+class outputWindow: public ofxFenster{
 public:
-	~guiWindow();
+	~outputWindow();
 	ofApp *parent;
 	void setup();
 	void setParent(ofApp *p);
 	void draw();
-	void dragEvent(ofDragInfo dragInfo,ofxFenster* win);
 	void windowMoved(int x, int y);
+	void keyPressed(int key, ofxFenster* win);
 };
 
 /*