resolved merge conflicts

1 files changed, 24 insertions, 0 deletions

diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h
new file mode 100644
index 0000000..020f0fd
--- /dev/null
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h
@@ -0,0 +1,24 @@
+/*
+ *  pyOSCDebug.h
+ *  bastardPop
+ *
+ *  Created by Chris on 25/10/2011.
+ *  Copyright 2011 Goldsmiths Creative Computing. All rights reserved.
+ *
+ */
+
+#include "ofxOSC.h"
+#include <vector>
+
+class pyOSCDebug {
+public:
+	pyOSCDebug();
+	void setup(string host, int port);
+	void clear();
+	void send(vector<float> data);
+	void send(float *data, unsigned int count);
+private:
+	ofxOscSender osc;
+	bool ready;
+	
+};
\ No newline at end of file