From 981c2eac709c201d67998372e1baf5e74797d22a Mon Sep 17 00:00:00 2001 From: philburk Date: Tue, 1 Mar 2011 02:02:46 +0000 Subject: [PATCH] Fix C99 error with modern for loops. --- qa/loopback/src/audio_analyzer.c | 38 ++++++++++++++++++--------- qa/loopback/src/paqa.c | 36 ++++++++++++++----------- qa/loopback/src/test_audio_analyzer.c | 11 ++++---- 3 files changed, 52 insertions(+), 33 deletions(-) diff --git a/qa/loopback/src/audio_analyzer.c b/qa/loopback/src/audio_analyzer.c index a8a22c8..5a677e6 100644 --- a/qa/loopback/src/audio_analyzer.c +++ b/qa/loopback/src/audio_analyzer.c @@ -56,8 +56,9 @@ double PaQa_GetNthFrequency( double baseFrequency, int index ) /*==========================================================================================*/ void PaQa_EraseBuffer( float *buffer, int numFrames, int samplesPerFrame ) { + int i; int numSamples = numFrames * samplesPerFrame; - for( int i=0; iphase ) * generator->amplitude; *buffer += value; // Mix with existing value. @@ -92,8 +94,9 @@ void PaQa_MixSine( PaQaSineGenerator *generator, float *buffer, int numSamples, /*==========================================================================================*/ void PaQa_GenerateCrackDISABLED( float *buffer, int numSamples, int stride ) { + int i; int offset = numSamples/2; - for( int i=0; inumFrames) > recording->maxFrames) { framesToWrite = recording->maxFrames - recording->numFrames; } float *data = &recording->buffer[recording->numFrames]; - for( int i=0; inumFrames) > recording->maxFrames) { framesToRecord = recording->maxFrames - recording->numFrames; } float *data = &recording->buffer[recording->numFrames]; - for( int i=0; inumFrames) > recording->maxFrames) { framesToRecord = recording->maxFrames - recording->numFrames; } float *data = &recording->buffer[recording->numFrames]; - for( int i=0; i 0 ) { + int i; int numToSave = (numLeft > NUM_SAMPLES) ? NUM_SAMPLES : numLeft; // Convert double samples to shorts. - for( int i=0; inumFrames) ); // How many buffers will fit in the recording? int maxCorrelations = recording->numFrames - numFrames; double maxSum = 0.0; int peakIndex = -1; double location = -1.0; - for( int ic=0; icbuffer[ ic ]; - for( int is=0; is= 0 ); assert( count > 0 ); double phase = 0.5 * MATH_PI; // Advance a quarter wave double phaseIncrement = 0.25 * 2.0 * MATH_PI / count; - for( int is=0; issampleRate / testTone->frequency; int cycleSize = (int) (period + 0.5); @@ -502,7 +514,7 @@ int PaQa_DetectPhaseError( PaQaRecording *recording, PaQaTestTone *testTone, PaQ int skip = cycleSize; int windowSize = cycleSize; - for( int i=analysisResult->latency; i<(recording->numFrames - windowSize); i += skip ) + for( i=analysisResult->latency; i<(recording->numFrames - windowSize); i += skip ) { double expectedPhase = previousPhase + (skip * MATH_TWO_PI / period); double expectedPhaseIncrement = PaQa_ComputePhaseDifference( expectedPhase, previousPhase ); diff --git a/qa/loopback/src/paqa.c b/qa/loopback/src/paqa.c index 5ad9368..d4444d0 100644 --- a/qa/loopback/src/paqa.c +++ b/qa/loopback/src/paqa.c @@ -123,6 +123,7 @@ static int RecordAndPlaySinesCallback( const void *inputBuffer, void *outputBuff PaStreamCallbackFlags statusFlags, void *userData ) { + int i; float *in = (float *)inputBuffer; float *out = (float *)outputBuffer; int done = paContinue; @@ -136,7 +137,7 @@ static int RecordAndPlaySinesCallback( const void *inputBuffer, void *outputBuff if( in != NULL) { // Read each channel from the buffer. - for( int i=0; itest->inputParameters.channelCount; i++ ) + for( i=0; itest->inputParameters.channelCount; i++ ) { done |= PaQa_WriteRecording( &loopbackContext->recordings[i], in + i, @@ -150,7 +151,7 @@ static int RecordAndPlaySinesCallback( const void *inputBuffer, void *outputBuff PaQa_EraseBuffer( out, framesPerBuffer, loopbackContext->test->outputParameters.channelCount ); - for( int i=0; itest->outputParameters.channelCount; i++ ) + for( i=0; itest->outputParameters.channelCount; i++ ) { PaQa_MixSine( &loopbackContext->generators[i], out + i, @@ -282,6 +283,7 @@ static int RecordAndPlayBlockingIO( PaStream *inStream, LoopbackContext *loopbackContext ) { + int i; float *in = (float *)g_BigBuffer; float *out = (float *)g_BigBuffer; PaError err; @@ -305,7 +307,7 @@ static int RecordAndPlayBlockingIO( PaStream *inStream, } // Save in a recording. - for( int i=0; itest->inputParameters.channelCount; i++ ) + for( i=0; itest->inputParameters.channelCount; i++ ) { done |= PaQa_WriteRecording( &loopbackContext->recordings[i], in + i, @@ -317,7 +319,7 @@ static int RecordAndPlayBlockingIO( PaStream *inStream, available = Pa_GetStreamWriteAvailable( outStream ); if( available > (2*framesPerBuffer) ) available = (2*framesPerBuffer); PaQa_EraseBuffer( out, available, loopbackContext->test->outputParameters.channelCount ); - for( int i=0; itest->outputParameters.channelCount; i++ ) + for( i=0; itest->outputParameters.channelCount; i++ ) { PaQa_MixSine( &loopbackContext->generators[i], out + i, @@ -522,15 +524,16 @@ static int PaQa_SaveTestResultToWaveFile( UserOptions *userOptions, PaQaRecordin /*******************************************************************/ static int PaQa_SetupLoopbackContext( LoopbackContext *loopbackContextPtr, TestParameters *testParams ) { + int i; // Setup loopback context. memset( loopbackContextPtr, 0, sizeof(LoopbackContext) ); loopbackContextPtr->test = testParams; - for( int i=0; isamplesPerFrame; i++ ) + for( i=0; isamplesPerFrame; i++ ) { int err = PaQa_InitializeRecording( &loopbackContextPtr->recordings[i], testParams->maxFrames, testParams->sampleRate ); QA_ASSERT_EQUALS( "PaQa_InitializeRecording failed", paNoError, err ); } - for( int i=0; isamplesPerFrame; i++ ) + for( i=0; isamplesPerFrame; i++ ) { PaQa_SetupSineGenerator( &loopbackContextPtr->generators[i], PaQa_GetNthFrequency( testParams->baseFrequency, i ), testParams->amplitude, testParams->sampleRate ); @@ -543,8 +546,8 @@ error: /*******************************************************************/ static void PaQa_TeardownLoopbackContext( LoopbackContext *loopbackContextPtr ) { - - for( int i=0; itest->samplesPerFrame; i++ ) + int i; + for( i=0; itest->samplesPerFrame; i++ ) { PaQa_TerminateRecording( &loopbackContextPtr->recordings[i] ); } @@ -594,6 +597,7 @@ static void PaQa_PrintFullErrorReport( PaQaAnalysisResult *analysisResultPtr, in */ static int PaQa_SingleLoopBackTest( UserOptions *userOptions, TestParameters *testParams, double expectedAmplitude ) { + int i; LoopbackContext loopbackContext; PaError err = paNoError; PaQaTestTone testTone; @@ -615,7 +619,7 @@ static int PaQa_SingleLoopBackTest( UserOptions *userOptions, TestParameters *te QA_ASSERT_TRUE("loopback did not run", (loopbackContext.callbackCount > 1) ); // Analyse recording to to detect glitches. - for( int i=0; isamplesPerFrame; i++ ) + for( i=0; isamplesPerFrame; i++ ) { double freq = PaQa_GetNthFrequency( testParams->baseFrequency, i ); testTone.frequency = freq; @@ -700,6 +704,8 @@ static void PaQa_SetDefaultTestParameters( TestParameters *testParamsPtr, PaDevi */ static int PaQa_AnalyzeLoopbackConnection( UserOptions *userOptions, PaDeviceIndex inputDevice, PaDeviceIndex outputDevice, double expectedAmplitude ) { + int i; + int iSize; int totalBadChannels = 0; TestParameters testParams; const PaDeviceInfo *inputDeviceInfo; @@ -735,7 +741,7 @@ static int PaQa_AnalyzeLoopbackConnection( UserOptions *userOptions, PaDeviceInd testParams.maxFrames = (int) (0.5 * testParams.sampleRate); // Loop though combinations of audio parameters. - for( int iFlags=0; iFlagsnumFrames - popPosition) - 1; } - for( int i=0; ibuffer[i+popPosition]; float bad = (good > 0.0) ? (good - popAmplitude) : (good + popAmplitude); -- 2.43.0