From d981511459175285710fcb14a1ba740b14dca95f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sat, 31 Oct 2020 00:09:48 +0100
Subject: [PATCH] Misc cleanup

---
 Core/HW/SasAudio.cpp | 10 +---------
 Core/HW/SasAudio.h   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/Core/HW/SasAudio.cpp b/Core/HW/SasAudio.cpp
index ea66611e0f..15db6c4d50 100644
--- a/Core/HW/SasAudio.cpp
+++ b/Core/HW/SasAudio.cpp
@@ -331,15 +331,7 @@ void ADSREnvelope::SetSimpleEnvelope(u32 ADSREnv1, u32 ADSREnv2) {
 	}
 }
 
-SasInstance::SasInstance()
-	: maxVoices(PSP_SAS_VOICES_MAX),
-		sampleRate(44100),
-		outputMode(PSP_SAS_OUTPUTMODE_MIXED),
-		mixBuffer(0),
-		sendBuffer(0),
-		sendBufferDownsampled(0),
-		sendBufferProcessed(0),
-		grainSize(0) {
+SasInstance::SasInstance() {
 #ifdef AUDIO_TO_FILE
 	audioDump = fopen("D:\\audio.raw", "wb");
 #endif
diff --git a/Core/HW/SasAudio.h b/Core/HW/SasAudio.h
index 480250dc70..de883afa36 100644
--- a/Core/HW/SasAudio.h
+++ b/Core/HW/SasAudio.h
@@ -282,16 +282,16 @@ public:
 	int GetGrainSize() const { return grainSize; }
 	int EstimateMixUs();
 
-	int maxVoices;
-	int sampleRate;
-	int outputMode;
+	int maxVoices = PSP_SAS_VOICES_MAX;
+	int sampleRate = 44100;
+	int outputMode = PSP_SAS_OUTPUTMODE_MIXED;
 
-	int *mixBuffer;
-	int *sendBuffer;
-	s16 *sendBufferDownsampled;
-	s16 *sendBufferProcessed;
+	int *mixBuffer = nullptr;
+	int *sendBuffer = nullptr;
+	s16 *sendBufferDownsampled = nullptr;
+	s16 *sendBufferProcessed = nullptr;
 
-	FILE *audioDump;
+	FILE *audioDump = nullptr;
 
 	void Mix(u32 outAddr, u32 inAddr = 0, int leftVol = 0, int rightVol = 0);
 	void MixVoice(SasVoice &voice);
@@ -310,6 +310,6 @@ public:
 
 private:
 	SasReverb reverb_;
-	int grainSize;
+	int grainSize = 0;
 	int16_t mixTemp_[PSP_SAS_MAX_GRAIN * 4 + 2 + 8];  // some extra margin for very high pitches.
 };