summaryrefslogtreecommitdiff
path: root/gui/src/main.cpp
diff options
context:
space:
mode:
authorTim Redfern <tim@getdrop.com>2018-03-26 22:44:37 +0100
committerTim Redfern <tim@getdrop.com>2018-03-26 22:44:37 +0100
commit82f4504bb849a60a74df906064a426b1c5759f09 (patch)
tree41e74fa0b315613800fba76645a21e1ff7c80dbf /gui/src/main.cpp
parent72f38cdf62624dd2bbe14dba0507dabe75ac6d05 (diff)
correct syphon export
Diffstat (limited to 'gui/src/main.cpp')
-rw-r--r--gui/src/main.cpp15
1 files changed, 8 insertions, 7 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