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

1.0.0 branch: 

Merged the SPU2X fixes.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/1.0.0@5324 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2012-06-24 13:23:47 +00:00
parent b0da8c1a35
commit b9112de1d1
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/portaudio/build/msvc/portaudio.vcproj vendored
View File

@ -62,6 +62,7 @@
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="ksuser.lib"
/>
<Tool
Name="VCALinkTool"
@ -127,6 +128,7 @@
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="ksuser.lib"
/>
<Tool
Name="VCALinkTool"
@ -194,6 +196,7 @@
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="ksuser.lib"
/>
<Tool
Name="VCALinkTool"
@ -259,6 +262,7 @@
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="ksuser.lib"
/>
<Tool
Name="VCALinkTool"
@ -325,6 +329,7 @@
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="ksuser.lib"
/>
<Tool
Name="VCALinkTool"

10
3rdparty/portaudio/build/msvc/portaudio.vcxproj vendored
View File

@ -182,6 +182,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(Platform)\$(Configuration)\portaudio.bsc</OutputFile>
</Bscmake>
<Lib>
<AdditionalDependencies>ksuser.lib</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
@ -253,6 +256,7 @@
</Bscmake>
<Lib>
<LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
<AdditionalDependencies>ksuser.lib</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -326,6 +330,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(Platform)\$(Configuration)\portaudio.bsc</OutputFile>
</Bscmake>
<Lib>
<AdditionalDependencies>ksuser.lib</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release (NO ASIO)|x64'">
<Midl>
@ -395,6 +402,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(Platform)\$(Configuration)\portaudio.bsc</OutputFile>
</Bscmake>
<Lib>
<AdditionalDependencies>ksuser.lib</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (NO ASIO)|x64'">
<Midl>

12
3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c vendored
View File

@ -149,13 +149,13 @@ Default is to use the pin category.
#endif
#ifdef _MSC_VER
#define NOMMIDS
//#define NOMMIDS
#define DYNAMIC_GUID(data) {data}
#define _NTRTL_ /* Turn off default definition of DEFINE_GUIDEX */
#undef DEFINE_GUID
#define DEFINE_GUID(n,data) EXTERN_C const GUID n = {data}
#define DEFINE_GUID_THUNK(n,data) DEFINE_GUID(n,data)
#define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK(n, STATIC_##n)
//#define _NTRTL_ /* Turn off default definition of DEFINE_GUIDEX */
//#undef DEFINE_GUID
//#define DEFINE_GUID(n,data) EXTERN_C const GUID n = {data}
//#define DEFINE_GUID_THUNK(n,data) DEFINE_GUID(n,data)
//#define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK(n, STATIC_##n)
#endif
#include <setupapi.h>

2
plugins/spu2-x/src/Windows/SndOut_DSound.cpp
View File

@ -298,7 +298,7 @@ private:
for(int i=0;i<ndevs;i++)
{
SendMessage(GetDlgItem(hWnd,IDC_DS_DEVICE),CB_ADDSTRING,0,(LPARAM)m_devices[i].name.c_str());
if(haveGuid && IsEqualGUID(m_devices[i].guid,DevGuid))
if(haveGuid && IsEqualGUID(m_devices[i].guid,DevGuid) || tSel < 0 && !m_devices[i].hasGuid)
tSel = i;
}