From f4702a0719a2e847f3a8d1c22e6b747204c79aa4 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Sat, 18 Nov 2017 18:53:58 -0800 Subject: [PATCH] Remove GCC -Wall warnings Clear up warnings generated with -Wall used to compile. No functional change. --- src/AudioGeneratorAAC.cpp | 6 +++--- src/libhelix-aac/dequant.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/AudioGeneratorAAC.cpp b/src/AudioGeneratorAAC.cpp index aacce79..2907db8 100644 --- a/src/AudioGeneratorAAC.cpp +++ b/src/AudioGeneratorAAC.cpp @@ -104,15 +104,15 @@ bool AudioGeneratorAAC::loop() // buff[0] start of frame, decode it... unsigned char *inBuff = reinterpret_cast(buff); int bytesLeft = buffValid; - int ret; - if (ret = AACDecode(hAACDecoder, &inBuff, &bytesLeft, outSample)) { + int ret = AACDecode(hAACDecoder, &inBuff, &bytesLeft, outSample); + if (ret) { // Error, skip the frame... Serial.printf("AAC decode error %d\n", ret); } else { lastFrameEnd = buffValid - bytesLeft; AACFrameInfo fi; AACGetLastFrameInfo(hAACDecoder, &fi); - if (fi.sampRateOut != lastRate) { + if ((int)fi.sampRateOut != (int)lastRate) { output->SetRate(fi.sampRateOut); lastRate = fi.sampRateOut; } diff --git a/src/libhelix-aac/dequant.c b/src/libhelix-aac/dequant.c index 8fa996b..5f51166 100644 --- a/src/libhelix-aac/dequant.c +++ b/src/libhelix-aac/dequant.c @@ -366,6 +366,8 @@ int Dequantize(AACDecInfo *aacDecInfo, int ch) **************************************************************************************/ int DeinterleaveShortBlocks(AACDecInfo *aacDecInfo, int ch) { + (void)aacDecInfo; + (void)ch; /* not used for this implementation - short block deinterleaving performed during Huffman decoding */ return ERR_AAC_NONE; }