From be32b5e5f49119e04c08f9f3ff72541b9e1ac4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 30 Oct 2015 10:57:57 +0100 Subject: [PATCH] Init all fields in audio classes --- src/audio/mixer.cpp | 17 ----------------- src/audio/mixer.h | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 37 deletions(-) diff --git a/src/audio/mixer.cpp b/src/audio/mixer.cpp index e232fa908e..fa692f1787 100644 --- a/src/audio/mixer.cpp +++ b/src/audio/mixer.cpp @@ -199,14 +199,6 @@ bool Source_Sample::Convert(AudioFormat format) return false; } -Source_SampleStream::Source_SampleStream() -{ - length = 0; - rw = NULL; - buffer = 0; - buffersize = 0; -} - Source_SampleStream::~Source_SampleStream() { Unload(); @@ -349,18 +341,9 @@ void Source_SampleStream::Unload() Channel::Channel() { - resampler = 0; SetRate(1); SetVolume(SDL_MIX_MAXVOLUME); - oldvolume = 0; - oldvolume_l = 0; - oldvolume_r = 0; SetPan(0.5f); - done = true; - stopping = false; - source = 0; - deletesourceondone = false; - group = MIXER_GROUP_NONE; } Channel::~Channel() diff --git a/src/audio/mixer.h b/src/audio/mixer.h index 0e6faf3218..3fe66b4816 100644 --- a/src/audio/mixer.h +++ b/src/audio/mixer.h @@ -105,7 +105,7 @@ protected: class Source_SampleStream : public Source { public: - Source_SampleStream(); + Source_SampleStream() = default; ~Source_SampleStream(); bool LoadWAV(SDL_RWops* rw); @@ -113,10 +113,10 @@ private: Uint32 FindChunk(SDL_RWops* rw, Uint32 wanted_id); void Unload(); - SDL_RWops* rw; - Uint64 databegin; - uint8* buffer; - unsigned long buffersize; + SDL_RWops* rw = nullptr; + Uint64 databegin = 0; + uint8* buffer = nullptr; + unsigned long buffersize = 0; protected: unsigned long Read(unsigned long offset, const uint8** data, unsigned long length); @@ -139,21 +139,21 @@ public: friend class Mixer; private: - int loop; - unsigned long offset; - double rate; - int volume; - float volume_l, volume_r; - float oldvolume_l, oldvolume_r; - float pan; - bool done; - bool deleteondone; - bool deletesourceondone; - bool stopping; - int oldvolume; - int group; - SpeexResamplerState* resampler; - Source* source; + int loop = 0; + unsigned long offset = 0; + double rate = 0; + int volume = 1; + float volume_l = 0.f, volume_r = 0.f; + float oldvolume_l = 0.f, oldvolume_r = 0.f; + float pan = 0; + bool done = true; + bool deleteondone = false; + bool deletesourceondone = false; + bool stopping = false; + int oldvolume = 0; + int group = MIXER_GROUP_NONE; + SpeexResamplerState* resampler = nullptr; + Source* source = nullptr; }; class Mixer