2 files changed, 24 insertions, 47 deletions

diff --git a/drivers/wasapi/audio_driver_wasapi.cpp b/drivers/wasapi/audio_driver_wasapi.cpp
index ab2976f02c..1fc01ce76e 100644
--- a/drivers/wasapi/audio_driver_wasapi.cpp
+++ b/drivers/wasapi/audio_driver_wasapi.cpp
@@ -69,13 +69,11 @@ static bool default_render_device_changed = false;
 static bool default_capture_device_changed = false;
 
 class CMMNotificationClient : public IMMNotificationClient {
-	LONG _cRef;
-	IMMDeviceEnumerator *_pEnumerator;
+	LONG _cRef = 1;
+	IMMDeviceEnumerator *_pEnumerator = nullptr;
 
 public:
-	CMMNotificationClient() :
-			_cRef(1),
-			_pEnumerator(nullptr) {}
+	CMMNotificationClient() {}
 	virtual ~CMMNotificationClient() {
 		if ((_pEnumerator) != nullptr) {
 			(_pEnumerator)->Release();
@@ -854,17 +852,7 @@ String AudioDriverWASAPI::capture_get_device() {
 }
 
 AudioDriverWASAPI::AudioDriverWASAPI() {
-
-	thread = nullptr;
-
 	samples_in.clear();
-
-	channels = 0;
-	mix_rate = 0;
-	buffer_frames = 0;
-
-	thread_exited = false;
-	exit_thread = false;
 }
 
-#endif
+#endif // WASAPI_ENABLED
diff --git a/drivers/wasapi/audio_driver_wasapi.h b/drivers/wasapi/audio_driver_wasapi.h
index 01a4666812..2fcf8936fa 100644
--- a/drivers/wasapi/audio_driver_wasapi.h
+++ b/drivers/wasapi/audio_driver_wasapi.h
@@ -45,47 +45,36 @@ class AudioDriverWASAPI : public AudioDriver {
 
 	class AudioDeviceWASAPI {
 	public:
-		IAudioClient *audio_client;
-		IAudioRenderClient *render_client;
-		IAudioCaptureClient *capture_client;
-		bool active;
-
-		WORD format_tag;
-		WORD bits_per_sample;
-		unsigned int channels;
-		unsigned int frame_size;
-
-		String device_name;
-		String new_device;
-
-		AudioDeviceWASAPI() :
-				audio_client(nullptr),
-				render_client(nullptr),
-				capture_client(nullptr),
-				active(false),
-				format_tag(0),
-				bits_per_sample(0),
-				channels(0),
-				frame_size(0),
-				device_name("Default"),
-				new_device("Default") {
-		}
+		IAudioClient *audio_client = nullptr;
+		IAudioRenderClient *render_client = nullptr;
+		IAudioCaptureClient *capture_client = nullptr;
+		bool active = false;
+
+		WORD format_tag = 0;
+		WORD bits_per_sample = 0;
+		unsigned int channels = 0;
+		unsigned int frame_size = 0;
+
+		String device_name = "Default";
+		String new_device = "Default";
+
+		AudioDeviceWASAPI() {}
 	};
 
 	AudioDeviceWASAPI audio_input;
 	AudioDeviceWASAPI audio_output;
 
 	Mutex mutex;
-	Thread *thread;
+	Thread *thread = nullptr;
 
 	Vector<int32_t> samples_in;
 
-	unsigned int channels;
-	int mix_rate;
-	int buffer_frames;
+	unsigned int channels = 0;
+	int mix_rate = 0;
+	int buffer_frames = 0;
 
-	bool thread_exited;
-	mutable bool exit_thread;
+	bool thread_exited = false;
+	mutable bool exit_thread = false;
 
 	static _FORCE_INLINE_ void write_sample(WORD format_tag, int bits_per_sample, BYTE *buffer, int i, int32_t sample);
 	static _FORCE_INLINE_ int32_t read_sample(WORD format_tag, int bits_per_sample, BYTE *buffer, int i);