resolving merge conflict

1 files changed, 0 insertions, 116 deletions

diff --git a/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/src/testApp.mm b/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/src/testApp.mm
deleted file mode 100755
index 8dc9e95..0000000
--- a/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/src/testApp.mm
+++ /dev/null
@@ -1,116 +0,0 @@
-#include "testApp.h"
-#include "ofxMaxim.h"
-
-testApp::~testApp() {
-	
-	delete sample1.myData;
-	
-}
-
-
-//--------------------------------------------------------------
-void testApp::setup(){
-	ofEnableAlphaBlending();
-	// register touch events
-	ofRegisterTouchEvents(this);
-	
-	// initialize the accelerometer
-	ofxAccelerometer.setup();
-	
-	//iPhoneAlerts will be sent to this.
-	ofxiPhoneAlerts.addListener(this);
-	
-	sampleRate 			= 44100;
-	initialBufferSize	= 512;
-	
-	sample1.load(ofToDataPath("beat2.wav"));
-
-	ofSoundStreamSetup(2,0,this, sampleRate, initialBufferSize, 4);
-	
-	//If you want a landscape oreintation 
-	//iPhoneSetOrientation(OFXIPHONE_ORIENTATION_LANDSCAPE_RIGHT);
-	
-	ofBackground(255,255,255);
-}
-
-//--------------------------------------------------------------
-void testApp::update(){
-
-}
-
-//--------------------------------------------------------------
-void testApp::draw(){
-
-}
-
-//--------------------------------------------------------------
-void testApp::exit(){
-
-}
-
-
-//--------------------------------------------------------------
-void testApp::audioRequested(float * output, int bufferSize, int nChannels){
-	
-	if( initialBufferSize != bufferSize ){
-		ofLog(OF_LOG_ERROR, "your buffer size was set to %i - but the stream needs a buffer size of %i", initialBufferSize, bufferSize);
-		return;
-	}	
-	
-	for (int i = 0; i < bufferSize; i++){
-		
-		sample=sample1.play(1.);
-		channel1.stereo(sample,outputs1,0.5);
-		
-		output[i*nChannels    ] = outputs1[0];
-		output[i*nChannels + 1] = outputs1[1];
-		
-	}
-	
-}
-
-//--------------------------------------------------------------
-void testApp::audioReceived(float * input, int bufferSize, int nChannels){
-	
-}
-
-//--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs &touch){
-
-}
-
-//--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs &touch){
-
-}
-
-//--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs &touch){
-
-}
-
-//--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs &touch){
-
-}
-
-//--------------------------------------------------------------
-void testApp::lostFocus(){
-
-}
-
-//--------------------------------------------------------------
-void testApp::gotFocus(){
-
-}
-
-//--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
-
-}
-
-//--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
-
-}
-