aboutsummaryrefslogtreecommitdiffstats
path: root/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h
diff options
context:
space:
mode:
authormick grierson <mickgrierson@gmail.com>2015-10-01 09:54:19 +0100
committermick grierson <mickgrierson@gmail.com>2015-10-01 09:54:19 +0100
commite4eb667af04304cbe9c0be5997ebea2049178590 (patch)
tree5630e70df8199c9f53170c9ef4da1e4dac59e69c /ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h
parent537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff)
parentdfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff)
resolving merge conflict
Diffstat (limited to 'ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h')
-rw-r--r--ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h24
1 files changed, 0 insertions, 24 deletions
diff --git a/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h b/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h
deleted file mode 100644
index 020f0fd..0000000
--- a/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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