ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spu2-x:windows: ifdef XAudio2 2.7 specific stuff 

Support for XAudio2 2.8+ still requires build configurations that use
the Windows SDK include and library files (instead of the DirectX SDK
files).
This commit is contained in:
Jonathan Li 2015-12-28 04:30:33 +00:00
parent 87138c9854
commit 8a61c7d336
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp
View File

@ -232,8 +232,9 @@ private:
}
};
#if _WIN32_WINNT < 0x602
HMODULE xAudio2DLL;
#endif
CComPtr<IXAudio2> pXAudio2;
IXAudio2MasteringVoice* pMasteringVoice;
BaseStreamingVoice* voiceContext;
@ -245,7 +246,7 @@ public:
HRESULT hr;
jASSUME( pXAudio2 == NULL );
#if _WIN32_WINNT < 0x602
// On some systems XAudio2.7 can unload itself and cause PCSX2 to crash.
// Maintain an extra library reference so it can't do so. Does not
// affect XAudio 2.8+, but that's Win8+. See
@ -254,6 +255,7 @@ public:
xAudio2DLL = LoadLibrary(L"XAudioD2_7.dll");
#else
xAudio2DLL = LoadLibrary(L"XAudio2_7.dll");
#endif
#endif
//
@ -262,8 +264,10 @@ public:
CoInitializeEx( NULL, COINIT_MULTITHREADED );
UINT32 flags = 0;
#if _WIN32_WINNT < 0x602
if( IsDebugBuild )
flags |= XAUDIO2_DEBUG_ENGINE;
#endif
try
{
@ -273,9 +277,10 @@ public:
"Ensure that you have the latest DirectX runtimes installed, or use \n"
"DirectX / WaveOut drivers instead. Error Details:"
);
#if _WIN32_WINNT < 0x602
XAUDIO2_DEVICE_DETAILS deviceDetails;
pXAudio2->GetDeviceDetails( 0, &deviceDetails );
#endif
// Stereo Expansion was planned to grab the currently configured number of
// Speakers from Windows's audio config.
@ -291,8 +296,10 @@ public:
default: speakers = 2;
}
#if _WIN32_WINNT < 0x602
// Any windows driver should support stereo at the software level, I should think!
jASSUME( deviceDetails.OutputFormat.Format.nChannels > 1 );
#endif
//
// Create a mastering voice
@ -387,10 +394,12 @@ public:
pXAudio2.Release();
CoUninitialize();
#if _WIN32_WINNT < 0x602
if (xAudio2DLL) {
FreeLibrary(xAudio2DLL);
xAudio2DLL = nullptr;
}
#endif
}
virtual void Configure(uptr parent)