comparison core/Midi.cpp @ 199:b128e3ea84ff

Fixed midi docs, implentation and example

 		if(inputBytesWritePointer == inputBytes.size()){ //wrap pointer around
 			inputBytesWritePointer = 0;
 		}
 		if(parserEnabled == true && ret > 0){ // if the parser is enabled and there is new data, send the data to it
 			int input;
-			while((input=getInput()) >= 0){
+			while((input=_getInput()) >= 0){
 				midi_byte_t inputByte = (midi_byte_t)(input);
-//				printf("__0x%x\n", input);
 				inputParser->parse(&inputByte, 1);
 			}
-//			if(inputBytesReadPointer == inputBytesWritePointer){
-				// this should never be the case, it should only happen when ret == 0
-//			} else {
-
-//				unsigned int length = (inputBytesWritePointer - inputBytesReadPointer + inputBytes.size())
-//						% inputBytes.size();
-//				rt_printf("inputBytes: 0x%x 0x%x 0x%x", inputBytes[inputBytesReadPointer],
-//						inputBytes[inputBytesReadPointer+1], inputBytes[inputBytesReadPointer+2]);
-//				length = inputParser->parse(&inputBytes[inputBytesReadPointer], length);
-//				inputBytesReadPointer += length; //if parserEnabled, the readPointer is incremented here,
-//											     //so calls to getInput() should be avoided
-//				if(inputBytesReadPointer == inputBytes.size()){
-//					inputBytesReadPointer = 0;
-//				}
-//			}
 		}
 		if(ret < maxBytesToRead){ //no more data to retrieve at the moment
 			usleep(1000);
 		} // otherwise there might be more data ready to be read (we were at the end of the buffer), so don't sleep
 	}

 		BeagleRT_scheduleAuxiliaryTask(midiOutputTask);
 		return 1;
 	}
 }
 
-int Midi::getInput(){
-//	if(parserEnabled == true) {
-//		return -3;
-//	}
+int Midi::_getInput(){
 	if(inputPort < 0)
 		return -2;
 	if(inputBytesReadPointer == inputBytesWritePointer){
 		return -1; // no bytes to read
 	}
 	midi_byte_t inputMessage = inputBytes[inputBytesReadPointer++];
 	if(inputBytesReadPointer == inputBytes.size()){ // wrap pointer
 		inputBytesReadPointer = 0;
 	}
 	return inputMessage;
+}
+
+int Midi::getInput(){
+	if(parserEnabled == true) {
+		return -3;
+	}
+	return _getInput();
 }
 
 MidiParser* Midi::getParser(){
 	if(parserEnabled == false){
 		return 0;