From b7298ebcb5867b53fe53ed5987a6c2f1288d1fc1 Mon Sep 17 00:00:00 2001 From: Dimitri Diakopoulos Date: Tue, 26 May 2015 11:10:12 -0700 Subject: [PATCH] verify encoding on windows; fixup a few warnings --- include/libnyquist/PostProcess.h | 2 +- src/OpusDecoder.cpp | 4 ++-- src/WavPackDecoder.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/libnyquist/PostProcess.h b/include/libnyquist/PostProcess.h index 8d3d3cd..0ce39e5 100644 --- a/include/libnyquist/PostProcess.h +++ b/include/libnyquist/PostProcess.h @@ -87,7 +87,7 @@ void StereoToMono(const T * src, T * dest, size_t N) template void MonoToStereo(const T * src, T * dest, size_t N) { - for(int i = 0, j = 0; i < N; ++i, j += 2) + for(size_t i = 0, j = 0; i < N; ++i, j += 2) { dest[j] = src[i]; dest[j + 1] = src[i]; diff --git a/src/OpusDecoder.cpp b/src/OpusDecoder.cpp index dd45acd..221240b 100644 --- a/src/OpusDecoder.cpp +++ b/src/OpusDecoder.cpp @@ -89,13 +89,13 @@ public: size_t readInternal(size_t requestedFrameCount, size_t frameOffset = 0) { - float *buffer = (float *) d->samples.data(); + float * buffer = (float *) d->samples.data(); size_t framesRemaining = requestedFrameCount; size_t totalFramesRead = 0; while(0 < framesRemaining) { - int64_t framesRead = op_read_float(fileHandle, buffer, (int)(framesRemaining * d->channelCount), nullptr); + auto framesRead = size_t(op_read_float(fileHandle, buffer, (int)(framesRemaining * d->channelCount), nullptr)); // EOF if(!framesRead) diff --git a/src/WavPackDecoder.cpp b/src/WavPackDecoder.cpp index 63d4160..f078a82 100644 --- a/src/WavPackDecoder.cpp +++ b/src/WavPackDecoder.cpp @@ -56,7 +56,7 @@ public: auto totalSamples = size_t(getTotalSamples()); int mode = WavpackGetMode(context); - int isFloatingPoint = (MODE_FLOAT & mode); + bool isFloatingPoint = (MODE_FLOAT & mode); d->sourceFormat = MakeFormatForBits(bitdepth, isFloatingPoint, false);