diff hackday/testApp.h @ 27:fa1890efa044

close to final version on HackDay

--- a/hackday/testApp.h	Sun Dec 04 00:02:26 2011 +0000
+++ b/hackday/testApp.h	Sun Dec 04 14:30:33 2011 +0000
@@ -29,7 +29,7 @@
 #include "ofxMidiIn.h"
 #include "ofxOsc.h"
 #include "MidiInputStream.h"
-
+#include "ofxArgs.h"
 
 #define PORT 12121
 #define SEND_PORT 5282
@@ -40,8 +40,16 @@
 using namespace MIDIConstants;
 
 class testApp : public ofBaseApp{
+private:
+	ofxArgs* args;
+	string option1, option2;
+	bool flag1;
+	ofxOscReceiver	receiver;
+	ofxOscSender	sender;
+	
+public:
+		testApp(ofxArgs* args);
 
-	public:
 		void setup();
 		void update();
 		void draw();
@@ -67,7 +75,8 @@
 	
 	int cannamMainFunction();
 	string midiFileName;
-
+	std::string museScoreFilename;
+	
 	bool playing;
 	//drawMidiNotes drawer;
 	
@@ -105,10 +114,11 @@
 	int lastScoreIndexSent;
 	int lastMeasureSent;
 	double performanceRating;
-private:
-	ofxOscReceiver	receiver;
-	ofxOscSender	sender;
+	void sendNoteDataByOsc(const int& pitch, const int& ticks);
 
+	ofTrueTypeFont verdana30;
+	int midiPort;
+	std::string midiPortName;
 	
 };