comparison core/RTAudio.cpp @ 303:421a69d42943 prerelease

Changed BeagleRT -> Bela in defines and thread names; some preliminary mux capelet stuff

 	bool hasArgs;
 	void* args;
 	bool autoSchedule;
 } InternalAuxiliaryTask;
 
-const char gRTAudioThreadName[] = "beaglert-audio";
-const char gRTAudioInterruptName[] = "beaglert-pru-irq";
+const char gRTAudioThreadName[] = "bela-audio";
+const char gRTAudioInterruptName[] = "bela-pru-irq";
 
 // Real-time tasks and objects
 RT_TASK gRTAudioThread;
-#ifdef BEAGLERT_USE_XENOMAI_INTERRUPTS
+#ifdef BELA_USE_XENOMAI_INTERRUPTS
 RT_INTR gRTAudioInterrupt;
 #endif
 PRU *gPRU = 0;
 I2c_Codec *gAudioCodec = 0;
 

 		gContext.digitalChannels = 0;
 	}
 
 	// Set flags based on init settings
 	if(settings->interleave)
-		gContext.flags |= BEAGLERT_FLAG_INTERLEAVED;
+		gContext.flags |= BELA_FLAG_INTERLEAVED;
 	if(settings->analogOutputsPersist)
-		gContext.flags |= BEAGLERT_FLAG_ANALOG_OUTPUTS_PERSIST;
+		gContext.flags |= BELA_FLAG_ANALOG_OUTPUTS_PERSIST;
 
 	// Use PRU for audio
 	gPRU = new PRU(&gContext);
 	gAudioCodec = new I2c_Codec();
 

 					if(gRTAudioVerbose)
 						rt_printf("Warning: couldn't set value (high) on amplifier mute pin\n");
 				}
 			}
 
-#ifdef BEAGLERT_USE_XENOMAI_INTERRUPTS
+#ifdef BELA_USE_XENOMAI_INTERRUPTS
 			gPRU->loop(&gRTAudioInterrupt, gUserData);
 #else
 			gPRU->loop(0, gUserData);
 #endif
 			// Now clean up

 	if(gRTAudioVerbose == 1)
 		rt_printf("audio thread ended\n");
 }
 
 // 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;
+// (equal or lower) priority. Audio priority is defined in BELA_AUDIO_PRIORITY;
 // priority should be generally be less than this.
 // Returns an (opaque) pointer to the created task on success; 0 on failure
 AuxiliaryTask Bela_createAuxiliaryTask(void (*functionToCall)(void* args), int priority, const char *name, void* args, bool autoSchedule)
 {
 	InternalAuxiliaryTask *newTask = (InternalAuxiliaryTask*)malloc(sizeof(InternalAuxiliaryTask));

 // on success.
 
 int Bela_startAudio()
 {
 	// Create audio thread with high Xenomai priority
-	if(rt_task_create(&gRTAudioThread, gRTAudioThreadName, 0, BEAGLERT_AUDIO_PRIORITY, T_JOINABLE | T_FPU)) {
+	if(rt_task_create(&gRTAudioThread, gRTAudioThreadName, 0, BELA_AUDIO_PRIORITY, T_JOINABLE | T_FPU)) {
 		  cout << "Error: unable to create Xenomai audio thread" << endl;
 		  return -1;
 	}
 
-#ifdef BEAGLERT_USE_XENOMAI_INTERRUPTS
+#ifdef BELA_USE_XENOMAI_INTERRUPTS
 	// Create an interrupt which the audio thread receives from the PRU
 	int result = 0;
 	if((result = rt_intr_create(&gRTAudioInterrupt, gRTAudioInterruptName, PRU_RTAUDIO_IRQ, I_NOAUTOENA)) != 0) {
 		cout << "Error: unable to create Xenomai interrupt for PRU (error " << result << ")" << endl;
 		return -1;

 		free(taskStruct);
 	}
 	getAuxTasks().clear();
 
 	// Delete the audio task and its interrupt
-#ifdef BEAGLERT_USE_XENOMAI_INTERRUPTS
+#ifdef BELA_USE_XENOMAI_INTERRUPTS
 	rt_intr_delete(&gRTAudioInterrupt);
 #endif
 	rt_task_delete(&gRTAudioThread);
 
 	if(gPRU != 0)