# HG changeset patch # User Giulio Moro # Date 1430412188 -3600 # Node ID 58eb99dac9214622d7e836a73aa8570bd059f72d # Parent c98863e63174c8ae31535d98eb8b70377387647a - rebuilt the eclipse project file - renamed matrixGpio to digital and matrix to analog in the analogDigitalDemo project diff -r c98863e63174 -r 58eb99dac921 .cproject --- a/.cproject Thu Apr 30 16:58:41 2015 +0100 +++ b/.cproject Thu Apr 30 17:43:08 2015 +0100 @@ -14,7 +14,7 @@ - + @@ -24,24 +24,27 @@ - - - - + - - + + + + - - + + @@ -157,7 +174,7 @@ - + diff -r c98863e63174 -r 58eb99dac921 projects/analogDigitalDemo/render.cpp --- a/projects/analogDigitalDemo/render.cpp Thu Apr 30 16:58:41 2015 +0100 +++ b/projects/analogDigitalDemo/render.cpp Thu Apr 30 17:43:08 2015 +0100 @@ -21,50 +21,50 @@ // in from the call to initAudio(). // // Return true on success; returning false halts the program. -int gNumMatrixGpioFrames=0; -bool initialise_render(int numMatrixChannels, int numMatrixGpioChannels, int numAudioChannels, - int numMatrixFramesPerPeriod, +int gNumDigitalFrames=0; +bool initialise_render(int numAnalogChannels, int numDigitalChannels, int numAudioChannels, + int numAnalogFramesPerPeriod, int numAudioFramesPerPeriod, - float matrixSampleRate, float audioSampleRate, + float analogSampleRate, float audioSampleRate, void *userData) { - gNumMatrixChannels=numMatrixChannels; + gNumAnalogChannels=numAnalogChannels; return true; } // render() is called regularly at the highest priority by the audio engine. // Input and output are given from the audio hardware and the other -// ADCs and DACs (if available). If only audio is available, numMatrixFrames +// ADCs and DACs (if available). If only audio is available, numAnalogFrames // will be 0. long int gCountFrames=0; -void render(int numMatrixFrames, int numMatrixGpioFrames, int numAudioFrames, float *audioIn, float *audioOut, - float *matrixIn, float *matrixOut, uint32_t *matrixGpio) +void render(int numAnalogFrames, int numDigitalFrames, int numAudioFrames, float *audioIn, float *audioOut, + float *analogIn, float *analogOut, uint32_t *digital) /* * Hey, expect buffer underruns to happen here, as we are doing lots of printfs * */ { - gNumMatrixGpioFrames=numMatrixGpioFrames; + gNumDigitalFrames=numDigitalFrames; if(gCountFrames==0){ //this will be executed only on the first call to render(), but the bits will go through this cycle for every subsequent buffer // that is, P8_29 will pulse at the beginning of each buffer } - for(int i=1; i