comparison projects/d-box/render.cpp @ 14:06f93bef7dd2

Updated remaining examples to new API

 extern PRU *gPRU;
 extern StatusLED gStatusLED;
 extern bool gIsLoading;
 extern bool gAudioIn;
 extern int gPeriodSize;
-int gChannels = 2;
 
 float *gOscillatorBuffer1, *gOscillatorBuffer2;
 float *gOscillatorBufferRead, *gOscillatorBufferWrite;
 int gOscillatorBufferReadPointer		= 0;
 int gOscillatorBufferReadCurrentSize	= 0;

 #ifdef DBOX_CAPE_TEST
 void render_capetest(int numMatrixFrames, int numAudioFrames, float *audioIn, float *audioOut,
 			uint16_t *matrixIn, uint16_t *matrixOut);
 #endif
 
-bool initialise_render(int numChannels, int numMatrixFramesPerPeriod, int numAudioFramesPerPeriod, float matrixSampleRate, float audioSampleRate, void *userData) {
-	gChannels = numChannels;
+bool initialise_render(int numMatrixChannels, int numAudioChannels,
+					   int numMatrixFramesPerPeriod,
+					   int numAudioFramesPerPeriod,
+					   float matrixSampleRate, float audioSampleRate,
+					   void *userData) {
 	int oscBankHopSize = *(int *)userData;
+
+	if(numMatrixChannels != 8) {
+		printf("Error: D-Box needs matrix enabled with 8 channels.\n");
+		return false;
+	}
 
 	// Allocate two buffers for rendering oscillator bank samples
 	// One will be used for writing in the background while the other is used for reading
 	// on the audio thread. 8-byte alignment needed for the NEON code.
-	if(posix_memalign((void **)&gOscillatorBuffer1, 8, oscBankHopSize * gChannels * sizeof(float))) {
+	if(posix_memalign((void **)&gOscillatorBuffer1, 8, oscBankHopSize * gNumAudioChannels * sizeof(float))) {
 		printf("Error allocating render buffers\n");
 		return false;
 	}
-	if(posix_memalign((void **)&gOscillatorBuffer2, 8, oscBankHopSize * gChannels * sizeof(float))) {
+	if(posix_memalign((void **)&gOscillatorBuffer2, 8, oscBankHopSize * gNumAudioChannels * sizeof(float))) {
 		printf("Error allocating render buffers\n");
 		return false;
 	}
 	gOscillatorBufferWrite	= gOscillatorBuffer1;
 	gOscillatorBufferRead	= gOscillatorBuffer2;
 
-	memset(gOscillatorBuffer1, 0, oscBankHopSize * gChannels * sizeof(float));
-	memset(gOscillatorBuffer2, 0, oscBankHopSize * gChannels * sizeof(float));
+	memset(gOscillatorBuffer1, 0, oscBankHopSize * gNumAudioChannels * sizeof(float));
+	memset(gOscillatorBuffer2, 0, oscBankHopSize * gNumAudioChannels * sizeof(float));
 
 	// Initialise the dynamic wavetable used by the oscillator bank
 	// It should match the size of the static one already allocated in the OscillatorBank object
 	// Don't forget a guard point at the end of the table
 	gDynamicWavetableLength = gOscBanks[gCurrentOscBank]->lookupTableSize;

 	if(gOscBanks[gCurrentOscBank]->state==bank_toreset)
 		gOscBanks[gCurrentOscBank]->resetOscillators();
 
 	if(gOscBanks[gCurrentOscBank]->state==bank_playing)
 	{
-		assert(gChannels == 2);
+		assert(gNumAudioChannels == 2);
 
 #ifdef OLD_OSCBANK
-		memset(audioOut, 0, numAudioFrames * gChannels * sizeof(float));
+		memset(audioOut, 0, numAudioFrames * gNumAudioChannels * sizeof(float));
 
 		/* Render the oscillator bank. The oscillator bank function is written in NEON assembly
 		 * and it strips out all extra checks, so find out in advance whether we can render a whole
 		 * block or whether the frame will increment in the middle of this buffer.
 		 */

 									 gOscBanks[gCurrentOscBank]->oscillatorAmplitudes,
 									 gOscBanks[gCurrentOscBank]->oscillatorNormFreqDerivatives,
 									 gOscBanks[gCurrentOscBank]->oscillatorAmplitudeDerivatives,
 									 gDynamicWavetable/*gOscBanks[gCurrentOscBank]->lookupTable*/);
 				framesRemaining -= gOscBanks[gCurrentOscBank]->hopCounter;
-				audioOutWithOffset += gChannels * gOscBanks[gCurrentOscBank]->hopCounter;
+				audioOutWithOffset += gNumAudioChannels * gOscBanks[gCurrentOscBank]->hopCounter;
 				gOscBanks[gCurrentOscBank]->sampleCount += gOscBanks[gCurrentOscBank]->hopCounter;
 				gOscBanks[gCurrentOscBank]->nextHop();
 			}
 		}
 #else

 
 	if(gOscillatorNeedsRender) {
 		gOscillatorNeedsRender = false;
 
 		/* Render one frame into the write buffer */
-		memset(gOscillatorBufferWrite, 0, gOscBanks[gCurrentOscBank]->hopCounter * gChannels * sizeof(float));
+		memset(gOscillatorBufferWrite, 0, gOscBanks[gCurrentOscBank]->hopCounter * gNumAudioChannels * sizeof(float));
 
 		oscillator_bank_neon(gOscBanks[gCurrentOscBank]->hopCounter, gOscillatorBufferWrite,
 							 gOscBanks[gCurrentOscBank]->actPartNum, gOscBanks[gCurrentOscBank]->lookupTableSize,
 							 gOscBanks[gCurrentOscBank]->oscillatorPhases, gOscBanks[gCurrentOscBank]->oscillatorNormFrequencies,
 							 gOscBanks[gCurrentOscBank]->oscillatorAmplitudes,
 							 gOscBanks[gCurrentOscBank]->oscillatorNormFreqDerivatives,
 							 gOscBanks[gCurrentOscBank]->oscillatorAmplitudeDerivatives,
 							 /*gOscBanks[gCurrentOscBank]->lookupTable*/gDynamicWavetable);
 
-		gOscillatorBufferWriteCurrentSize = gOscBanks[gCurrentOscBank]->hopCounter * gChannels;
+		gOscillatorBufferWriteCurrentSize = gOscBanks[gCurrentOscBank]->hopCounter * gNumAudioChannels;
 
 		/* Update the pitch right before the hop
 		 * Total CV range +/- N_OCT octaves
 		 */
 		float pitch = (float)gPitchLatestInput / octaveSplitter - N_OCT/2;