Merge pull request #5190 from ligfx/removeao

Remove libao sound backend

CMakeLists.txt

@@ -21,7 +21,6 @@ option(ENABLE_LTO "Enables Link Time Optimization" OFF)
 option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
 option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)
 option(ENABLE_ALSA "Enables ALSA sound backend" ON)
-option(ENABLE_AO "Enables libao sound backend" ON)
 option(ENABLE_PULSEAUDIO "Enables PulseAudio sound backend" ON)
 option(ENABLE_OPENAL "Enables OpenAL sound backend" ON)
 option(ENABLE_LLVM "Enables LLVM support, for disassembly" ON)

Source/Core/AudioCommon/AudioCommon.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "AudioCommon/AudioCommon.h"
-#include "AudioCommon/AOSoundStream.h"
 #include "AudioCommon/AlsaSoundStream.h"
 #include "AudioCommon/CoreAudioSoundStream.h"
 #include "AudioCommon/Mixer.h"
@@ -42,8 +41,6 @@ void InitSoundStream()
     else if (XAudio2_7::isValid())
       g_sound_stream = std::make_unique<XAudio2_7>();
   }
-  else if (backend == BACKEND_AOSOUND && AOSound::isValid())
-    g_sound_stream = std::make_unique<AOSound>();
   else if (backend == BACKEND_ALSA && AlsaSound::isValid())
     g_sound_stream = std::make_unique<AlsaSound>();
   else if (backend == BACKEND_COREAUDIO && CoreAudioSound::isValid())
@@ -115,8 +112,6 @@ std::vector<std::string> GetSoundBackends()
   backends.push_back(BACKEND_NULLSOUND);
   if (XAudio2_7::isValid() || XAudio2::isValid())
     backends.push_back(BACKEND_XAUDIO2);
-  if (AOSound::isValid())
-    backends.push_back(BACKEND_AOSOUND);
   if (AlsaSound::isValid())
     backends.push_back(BACKEND_ALSA);
   if (CoreAudioSound::isValid())

Source/Core/AudioCommon/AudioCommon.vcxproj

@@ -50,7 +50,6 @@
   <ItemGroup>
     <ClInclude Include="aldlist.h" />
     <ClInclude Include="AlsaSoundStream.h" />
-    <ClInclude Include="AOSoundStream.h" />
     <ClInclude Include="AudioCommon.h" />
     <ClInclude Include="CoreAudioSoundStream.h" />
     <ClInclude Include="DPL2Decoder.h" />
@@ -78,4 +77,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Source/Core/AudioCommon/AudioCommon.vcxproj.filters

@@ -30,9 +30,6 @@
     <ClInclude Include="DPL2Decoder.h" />
     <ClInclude Include="Mixer.h" />
     <ClInclude Include="WaveFile.h" />
-    <ClInclude Include="AOSoundStream.h">
-      <Filter>SoundStreams</Filter>
-    </ClInclude>
     <ClInclude Include="NullSoundStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
@@ -64,4 +61,4 @@
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+</Project>

Source/Core/AudioCommon/CMakeLists.txt

@@ -29,20 +29,6 @@ else()
   message(STATUS "ALSA explicitly disabled, disabling ALSA sound backend")
 endif()
 
-if(ENABLE_AO)
-  find_package(AO)
-  if(AO_FOUND)
-    message(STATUS "ao found, enabling ao sound backend")
-    target_sources(audiocommon PRIVATE AOSoundStream.cpp)
-    target_link_libraries(audiocommon PRIVATE AO::AO)
-    target_compile_definitions(audiocommon PRIVATE HAVE_AO=1)
-  else()
-    message(STATUS "ao NOT found, disabling ao sound backend")
-  endif()
-else()
-  message(STATUS "ao explicitly disabled, disabling ao sound backend")
-endif()
-
 if(ENABLE_OPENAL)
   if(WIN32)
     set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/Externals/OpenAL)

Source/Core/Core/ConfigManager.h

@@ -32,7 +32,6 @@ class TMDReader;
 // DSP Backend Types
 #define BACKEND_NULLSOUND _trans("No audio output")
 #define BACKEND_ALSA "ALSA"
-#define BACKEND_AOSOUND "AOSound"
 #define BACKEND_COREAUDIO "CoreAudio"
 #define BACKEND_OPENAL "OpenAL"
 #define BACKEND_PULSEAUDIO "Pulse"