comparison core/RTAudio.cpp @ 307:ff5f346a293e prerelease

Changed BelaContext fields to be const where appropriate; there's now an InternalBelaContext used for setting the values within the core code. These need to stay aligned.

 	bool hasArgs;
 	void* args;
 	bool autoSchedule;
 } InternalAuxiliaryTask;
 
-const char gRTAudioThreadName[] = "bela-audio";
-const char gRTAudioInterruptName[] = "bela-pru-irq";
-
 // Real-time tasks and objects
 RT_TASK gRTAudioThread;
+const char gRTAudioThreadName[] = "bela-audio";
+
 #ifdef BELA_USE_XENOMAI_INTERRUPTS
 RT_INTR gRTAudioInterrupt;
+const char gRTAudioInterruptName[] = "bela-pru-irq";
 #endif
+
 PRU *gPRU = 0;
 I2c_Codec *gAudioCodec = 0;
 
 vector<InternalAuxiliaryTask*> &getAuxTasks(){
 	static vector<InternalAuxiliaryTask*> auxTasks;

 int gRTAudioVerbose = 0;   						// Verbosity level for debugging
 int gAmplifierMutePin = -1;
 int gAmplifierShouldBeginMuted = 0;
 
 // Context which holds all the audio/sensor data passed to the render routines
-BelaContext gContext;
+InternalBelaContext gContext;
 
 // User data passed in from main()
 void *gUserData;
 
 // initAudio() prepares the infrastructure for running PRU-based real-time

 		Bela_setPgaGain(settings->pgaGain[n], n);
 	}
 	Bela_setHeadphoneLevel(settings->headphoneLevel);
 
 	// Call the user-defined initialisation function
-	if(!setup(&gContext, userData)) {
+	if(!setup((BelaContext *)&gContext, userData)) {
 		cout << "Couldn't initialise audio rendering\n";
 		return 1;
 	}
 
 	return 0;

 }
 
 // Free any resources associated with PRU real-time audio
 void Bela_cleanupAudio()
 {
-	cleanup(&gContext, gUserData);
+	cleanup((BelaContext *)&gContext, gUserData);
 
 	// Clean up the auxiliary tasks
 	vector<InternalAuxiliaryTask*>::iterator it;
 	for(it = getAuxTasks().begin(); it != getAuxTasks().end(); it++) {
 		InternalAuxiliaryTask *taskStruct = *it;