diff core/RTAudio.cpp @ 314:611306d840b3 prerelease

Merge

--- a/core/RTAudio.cpp	Fri May 27 18:55:34 2016 +0100
+++ b/core/RTAudio.cpp	Fri May 27 19:00:43 2016 +0100
@@ -51,14 +51,15 @@
 	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;
 
@@ -77,7 +78,7 @@
 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;
@@ -244,7 +245,7 @@
 	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;
 	}
@@ -485,7 +486,7 @@
 // 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;