comparison core/RTAudio.cpp @ 13:6adb088196a7

Fixed ADC bug; added a simple passthrough test

 int gRTAudioVerbose = 0;   						// Verbosity level for debugging
 char gPRUFilename[256]	 = "pru_rtaudio.bin"; 	// path to PRU binary file
 int gAmplifierMutePin = -1;
 int gAmplifierShouldBeginMuted = 0;
 
+// Number of audio and matrix channels, globally accessible
+// At least gNumMatrixChannels needs to be global to be used
+// by the analogRead() and analogWrite() macros without creating
+// extra confusion in their use cases by passing this argument
+int gNumAudioChannels = 0;
+int gNumMatrixChannels = 0;
 
 // initAudio() prepares the infrastructure for running PRU-based real-time
 // audio, but does not actually start the calculations.
 // periodSize indicates the number of _sensor_ frames per period: the audio period size
 // is twice this value. In total, the audio latency in frames will be 4*periodSize,

 	if(settings->useMatrix) {
 		audioPeriodSize = settings->periodSize * settings->numMatrixChannels / 4;
 		matrixSampleRate = audioSampleRate * 4.0 / (float)settings->numMatrixChannels;
 	}
 
-	if(!initialise_render(settings->useMatrix ? settings->numMatrixChannels : 0, /* matrix channels */
-						  2, /* audio channels */
+	gNumAudioChannels = 2;
+	gNumMatrixChannels = settings->useMatrix ? settings->numMatrixChannels : 0;
+
+	if(!initialise_render(gNumMatrixChannels, gNumAudioChannels,
 				          settings->useMatrix ? settings->periodSize : 0, /* matrix period size */
 				          audioPeriodSize,
 				          matrixSampleRate, audioSampleRate,
 				          userData)) {
 		cout << "Couldn't initialise audio rendering\n";