update oF

3 files changed, 11 insertions, 5 deletions

diff --git a/gui/src/main.cpp b/gui/src/main.cpp
index 0d2fa2d..b1a8365 100644
--- a/gui/src/main.cpp
+++ b/gui/src/main.cpp
@@ -12,16 +12,14 @@ int main(int argc, char *argv[]){
 	
 	settings.decorated = true;
 
-	settings.width = 1200;
-	settings.height = 900	;
+	settings.setSize(1200,900);
 	settings.setPosition(ofVec2f(1700,0));
 	settings.resizable = false;
 	
 	shared_ptr<ofAppBaseWindow> mainWindow = ofCreateWindow(settings);
 	mainWindow->setVerticalSync(false);
 
-	settings.width = 700;
-	settings.height = 1100;
+	settings.setSize(700,1100);
 	settings.setPosition(ofVec2f(0,0));
 	settings.resizable = true;
 
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp
index 9efdead..7641664 100644
--- a/gui/src/ofApp.cpp
+++ b/gui/src/ofApp.cpp
@@ -126,7 +126,7 @@ void ofApp::setup(){
 
 	//============================ MIDI
 
-	midiIn.listPorts();
+	midiIn.listInPorts();
 	midiIn.openPort(0);
 	midiIn.addListener(this);
 
diff --git a/gui/src/ofApp.h b/gui/src/ofApp.h
index e8c2640..b426cb2 100644
--- a/gui/src/ofApp.h
+++ b/gui/src/ofApp.h
@@ -9,6 +9,7 @@
 #include "ofxSVG.h"
 #include "ofxClipper.h"
 #include "ofxMidi.h"	
+#include "ofxOsc.h"
 
 #include "ofxHelios.h"
 #include "lineTransformer.h"
@@ -26,6 +27,7 @@
 #include "ofxHistoryPlot.h"
 #include "Audioplotter.h"
 
+
 /*
 doing the show
 
@@ -52,6 +54,7 @@ enum Source{
 	SVG_outlines,
 	SVG_segmenters,
 	Audio,
+	OSC,
 	Source_end
 };
 
@@ -270,5 +273,10 @@ class ofApp: public ofBaseApp, public ofxMidiListener {
 		ofxXmlSettings XML;
 
 
+		//======================================= //osc for MAME
+
+
+		ofxOscReceiver receiver;
+
 
 };