summaryrefslogtreecommitdiff
path: root/gui/src/ofApp.h
diff options
context:
space:
mode:
Diffstat (limited to 'gui/src/ofApp.h')
-rw-r--r--gui/src/ofApp.h12
1 files changed, 6 insertions, 6 deletions
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;