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

spu2-x:windows: Remove VersionHelpers workaround 

We've moved to the non-XP toolkit - it can be removed.
This commit is contained in:
Jonathan Li 2016-02-26 03:57:53 +00:00
parent 8b74c108a4
commit 5ea80b86db
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/spu2-x/src/Windows/Config.cpp
View File

@ -82,20 +82,6 @@ int numSpeakers = 0;
int dplLevel = 0; int dplLevel = 0;
/*****************************************************************************/ /*****************************************************************************/
BOOL IsVistaOrGreater2() // workaround for XP toolset missing VersionHelpers.h
{
OSVERSIONINFOEX osvi;
DWORDLONG dwlConditionMask = 0;
int op = VER_GREATER_EQUAL;
ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
osvi.dwMajorVersion = 6;
VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, op);
return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask);
}
void ReadSettings() void ReadSettings()
{ {
@ -140,12 +126,8 @@ void ReadSettings()
// portaudio occasionally has issues selecting the proper default audio device. // portaudio occasionally has issues selecting the proper default audio device.
// let's use xaudio2 until this is sorted (rama) // let's use xaudio2 until this is sorted (rama)
// if ( IsVistaOrGreater2() ) { // XA2 for WinXP, morder modern gets Portaudio
// CfgReadStr(L"OUTPUT", L"Output_Module", omodid, 127, PortaudioOut->GetIdent()); // CfgReadStr(L"OUTPUT", L"Output_Module", omodid, 127, PortaudioOut->GetIdent());
// }
// else {
CfgReadStr(L"OUTPUT", L"Output_Module", omodid, 127, XAudio2Out->GetIdent()); CfgReadStr(L"OUTPUT", L"Output_Module", omodid, 127, XAudio2Out->GetIdent());
// }
// find the driver index of this module: // find the driver index of this module:
OutputModule = FindOutputModuleById( omodid ); OutputModule = FindOutputModuleById( omodid );

1
plugins/spu2-x/src/Windows/WinConfig.h
View File

@ -25,6 +25,7 @@
#include <commctrl.h> #include <commctrl.h>
#include <initguid.h> #include <initguid.h>
#include <tchar.h> #include <tchar.h>
#include <VersionHelpers.h>
#include "resource.h" #include "resource.h"