resolved merge conflicts

1 files changed, 40 insertions, 0 deletions

diff --git a/ofxMaxim/ofxMaximExamples007OSX/ofMaximExample007OSX/src/testApp.h b/ofxMaxim/ofxMaximExamples007OSX/ofMaximExample007OSX/src/testApp.h
new file mode 100644
index 0000000..ee11865
--- /dev/null
+++ b/ofxMaxim/ofxMaximExamples007OSX/ofMaximExample007OSX/src/testApp.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "ofMain.h"
+#include "ofxMaxim.h"
+
+
+class testApp : public ofBaseApp{
+
+	public:
+		~testApp();/* destructor is very useful */
+		void setup();
+		void update();
+		void draw();
+
+		void keyPressed  (int key);
+		void keyReleased(int key);
+		void mouseMoved(int x, int y );
+		void mouseDragged(int x, int y, int button);
+		void mousePressed(int x, int y, int button);
+		void mouseReleased(int x, int y, int button);
+		void windowResized(int w, int h);
+		void dragEvent(ofDragInfo dragInfo);
+		void gotMessage(ofMessage msg);
+	
+		void audioRequested 	(float * input, int bufferSize, int nChannels); /* output method */
+		void audioReceived 	(float * input, int bufferSize, int nChannels); /* input method */
+	
+		int		initialBufferSize; /* buffer size */
+		int		sampleRate;
+	
+	
+		/* stick you maximilian stuff below */
+	
+		double wave,sample,outputs[2];
+		ofxMaxiMix mymix;
+		ofxMaxiOsc sine1;
+		ofxMaxiSample beats,beat;
+	
+		
+};