comparison include/Midi.h @ 226:af1e662400fc mergingClockSync

Added argument to callback

 	std::vector<MidiChannelMessage> messages;
 	unsigned int writePointer;
 	unsigned int readPointer;
 	unsigned int elapsedDataBytes;
 	bool waitingForStatus;
-	void (*messageReadyCallback)(MidiChannelMessage);
+	void (*messageReadyCallback)(MidiChannelMessage,void*);
 	bool callbackEnabled;
+	void* callbackArg;
 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;
+		callbackArg = NULL;
 	}
 
 	/**
 	 * Parses some midi messages.
 	 *

 
 	/**
 	 * Sets the callback to call when a new MidiChannelMessage is available
 	 * from the input port.
 	 *
-	 * In order to deactivate the callback, call this method with NULL as an
-	 * argument.
+	 * The callback will be called with two arguments:
+	 *   callback(MidiChannelMessage newMessage, void* arg)
+	 *
+	 * In order to deactivate the callback, call this method with NULL as the
+	 * first argument.
 	 * While the callback is enabled, calling numAvailableMessages() and
 	 * getNextChannelMessage() is still possible, but it will probably always
 	 * return 0 as the callback is called as soon as a new message is available.
 	 *
-	 * @param newCallback the callback function. This function
-	 * should takes one argument: the MidiChannelMessage .
-	 *
-	 */
-	void setCallback(void (*newCallback)(MidiChannelMessage)){
+	 * @param newCallback the callback function.
+	 * @param arg the second argument to be passed to the callback function.
+	 *
+	 */
+	void setCallback(void (*newCallback)(MidiChannelMessage, void*), void* arg=NULL){
+		callbackArg = arg;
 		messageReadyCallback = newCallback;
 		if(newCallback != NULL){
 			callbackEnabled = true;
 		} else {
 			callbackEnabled = false;

 	 * Sets the callback to call when a new MidiChannelMessage is available
 	 * from the input port.
 	 *
 	 * Internally, it calls enableParser() and the MidiParser::setCallback();
 	 *
-	 * @param newCallback the callback function. This function
-	 * should takes one argument: the MidiChannelMessage .
-	 */
-	void setParserCallback(void (*callback)(MidiChannelMessage)){
+	 * @param newCallback the callback function.
+	 * @param arg the second argument to be passed to the callback function.
+	 */
+	void setParserCallback(void (*callback)(MidiChannelMessage, void*), void* arg=NULL){
 		// 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);
+		getParser()->setCallback(callback, arg);
 	}
 
 	/**
 	 * Open the specified input Midi port and start reading from it.
 	 * @param port Midi port to open