Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove dsound audio backend. #860

Merged
merged 1 commit into from
Aug 23, 2014
Merged

Remove dsound audio backend. #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions Source/Core/AudioCommon/AudioCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "AudioCommon/AOSoundStream.h"
#include "AudioCommon/AudioCommon.h"
#include "AudioCommon/CoreAudioSoundStream.h"
#include "AudioCommon/DSoundStream.h"
#include "AudioCommon/Mixer.h"
#include "AudioCommon/NullSoundStream.h"
#include "AudioCommon/OpenALStream.h"
Expand Down Expand Up @@ -37,8 +36,6 @@ namespace AudioCommon
soundStream = new OpenALStream(mixer);
else if (backend == BACKEND_NULLSOUND && NullSound::isValid())
soundStream = new NullSound(mixer);
else if (backend == BACKEND_DIRECTSOUND && DSound::isValid())
soundStream = new DSound(mixer, hWnd);
else if (backend == BACKEND_XAUDIO2)
{
if (XAudio2::isValid())
Expand Down Expand Up @@ -111,8 +108,6 @@ namespace AudioCommon

if (NullSound::isValid())
backends.push_back(BACKEND_NULLSOUND);
if (DSound::isValid())
backends.push_back(BACKEND_DIRECTSOUND);
if (XAudio2_7::isValid() || XAudio2::isValid())
backends.push_back(BACKEND_XAUDIO2);
if (AOSound::isValid())
Expand Down
2 changes: 0 additions & 2 deletions Source/Core/AudioCommon/AudioCommon.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<ClCompile Include="aldlist.cpp" />
<ClCompile Include="AudioCommon.cpp" />
<ClCompile Include="DPL2Decoder.cpp" />
<ClCompile Include="DSoundStream.cpp" />
<ClCompile Include="Mixer.cpp" />
<ClCompile Include="NullSoundStream.cpp" />
<ClCompile Include="OpenALStream.cpp" />
Expand All @@ -55,7 +54,6 @@
<ClInclude Include="AudioCommon.h" />
<ClInclude Include="CoreAudioSoundStream.h" />
<ClInclude Include="DPL2Decoder.h" />
<ClInclude Include="DSoundStream.h" />
<ClInclude Include="Mixer.h" />
<ClInclude Include="NullSoundStream.h" />
<ClInclude Include="OpenALStream.h" />
Expand Down
8 changes: 1 addition & 7 deletions Source/Core/AudioCommon/AudioCommon.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="SoundStreams">
Expand All @@ -11,9 +11,6 @@
<ClCompile Include="DPL2Decoder.cpp" />
<ClCompile Include="Mixer.cpp" />
<ClCompile Include="WaveFile.cpp" />
<ClCompile Include="DSoundStream.cpp">
<Filter>SoundStreams</Filter>
</ClCompile>
<ClCompile Include="NullSoundStream.cpp">
<Filter>SoundStreams</Filter>
</ClCompile>
Expand All @@ -37,9 +34,6 @@
<ClInclude Include="AOSoundStream.h">
<Filter>SoundStreams</Filter>
</ClInclude>
<ClInclude Include="DSoundStream.h">
<Filter>SoundStreams</Filter>
</ClInclude>
<ClInclude Include="NullSoundStream.h">
<Filter>SoundStreams</Filter>
</ClInclude>
Expand Down
1 change: 0 additions & 1 deletion Source/Core/AudioCommon/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ if(PULSEAUDIO_FOUND)
endif(PULSEAUDIO_FOUND)

if(WIN32)
set(SRCS ${SRCS} DSoundStream.cpp)
set(SRCS ${SRCS} XAudio2Stream.cpp)
endif(WIN32)

Expand Down
170 changes: 0 additions & 170 deletions Source/Core/AudioCommon/DSoundStream.cpp
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions Source/Core/AudioCommon/DSoundStream.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Source/Core/Core/ConfigManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#define BACKEND_ALSA "ALSA"
#define BACKEND_AOSOUND "AOSound"
#define BACKEND_COREAUDIO "CoreAudio"
#define BACKEND_DIRECTSOUND "DSound"
#define BACKEND_OPENAL "OpenAL"
#define BACKEND_PULSEAUDIO "Pulse"
#define BACKEND_XAUDIO2 "XAudio2"
Expand Down
3 changes: 1 addition & 2 deletions Source/Core/DolphinWX/ConfigMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,8 +1004,7 @@ bool CConfigMain::SupportsVolumeChanges(std::string backend)
//FIXME: this one should ask the backend whether it supports it.
// but getting the backend from string etc. is probably
// too much just to enable/disable a stupid slider...
return (backend == BACKEND_DIRECTSOUND ||
backend == BACKEND_COREAUDIO ||
return (backend == BACKEND_COREAUDIO ||
backend == BACKEND_OPENAL ||
backend == BACKEND_XAUDIO2);
}
Expand Down