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).
This commit is contained in:
Danila Malyutin 2015-06-01 02:01:54 +03:00 committed by Nekotekina
parent ee2940c159
commit 6ce793d582
2 changed files with 0 additions and 12 deletions

View file

@ -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()

View file

@ -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
{