Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

oboe_sink: handle temporary stream creation failure

Liamecf0037c3198
diff --git a/src/audio_core/sink/oboe_sink.cpp b/src/audio_core/sink/oboe_sink.cpp
index e618411722..466a9cc8e0 100644
--- a/src/audio_core/sink/oboe_sink.cpp
+++ b/src/audio_core/sink/oboe_sink.cpp
@@ -67,9 +67,13 @@ public:
oboe::AudioStreamBuilder builder;
const auto result = ConfigureBuilder(builder, direction)->openStream(temp_stream);
- ASSERT(result == oboe::Result::OK);
+ if (result == oboe::Result::OK) {
+ return temp_stream->getChannelCount() >= 6 ? 6 : 2;
+ }
- return temp_stream->getChannelCount() >= 6 ? 6 : 2;
+ LOG_ERROR(Audio_Sink, "Failed to open {} stream. Using default channel count 2",
+ direction == oboe::Direction::Output ? "output" : "input");
+ return 2;
}
protected: