From 2492e5dfc4287fd1d175f44d0eff965db793ad35 Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Thu, 21 Mar 2019 14:59:49 +0200 Subject: [PATCH] - fix .wav file writing again - bad change in one of last commits --- src/engine/audio/Audio_WavFile.cpp | 10 +++++----- src/engine/audio/Audio_WavFile.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/engine/audio/Audio_WavFile.cpp b/src/engine/audio/Audio_WavFile.cpp index 0be92ffb..a3375e80 100644 --- a/src/engine/audio/Audio_WavFile.cpp +++ b/src/engine/audio/Audio_WavFile.cpp @@ -39,7 +39,7 @@ using namespace Audio; // ---------------------- WavFileReader ------------------------- WavFileReader::WavFileReader() -:mHandle(NULL), mRate(0) +:mHandle(nullptr), mRate(0) { mDataOffset = 0; } @@ -166,9 +166,9 @@ void WavFileReader::close() { LOCK; - if (NULL != mHandle) + if (nullptr != mHandle) fclose(mHandle); - mHandle = NULL; + mHandle = nullptr; } int WavFileReader::rate() const @@ -246,7 +246,7 @@ unsigned WavFileReader::size() const #define BITS_PER_CHANNEL 16 WavFileWriter::WavFileWriter() -:mHandle(NULL), mLengthOffset(0), mRate(AUDIO_SAMPLERATE), mChannels(1) +:mHandle(nullptr), mLengthOffset(0), mRate(AUDIO_SAMPLERATE), mChannels(1) { } @@ -354,7 +354,7 @@ size_t WavFileWriter::write(const void* buffer, size_t bytes) // Write file length fseek(mHandle, 4, SEEK_SET); - size_t fl = mWritten + 36; + int32_t fl = mWritten + 36; fwrite(&fl, sizeof(fl), 1, mHandle); // Write data length diff --git a/src/engine/audio/Audio_WavFile.h b/src/engine/audio/Audio_WavFile.h index 1bdaf465..e2f882d2 100644 --- a/src/engine/audio/Audio_WavFile.h +++ b/src/engine/audio/Audio_WavFile.h @@ -57,8 +57,8 @@ namespace Audio FILE* mHandle; /// Handle of audio file. std::tstring mFileName; /// Path to requested audio file. std::recursive_mutex mFileMtx; /// Mutex to protect this instance. - size_t mWritten; /// Amount of written data (in bytes) - size_t mLengthOffset; /// Position of length field. + int mWritten; /// Amount of written data (in bytes) + int mLengthOffset; /// Position of length field. int mRate, mChannels;