FrontendCommon: Drop SDL2 audio output

src/core/CMakeLists.txt

@@ -129,6 +129,10 @@ if(WIN32)
   target_link_libraries(core PRIVATE winmm.lib)
 endif()
 
+if(ENABLE_CUBEB)
+  target_compile_definitions(core PUBLIC "WITH_CUBEB=1")
+endif()
+
 if(ENABLE_OPENGL)
   target_sources(core PRIVATE
     gpu_hw_opengl.cpp

src/core/core.props

@@ -5,6 +5,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>WITH_CHEEVOS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(BuildingForUWP)'!='true'">WITH_CUBEB=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="('$(BuildingForUWP)'!='true' And '$(Platform)'!='ARM64')">WITH_RAINTEGRATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="('$(Platform)'=='x64' Or '$(Platform)'=='ARM' Or '$(Platform)'=='ARM64')">WITH_RECOMPILER=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="('$(Platform)'=='x64' Or '$(Platform)'=='ARM64') And ('$(BuildingForUWP)'!='true')">WITH_MMAP_FASTMEM=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/core/settings.cpp

@@ -990,33 +990,31 @@ float Settings::GetDisplayAspectRatioValue() const
   }
 }
 
-static const auto s_audio_backend_names = make_array("Null", "Cubeb"
+static constexpr const char* s_audio_backend_names[] = {
+  "Null",
+#ifdef WITH_CUBEB
+  "Cubeb",
+#endif
 #ifdef _WIN32
-                                                     ,
-                                                     "XAudio2"
+  "XAudio2",
 #endif
-#ifndef ANDROID
-                                                     ,
-                                                     "SDL"
-#else
-                                                     ,
-                                                     "OpenSLES"
+#ifdef __ANDROID__
+  "AAudio",  "OpenSLES",
+#endif
+};
+static constexpr const char* s_audio_backend_display_names[] = {
+  TRANSLATABLE("AudioBackend", "Null (No Output)"),
+#ifdef WITH_CUBEB
+  TRANSLATABLE("AudioBackend", "Cubeb"),
 #endif
-);
-static const auto s_audio_backend_display_names =
-  make_array(TRANSLATABLE("AudioBackend", "Null (No Output)"), TRANSLATABLE("AudioBackend", "Cubeb")
 #ifdef _WIN32
-                                                                 ,
-             TRANSLATABLE("AudioBackend", "XAudio2")
+  TRANSLATABLE("AudioBackend", "XAudio2"),
 #endif
-#ifndef ANDROID
-               ,
-             TRANSLATABLE("AudioBackend", "SDL")
-#else
-                                                                 ,
-             TRANSLATABLE("AudioBackend", "OpenSL ES")
+#ifdef __ANDROID__
+  "AAudio",
+  "OpenSL ES",
 #endif
-  );
+};
 
 std::optional<AudioBackend> Settings::ParseAudioBackend(const char* str)
 {

src/core/types.h

@@ -112,13 +112,14 @@ enum class DisplayAspectRatio : u8
 enum class AudioBackend : u8
 {
   Null,
+#ifdef WITH_CUBEB
   Cubeb,
+#endif
 #ifdef _WIN32
   XAudio2,
 #endif
-#ifndef ANDROID
-  SDL,
-#else
+#ifdef __ANDROID__
+  AAudio,
   OpenSLES,
 #endif
   Count