resolving merge conflict

1 files changed, 42 insertions, 0 deletions

diff --git a/ofxMaxim/openFrameworksExamples/windows/ofMaximExampleVS2010/src/testApp.h b/ofxMaxim/openFrameworksExamples/windows/ofMaximExampleVS2010/src/testApp.h
new file mode 100755
index 0000000..f0eb9d8
--- /dev/null
+++ b/ofxMaxim/openFrameworksExamples/windows/ofMaximExampleVS2010/src/testApp.h
@@ -0,0 +1,42 @@
+#ifndef _TEST_APP
+#define _TEST_APP
+
+
+#include "ofMain.h"
+#include "maximilian.h"
+
+class testApp : public ofBaseApp{
+
+	public:
+
+		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 audioOut(float * input, int bufferSize, int nChannels);
+		
+		
+		ofSoundStream soundStream;
+
+		int		sampleRate;
+
+		vector <float> lAudio;
+		vector <float> rAudio;
+		
+		//------------------- for the simple sine wave synthesis
+
+		maxiOsc test1;
+		double sample;
+};
+
+#endif