verify encoding on windows; fixup a few warnings

adpcm
Dimitri Diakopoulos 11 years ago
parent 6581a3bd3c
commit b7298ebcb5

@ -87,7 +87,7 @@ void StereoToMono(const T * src, T * dest, size_t N)
template <typename T> template <typename T>
void MonoToStereo(const T * src, T * dest, size_t N) 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] = src[i];
dest[j + 1] = src[i]; dest[j + 1] = src[i];

@ -89,13 +89,13 @@ public:
size_t readInternal(size_t requestedFrameCount, size_t frameOffset = 0) 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 framesRemaining = requestedFrameCount;
size_t totalFramesRead = 0; size_t totalFramesRead = 0;
while(0 < framesRemaining) 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 // EOF
if(!framesRead) if(!framesRead)

@ -56,7 +56,7 @@ public:
auto totalSamples = size_t(getTotalSamples()); auto totalSamples = size_t(getTotalSamples());
int mode = WavpackGetMode(context); int mode = WavpackGetMode(context);
int isFloatingPoint = (MODE_FLOAT & mode); bool isFloatingPoint = (MODE_FLOAT & mode);
d->sourceFormat = MakeFormatForBits(bitdepth, isFloatingPoint, false); d->sourceFormat = MakeFormatForBits(bitdepth, isFloatingPoint, false);

Loading…
Cancel
Save