Skip to content

Commit 96bf820

Browse files
hrydgardhrydgard
authored
Merge pull request #20533 from hrydgard/remove-dsound
Windows: Remove DirectSound support
2 parents 096a8bb + db1b87a commit 96bf820

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+22
-369
lines changed

‎CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2623,8 +2623,6 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/git-version.cpp
26232623
add_dependencies(${CoreLibName} GitVersion)
26242624

26252625
set(WindowsFiles
2626-
Windows/DSoundStream.cpp
2627-
Windows/DSoundStream.h
26282626
Windows/WindowsAudio.cpp
26292627
Windows/WindowsAudio.h
26302628
Windows/WASAPIStream.cpp
@@ -2671,8 +2669,6 @@ set(WindowsFiles
26712669
Windows/CaptureDevice.h
26722670
Windows/DinputDevice.cpp
26732671
Windows/DinputDevice.h
2674-
Windows/DSoundStream.cpp
2675-
Windows/DSoundStream.h
26762672
Windows/EmuThread.cpp
26772673
Windows/EmuThread.h
26782674
Windows/GeDebugger/GeDebugger.cpp

‎UI/GameSettingsScreen.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -676,14 +676,6 @@ void GameSettingsScreen::CreateAudioSettings(UI::ViewGroup *audioSettings) {
676676
});
677677
audioSettings->Add(new ItemHeader(a->T("Audio backend")));
678678

679-
// Hide the backend selector in UWP builds (we only support XAudio2 there).
680-
#if PPSSPP_PLATFORM(WINDOWS) && !PPSSPP_PLATFORM(UWP)
681-
if (IsVistaOrHigher()) {
682-
static const char *backend[] = { "Auto", "DSound (compatible)", "WASAPI (fast)" };
683-
audioSettings->Add(new PopupMultiChoice(&g_Config.iAudioBackend, a->T("Audio backend", "Audio backend (restart req.)"), backend, 0, ARRAY_SIZE(backend), I18NCat::AUDIO, screenManager()));
684-
}
685-
#endif
686-
687679
bool sdlAudio = false;
688680
#if defined(SDL)
689681
std::vector<std::string> audioDeviceList;

‎Windows/DSoundStream.cpp‎

Lines changed: 0 additions & 177 deletions
This file was deleted.

‎Windows/DSoundStream.h‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎Windows/PPSSPP.vcxproj‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
<LanguageStandard>stdcpp17</LanguageStandard>
196196
</ClCompile>
197197
<Link>
198-
<AdditionalDependencies>wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
198+
<AdditionalDependencies>wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
199199
<AdditionalLibraryDirectories>../ffmpeg/Windows/x86/lib</AdditionalLibraryDirectories>
200200
<GenerateDebugInformation>true</GenerateDebugInformation>
201201
<SubSystem>Windows</SubSystem>
@@ -235,7 +235,7 @@
235235
<LanguageStandard>stdcpp17</LanguageStandard>
236236
</ClCompile>
237237
<Link>
238-
<AdditionalDependencies>wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
238+
<AdditionalDependencies>wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
239239
<AdditionalLibraryDirectories>../ffmpeg/Windows/x86_64/lib</AdditionalLibraryDirectories>
240240
<GenerateDebugInformation>true</GenerateDebugInformation>
241241
<ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
@@ -271,7 +271,7 @@
271271
<LanguageStandard>stdcpp17</LanguageStandard>
272272
</ClCompile>
273273
<Link>
274-
<AdditionalDependencies>wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
274+
<AdditionalDependencies>wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
275275
<AdditionalLibraryDirectories>../ffmpeg/Windows/aarch64/lib</AdditionalLibraryDirectories>
276276
<GenerateDebugInformation>true</GenerateDebugInformation>
277277
<ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
@@ -309,7 +309,7 @@
309309
<LanguageStandard>stdcpp17</LanguageStandard>
310310
</ClCompile>
311311
<Link>
312-
<AdditionalDependencies>wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
312+
<AdditionalDependencies>wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
313313
<AdditionalLibraryDirectories>../ffmpeg/Windows/x86/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
314314
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
315315
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -358,7 +358,7 @@
358358
<LanguageStandard>stdcpp17</LanguageStandard>
359359
</ClCompile>
360360
<Link>
361-
<AdditionalDependencies>wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
361+
<AdditionalDependencies>wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
362362
<AdditionalLibraryDirectories>../ffmpeg/Windows/x86_64/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
363363
<GenerateDebugInformation>true</GenerateDebugInformation>
364364
<SubSystem>Windows</SubSystem>
@@ -401,7 +401,7 @@
401401
<LanguageStandard>stdcpp17</LanguageStandard>
402402
</ClCompile>
403403
<Link>
404-
<AdditionalDependencies>wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
404+
<AdditionalDependencies>wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
405405
<AdditionalLibraryDirectories>../ffmpeg/Windows/aarch64/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
406406
<GenerateDebugInformation>true</GenerateDebugInformation>
407407
<SubSystem>Windows</SubSystem>
@@ -713,7 +713,6 @@
713713
<ClCompile Include="InputBox.cpp" />
714714
<ClCompile Include="W32Util\TabControl.cpp" />
715715
<ClCompile Include="MainWindow.cpp" />
716-
<ClCompile Include="DSoundStream.cpp" />
717716
<ClCompile Include="GPU\WindowsGLContext.cpp">
718717
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
719718
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
@@ -1165,7 +1164,6 @@
11651164
<ClInclude Include="W32Util\TabControl.h" />
11661165
<ClInclude Include="InputBox.h" />
11671166
<ClInclude Include="MainWindow.h" />
1168-
<ClInclude Include="DSoundStream.h" />
11691167
<ClInclude Include="GPU\WindowsGLContext.h" />
11701168
<ClInclude Include="W32Util\UAHMenuBar.h" />
11711169
<ClInclude Include="WASAPIStream.h" />
@@ -1436,4 +1434,4 @@
14361434
<UserProperties RESOURCE_FILE="DaSh.rc" />
14371435
</VisualStudio>
14381436
</ProjectExtensions>
1439-
</Project>
1437+
</Project>

‎Windows/PPSSPP.vcxproj.filters‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@
9494
<ClCompile Include="InputBox.cpp">
9595
<Filter>Windows\UI</Filter>
9696
</ClCompile>
97-
<ClCompile Include="DSoundStream.cpp">
98-
<Filter>Windows\System</Filter>
99-
</ClCompile>
10097
<ClCompile Include="WindowsHost.cpp">
10198
<Filter>Windows\System</Filter>
10299
</ClCompile>
@@ -306,9 +303,6 @@
306303
<ClInclude Include="InputBox.h">
307304
<Filter>Windows\UI</Filter>
308305
</ClInclude>
309-
<ClInclude Include="DSoundStream.h">
310-
<Filter>Windows\System</Filter>
311-
</ClInclude>
312306
<ClInclude Include="WindowsHost.h">
313307
<Filter>Windows\System</Filter>
314308
</ClInclude>

‎Windows/WindowsAudio.cpp‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
#include "Common/OSVersion.h"
22
#include "WindowsAudio.h"
3-
#include "DSoundStream.h"
43
#include "WASAPIStream.h"
54

65
WindowsAudioBackend *CreateAudioBackend(AudioBackendType type) {
7-
if (IsVistaOrHigher()) {
8-
switch (type) {
9-
case AUDIO_BACKEND_WASAPI:
10-
case AUDIO_BACKEND_AUTO:
11-
return new WASAPIAudioBackend();
12-
case AUDIO_BACKEND_DSOUND:
13-
default:
14-
return new DSoundAudioBackend();
15-
}
16-
} else {
17-
return new DSoundAudioBackend();
18-
}
6+
return new WASAPIAudioBackend();
197
}

‎assets/lang/ar_AE.ini‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ Auto = تلقائي
7878
Buffer size = Buffer size
7979
Device = جهاز
8080
Disabled = غير مفعل
81-
DSound (compatible) = ‎DSound (متكامل)
8281
Enable Sound = ‎تفعيل الصوت
8382
Game volume = ‎الصوت العام
8483
Microphone = Microphone
@@ -90,7 +89,6 @@ Reverb volume = تردد الصوت
9089
UI sound = UI sound
9190
UI volume = UI volume
9291
Use new audio devices automatically = استعمل اجهزة الصوت الجديده تلقائيا
93-
WASAPI (fast) = ‎WASAPI (سريع)
9492
9593
[Controls]
9694
Analog Binding = ربط الانالوج

0 commit comments

Comments
 (0)