comparison core/RTAudio.cpp @ 254:173978a5ab6a aux_task_args

Allow arguments to be passed to aux task function

 
 // Data structure to keep track of auxiliary tasks we
 // can schedule
 typedef struct {
 	RT_TASK task;
-	void (*function)(void);
+	void (*function)(void*);
 	char *name;
 	int priority;
 	bool started;
+	void* args;
 } InternalAuxiliaryTask;
 
 const char gRTAudioThreadName[] = "beaglert-audio";
 const char gRTAudioInterruptName[] = "beaglert-pru-irq";
 

 
 // Create a calculation loop which can run independently of the audio, at a different
 // (equal or lower) priority. Audio priority is defined in BEAGLERT_AUDIO_PRIORITY;
 // priority should be generally be less than this.
 // Returns an (opaque) pointer to the created task on success; 0 on failure
-AuxiliaryTask BeagleRT_createAuxiliaryTask(void (*functionToCall)(void), int priority, const char *name)
+AuxiliaryTask BeagleRT_createAuxiliaryTask(void (*functionToCall)(void*), int priority, const char *name, void* args)
 {
 	InternalAuxiliaryTask *newTask = (InternalAuxiliaryTask*)malloc(sizeof(InternalAuxiliaryTask));
 
 	// Attempt to create the task
 	if(rt_task_create(&(newTask->task), name, 0, priority, T_JOINABLE | T_FPU)) {

 	// Populate the rest of the data structure and store it in the vector
 	newTask->function = functionToCall;
 	newTask->name = strdup(name);
 	newTask->priority = priority;
 	newTask->started = false;
+	newTask->args = args;
 
 	getAuxTasks().push_back(newTask);
 
 	return (AuxiliaryTask)newTask;
 }

 // priority than the audio thread. Simple wrapper for Xenomai calls.
 // Treat the argument as containing the task structure
 void auxiliaryTaskLoop(void *taskStruct)
 {
 	// Get function to call from the argument
-	void (*auxiliary_function)(void) = ((InternalAuxiliaryTask *)taskStruct)->function;
+	void (*auxiliary_function)(void*) = ((InternalAuxiliaryTask *)taskStruct)->function;
 	const char *name = ((InternalAuxiliaryTask *)taskStruct)->name;
 
 	// Wait for a notification
 	rt_task_suspend(NULL);
 
 	while(!gShouldStop) {
 		// Then run the calculations
-		auxiliary_function();
+		auxiliary_function(((InternalAuxiliaryTask *)taskStruct)->args);
 
 		// Wait for a notification
 		rt_task_suspend(NULL);
 	}