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

SPU2: enabling portaudio on windows

This commit is contained in:
GovanifY 2020-09-26 12:56:51 +02:00 committed by refractionpcsx2
parent f58d9e3f39
commit 3d3e4ec1ba
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/SPU2/SndOut_Portaudio.cpp
View File

@ -14,18 +14,20 @@
*/ */
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "Mixer.h" //#include "Mixer.h"
#include "Global.h" #include "Global.h"
#include "SndOut.h" #include "SndOut.h"
#define _WIN32_DCOM #define _WIN32_DCOM
#ifdef _WIN32 #ifdef _WIN32
#include <portaudio/include/portaudio.h>
#include "Windows/Dialogs.h" #include "Windows/Dialogs.h"
#elif defined __linux #elif defined __linux
#include "portaudio.h"
#include "Linux/Dialogs.h" #include "Linux/Dialogs.h"
#endif #endif
#include "portaudio.h"
#include "wchar.h" #include "wchar.h"
@ -556,7 +558,7 @@ public:
// keep portaudio initialized until the dialog closes // keep portaudio initialized until the dialog closes
INT_PTR ret; INT_PTR ret;
ret = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_PORTAUDIO), (HWND)parent, (DLGPROC)ConfigProc, 1); ret = DialogBoxParam(nullptr, MAKEINTRESOURCE(IDD_PORTAUDIO), (HWND)parent, (DLGPROC)ConfigProc, 1);
if (ret == -1) if (ret == -1)
{ {
MessageBox((HWND)parent, L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); MessageBox((HWND)parent, L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND);

7
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -62,6 +62,12 @@
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>PrecompiledHeader.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>PrecompiledHeader.h</PrecompiledHeaderFile>
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;SPU2X_PORTAUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;SPU2X_PORTAUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NDEBUG;_SECURE_SCL_=0;SPU2X_PORTAUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;_SECURE_SCL_=0;SPU2X_PORTAUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;SPU2X_PORTAUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;SPU2X_PORTAUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<LargeAddressAware>Yes</LargeAddressAware> <LargeAddressAware>Yes</LargeAddressAware>
@ -276,6 +282,7 @@
<ClCompile Include="..\..\SPU2\DplIIdecoder.cpp" /> <ClCompile Include="..\..\SPU2\DplIIdecoder.cpp" />
<ClCompile Include="..\..\SPU2\debug.cpp" /> <ClCompile Include="..\..\SPU2\debug.cpp" />
<ClCompile Include="..\..\SPU2\RegLog.cpp" /> <ClCompile Include="..\..\SPU2\RegLog.cpp" />
<ClCompile Include="..\..\SPU2\SndOut_Portaudio.cpp" />
<ClCompile Include="..\..\SPU2\spu2replay.cpp" /> <ClCompile Include="..\..\SPU2\spu2replay.cpp" />
<ClCompile Include="..\..\SPU2\wavedump_wav.cpp" /> <ClCompile Include="..\..\SPU2\wavedump_wav.cpp" />
<ClCompile Include="..\..\SPU2\Lowpass.cpp" /> <ClCompile Include="..\..\SPU2\Lowpass.cpp" />

3
pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
View File

@ -997,6 +997,9 @@
<ClCompile Include="..\..\SPU2\wavedump_wav.cpp"> <ClCompile Include="..\..\SPU2\wavedump_wav.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\SndOut_Portaudio.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\Patch.h"> <ClInclude Include="..\..\Patch.h">