From e0eef7bef4b37622deea2a57629b389766013c88 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 2 Dec 2015 20:00:48 -0500 Subject: WaveFile: Get rid of an explicit delete --- Source/Core/AudioCommon/WaveFile.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'Source/Core/AudioCommon/WaveFile.cpp') diff --git a/Source/Core/AudioCommon/WaveFile.cpp b/Source/Core/AudioCommon/WaveFile.cpp index 692700a434..16089db8e3 100644 --- a/Source/Core/AudioCommon/WaveFile.cpp +++ b/Source/Core/AudioCommon/WaveFile.cpp @@ -9,26 +9,19 @@ #include "Common/Logging/Log.h" #include "Core/ConfigManager.h" -enum { BUF_SIZE = 32*1024 }; +constexpr size_t WaveFileWriter::BUFFER_SIZE; -WaveFileWriter::WaveFileWriter(): - skip_silence(false), - audio_size(0), - conv_buffer(nullptr) +WaveFileWriter::WaveFileWriter() { } WaveFileWriter::~WaveFileWriter() { - delete[] conv_buffer; Stop(); } bool WaveFileWriter::Start(const std::string& filename, unsigned int HLESampleRate) { - if (!conv_buffer) - conv_buffer = new short[BUF_SIZE]; - // Check if the file is already open if (file) { @@ -121,7 +114,7 @@ void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, u32 count) if (!file) PanicAlertT("WaveFileWriter - file not open."); - if (count > BUF_SIZE * 2) + if (count > BUFFER_SIZE * 2) PanicAlert("WaveFileWriter - buffer too small (count = %u).", count); if (skip_silence) @@ -145,6 +138,6 @@ void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, u32 count) conv_buffer[2 * i + 1] = Common::swap16((u16)sample_data[2 * i]); } - file.WriteBytes(conv_buffer, count * 4); + file.WriteBytes(conv_buffer.data(), count * 4); audio_size += count * 4; } -- cgit v1.2.3