diff --git a/src/audio_core/sink/sink_details.cpp b/src/audio_core/sink/sink_details.cpp index 1b737eb12e..bf0cf048e1 100644 --- a/src/audio_core/sink/sink_details.cpp +++ b/src/audio_core/sink/sink_details.cpp @@ -10,9 +10,6 @@ #include #include "audio_core/sink/sink_details.h" -#ifdef HAVE_OBOE -#include "audio_core/sink/oboe_sink.h" -#endif #ifdef HAVE_CUBEB #include "audio_core/sink/cubeb_sink.h" #endif @@ -51,16 +48,6 @@ struct SinkDetails { // sink_details is ordered in terms of desirability, with the best choice at the top. constexpr SinkDetails sink_details[] = { -#ifdef HAVE_OBOE - SinkDetails{ - Settings::AudioEngine::Oboe, - [](std::string_view device_id) -> std::unique_ptr { - return std::make_unique(); - }, - [](bool capture) { return std::vector{"Default"}; }, - []() { return 0u; }, - }, -#endif #ifdef HAVE_CUBEB SinkDetails{ Settings::AudioEngine::Cubeb, diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h index a43df6924c..4b406f4c35 100644 --- a/src/common/settings_enums.h +++ b/src/common/settings_enums.h @@ -92,14 +92,14 @@ struct EnumMetadata { // AudioEngine must be specified discretely due to having existing but slightly different // canonicalizations // TODO (lat9nq): Remove explicit definition of AudioEngine/sink_id -enum class AudioEngine : u32 { Auto, Cubeb, Sdl3, Null, Oboe, }; +enum class AudioEngine : u32 { Auto, Cubeb, Sdl3, Null, }; template<> inline std::vector> EnumMetadata::Canonicalizations() { return { {"auto", AudioEngine::Auto}, {"cubeb", AudioEngine::Cubeb}, {"sdl3", AudioEngine::Sdl3}, - {"null", AudioEngine::Null}, {"oboe", AudioEngine::Oboe}, + {"null", AudioEngine::Null}, }; } /// @brief This is just a sufficiently large number that is more than the number of other enums declared here @@ -113,7 +113,7 @@ inline AudioEngine EnumMetadata::GetFirst() { } template<> inline AudioEngine EnumMetadata::GetLast() { - return AudioEngine::Oboe; + return AudioEngine::Null; } ENUM(AudioMode, Mono, Stereo, Surround);