From 6ce793d582a32cb081077ba82d4ab631289e661d Mon Sep 17 00:00:00 2001
From: Danila Malyutin <flashmozzg@gmail.com>
Date: Mon, 1 Jun 2015 02:01:54 +0300
Subject: [PATCH] Deleted unneeded xaudio #ifs

There is no improvement in 2.8 and on my setup (8.1 x64) it always
preferred minidx headers anyway (so it'd still load 2.7 dll).
---
 rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp | 4 ----
 rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h   | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp
index adcb26a2a6..796d10719a 100644
--- a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp
+++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp
@@ -15,7 +15,6 @@ void XAudio2Thread::Init()
 {
 	HRESULT hr = S_OK;
 
-#if (FORCED_WINVER < 0x0602)
 	hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 	if (FAILED(hr))
 	{
@@ -23,7 +22,6 @@ void XAudio2Thread::Init()
 		Emu.Pause();
 		return;
 	}
-#endif
 
 	hr = XAudio2Create(&m_xaudio2_instance, 0, XAUDIO2_DEFAULT_PROCESSOR);
 	if (FAILED(hr))
@@ -53,9 +51,7 @@ void XAudio2Thread::Quit()
 	m_xaudio2_instance->Release();
 	m_xaudio2_instance = nullptr;
 
-#if (FORCED_WINVER < 0x0602)
 	CoUninitialize();
-#endif
 }
 
 void XAudio2Thread::Play()
diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h
index 3771f7bd3e..f7eac1ba34 100644
--- a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h
+++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h
@@ -3,15 +3,7 @@
 #include "Emu/Audio/AudioThread.h"
 #if defined (_WIN32)
 
-// forced define Win7, delete this for using XAudio2 2.8
-#define FORCED_WINVER 0x0601
-
-#if (FORCED_WINVER >= 0x0602 /*_WIN32_WINNT_WIN8*/)
-#include <xaudio2.h>
-#pragma comment(lib,"xaudio2.lib")
-#else
 #include "XAudio2.h" // XAudio2 2.8 available only on Win8+, used XAudio2 2.7 from dxsdk
-#endif
 
 class XAudio2Thread : public AudioThread
 {