moonpower/P3DS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle lack of an audio device gracefully without hangs

Browse Source
This commit is contained in:
wheremyfoodat
2024-12-05 01:27:12 +02:00
parent 63cbfbb523
commit 873fca076a
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/audio/miniaudio_device.hpp
View File

@@ -36,4 +36,6 @@ class MiniAudioDevice {
void start(); void start();
void stop(); void stop();
bool isInitialized() const { return initialized; }
}; };

4
src/emulator.cpp
View File

@@ -428,6 +428,10 @@ RomFS::DumpingResult Emulator::dumpRomFS(const std::filesystem::path& path) {
} }
void Emulator::setAudioEnabled(bool enable) { void Emulator::setAudioEnabled(bool enable) {
// Don't enable audio if we didn't manage to find an audio device and initialize it properly, otherwise audio sync will break,
// because the emulator will expect the audio device to drain the sample buffer, but there's no audio device running...
enable = enable && audioDevice.isInitialized();
if (!enable) { if (!enable) {
audioDevice.stop(); audioDevice.stop();
} else if (enable && romType != ROMType::None && running) { } else if (enable && romType != ROMType::None && running) {