correct syphon export

3 files changed, 24 insertions, 23 deletions

diff --git a/gui/src/main.cpp b/gui/src/main.cpp
index dc65931..14f4f21 100644
--- a/gui/src/main.cpp
+++ b/gui/src/main.cpp
@@ -1,7 +1,7 @@
 #include "ofMain.h"
 #include "ofApp.h"
 
-#define PREVIEW_WINDOW
+//#define PREVIEW_WINDOW
 
 //========================================================================
 int main(int argc, char *argv[]){
@@ -60,15 +60,16 @@ int main(int argc, char *argv[]){
 	shared_ptr<ofApp> mainApp(new ofApp);
 	//mainApp->setupGui();
 
-	ofAddListener(mainWindow->events().update,mainApp.get(),&ofApp::updateOutput);
-	ofAddListener(mainWindow->events().draw,mainApp.get(),&ofApp::drawOutput);
-	ofAddListener(mainWindow->events().windowResized,mainApp.get(),&ofApp::outputWindowResized);
-	ofAddListener(mainWindow->events().keyPressed,mainApp.get(),&ofApp::outputKeyPressed);
+	ofAddListener(guiWindow->events().update,mainApp.get(),&ofApp::updateGui);
+	ofAddListener(guiWindow->events().draw,mainApp.get(),&ofApp::drawGui);
+	//ofAddListener(mainWindow->events().windowResized,mainApp.get(),&ofApp::windowResized);
+	ofAddListener(guiWindow->events().fileDragEvent,mainApp.get(),&ofApp::guiDragEvent);
+	ofAddListener(guiWindow->events().keyPressed,mainApp.get(),&ofApp::guiKeyPressed);
 #ifdef PREVIEW_WINDOW
-	ofAddListener(previewWindow->events().draw,mainApp.get(),&ofApp::drawOutput);
+	ofAddListener(previewWindow->events().draw,mainApp.get(),&ofApp::draw);
 #endif
 	
-	ofRunApp(guiWindow, mainApp);
+	ofRunApp(mainWindow, mainApp);
 	ofRunMainLoop();
 }
 	
\ No newline at end of file
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp
index a5c80ad..570dfb3 100644
--- a/gui/src/ofApp.cpp
+++ b/gui/src/ofApp.cpp
@@ -62,7 +62,7 @@ void ofApp::setup(){
 }
 
 //--------------------------------------------------------------
-void ofApp::update(){
+void ofApp::updateGui(ofEventArgs & args){
 
 	std::stringstream strm;
 	strm << "fps: " << ofGetFrameRate();
@@ -70,7 +70,7 @@ void ofApp::update(){
 
 }
 
-void ofApp::updateOutput(ofEventArgs & args){
+void ofApp::update(){
 
 	for (int i=0;i<sets.size();i++){
 		sets[i].updateOutput();
@@ -80,7 +80,7 @@ void ofApp::updateOutput(ofEventArgs & args){
 
 
 //--------------------------------------------------------------	
-void ofApp::draw(){
+void ofApp::drawGui(ofEventArgs & args){
 	ofBackground(0,0,0);
 
 	for (int i=0;i<sets.size();i++){
@@ -89,7 +89,7 @@ void ofApp::draw(){
 
 }
 
-void ofApp::drawOutput(ofEventArgs & args){
+void ofApp::draw(){
 
 
 	// Clear with alpha, so we can capture via syphon and composite elsewhere should we want.
@@ -281,7 +281,7 @@ void ofApp::newMidiMessage(ofxMidiMessage& msg) {
 }
 
 //--------------------------------------------------------------
-void ofApp::keyPressed(ofKeyEventArgs &args){
+void ofApp::guiKeyPressed(ofKeyEventArgs &args){
 
 	if (args.key==OF_KEY_COMMAND){
 		commandPressed=true;
@@ -315,7 +315,7 @@ void ofApp::keyPressed(ofKeyEventArgs &args){
 
 }
 
-void ofApp::outputKeyPressed(ofKeyEventArgs &args){
+void ofApp::keyPressed(ofKeyEventArgs &args){
 	if(args.key == ' '){
     	outputFS=!outputFS;
         ofSetFullscreen(outputFS);
@@ -370,14 +370,14 @@ void ofApp::mouseExited(int x, int y){
 }
 
 //--------------------------------------------------------------
-void ofApp::windowResized(int w, int h){
+void ofApp::guiWindowResized(ofResizeEventArgs &resizeargs){
 
 }
 
-void ofApp::outputWindowResized(ofResizeEventArgs &resizeargs){
+void ofApp::windowResized(int w, int h){
 	//printf("Output window: %i,%i \n",resizeargs.width,resizeargs.height);
 	for (int i=0;i<sets.size();i++){
-		sets[i].outputSize=ofPoint(resizeargs.width,resizeargs.height);
+		sets[i].outputSize=ofPoint(w,h);
 	}
 }
 
@@ -387,7 +387,7 @@ void ofApp::gotMessage(ofMessage msg){
 }
 
 //--------------------------------------------------------------
-void ofApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::guiDragEvent(ofDragInfo &dragInfo){ 
 	//std::string filenames;
 	
 	//for (auto f = dragInfo.files.begin(); f != dragInfo.files.end(); f++){
diff --git a/gui/src/ofApp.h b/gui/src/ofApp.h
index 7a76da3..7224b96 100644
--- a/gui/src/ofApp.h
+++ b/gui/src/ofApp.h
@@ -94,12 +94,14 @@ class ofApp : public ofBaseApp, public ofxMidiListener{
 	public:
 		void setup();
 		void update();
-		void updateOutput(ofEventArgs & args);
 		void draw();
-		void drawOutput(ofEventArgs & args);
 		void exit();
 
-		void outputKeyPressed(ofKeyEventArgs & args);
+		void drawGui(ofEventArgs & args);
+		void updateGui(ofEventArgs & args);
+		void guiKeyPressed(ofKeyEventArgs & args);
+		void guiWindowResized(ofResizeEventArgs &resizeargs);
+		void guiDragEvent(ofDragInfo &dragInfo);
 
 		void keyPressed(ofKeyEventArgs &keyargs);
 		void keyReleased(int key);
@@ -110,8 +112,6 @@ class ofApp : public ofBaseApp, public ofxMidiListener{
 		void mouseEntered(int x, int y);
 		void mouseExited(int x, int y);
 		void windowResized(int w, int h);
-		void outputWindowResized(ofResizeEventArgs &resizeargs);
-		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
 
 	vector<string> arguments;
@@ -141,7 +141,7 @@ class ofApp : public ofBaseApp, public ofxMidiListener{
 	ofxSyphonServer mainOutputSyphonServer;
 	//	ofxSyphonServer individualTextureSyphonServer;
 	
-	ofxSyphonClient mClient;
+	//ofxSyphonClient mClient;
 
 	bool bSmooth;