comparison include/Midi.h @ 224:97faaf985164 mergingClockSync

Added callback for Midi channel messages

 	std::vector<MidiChannelMessage> messages;
 	unsigned int writePointer;
 	unsigned int readPointer;
 	unsigned int elapsedDataBytes;
 	bool waitingForStatus;
+	void (*messageReadyCallback)(MidiChannelMessage);
+	bool callbackEnabled;
 public:
 	MidiParser(){
 		waitingForStatus = true;
 		elapsedDataBytes= 0;
 		messages.resize(100); // 100 is the number of messages that can be buffered
 		writePointer = 0;
 		readPointer = 0;
+		callbackEnabled = false;
+		messageReadyCallback = NULL;
 	}
 
 	/**
 	 * Parses some midi messages.
 	 *

 	 * @param length the maximum number of values available at the array
 	 *
 	 * @return the number of bytes parsed
 	 */
 	int parse(midi_byte_t* input, unsigned int length);
-	int callme(){
-		return readPointer;
+
+	void setCallback(void (*newCallback)(MidiChannelMessage)){
+		messageReadyCallback = newCallback;
+		if(newCallback != NULL){
+			callbackEnabled = true;
+		} else {
+			callbackEnabled = false;
+		}
 	};
+
+	bool isCallbackEnabled(){
+		return callbackEnabled;
+	};
+
 	int numAvailableMessages(){
 		int num = (writePointer - readPointer + messages.size() ) % messages.size();
 		if(num > 0){
 			int a = a +1;
-			a = callme();
+			a = readPointer;
 		}
 		return num;
 	}
 	/**
 	 * Get the oldest channel message in the buffer.

 	 * Get access to the input parser in use, if any.
 	 *
 	 * @return a pointer to the instance of MidiParser, if currently enabled, zero otherwise.
 	 */
 	MidiParser* getParser();
+
+	void setParserCallback(void (*callback)(MidiChannelMessage)){
+		// if callback is not NULL, also enable the parser
+		enableParser(callback != NULL); //this needs to be first, as it deletes the parser(if exists)
+		getParser()->setCallback(callback);
+	}
 
 	/**
 	 * Open the specified input Midi port and start reading from it.
 	 * @param port Midi port to open
 	 * @return 1 on success, -1 on failure