public
/
rtphone
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix .wav file writing again - bad change in one of last commits

This commit is contained in:
Dmytro Bogovych 2019-03-21 14:59:49 +02:00
parent 4dc9e6900a
commit 2492e5dfc4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/engine/audio/Audio_WavFile.cpp
View File

@ -39,7 +39,7 @@ using namespace Audio;
// ---------------------- WavFileReader ------------------------- // ---------------------- WavFileReader -------------------------
WavFileReader::WavFileReader() WavFileReader::WavFileReader()
:mHandle(NULL), mRate(0) :mHandle(nullptr), mRate(0)
{ {
mDataOffset = 0; mDataOffset = 0;
} }
@ -166,9 +166,9 @@ void WavFileReader::close()
{ {
LOCK; LOCK;
if (NULL != mHandle) if (nullptr != mHandle)
fclose(mHandle); fclose(mHandle);
mHandle = NULL; mHandle = nullptr;
} }
int WavFileReader::rate() const int WavFileReader::rate() const
@ -246,7 +246,7 @@ unsigned WavFileReader::size() const
#define BITS_PER_CHANNEL 16 #define BITS_PER_CHANNEL 16
WavFileWriter::WavFileWriter() 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 // Write file length
fseek(mHandle, 4, SEEK_SET); fseek(mHandle, 4, SEEK_SET);
size_t fl = mWritten + 36; int32_t fl = mWritten + 36;
fwrite(&fl, sizeof(fl), 1, mHandle); fwrite(&fl, sizeof(fl), 1, mHandle);
// Write data length // Write data length

4
src/engine/audio/Audio_WavFile.h
View File

@ -57,8 +57,8 @@ namespace Audio
FILE* mHandle; /// Handle of audio file. FILE* mHandle; /// Handle of audio file.
std::tstring mFileName; /// Path to requested audio file. std::tstring mFileName; /// Path to requested audio file.
std::recursive_mutex mFileMtx; /// Mutex to protect this instance. std::recursive_mutex mFileMtx; /// Mutex to protect this instance.
size_t mWritten; /// Amount of written data (in bytes) int mWritten; /// Amount of written data (in bytes)
size_t mLengthOffset; /// Position of length field. int mLengthOffset; /// Position of length field.
int mRate, int mRate,
mChannels; mChannels;