comparison projects/filter_FIR/render.cpp @ 14:06f93bef7dd2

Updated remaining examples to new API

 #include "SampleData.h"
 #include "FIRfilter.h"
 
 SampleData gSampleData;	// User defined structure to get complex data from main
 int gReadPtr;			// Position of last read sample from file
-int gNumChannels;
-
 
 // filter vars
 ne10_fir_instance_f32_t gFIRfilter;
 ne10_float32_t *gFIRfilterIn;
 ne10_float32_t *gFIRfilterOut;

 // userData holds an opaque pointer to a data structure that was passed
 // in from the call to initAudio().
 //
 // Return true on success; returning false halts the program.
 
-bool initialise_render(int numChannels, int numMatrixFramesPerPeriod,
-					   int numAudioFramesPerPeriod, float matrixSampleRate,
-					   float audioSampleRate, void *userData)
+bool initialise_render(int numMatrixChannels, int numAudioChannels,
+					   int numMatrixFramesPerPeriod,
+					   int numAudioFramesPerPeriod,
+					   float matrixSampleRate, float audioSampleRate,
+					   void *userData)
 {
 
 	// Retrieve a parameter passed in from the initAudio() call
 	gSampleData = *(SampleData *)userData;
 
 	gReadPtr = -1;
-	gNumChannels = numChannels;
 	gPeriodSize = numMatrixFramesPerPeriod;
 
 	initialise_filter();
 
 	// Initialise auxiliary tasks

 	}
 
 	ne10_fir_float_neon(&gFIRfilter, gFIRfilterIn, gFIRfilterOut, blockSize);
 
 	for(int n = 0; n < numAudioFrames; n++) {
-		for(int channel = 0; channel < gNumChannels; channel++)
-				audioOut[n * gNumChannels + channel] = gFIRfilterOut[n];	// ...and put it in both left and right channel
+		for(int channel = 0; channel < gNumAudioChannels; channel++)
+				audioOut[n * gNumAudioChannels + channel] = gFIRfilterOut[n];	// ...and put it in both left and right channel
 	}
 
 
 	// Request that the lower-priority task run at next opportunity
 	scheduleAuxiliaryTask(gTriggerSamplesTask);