Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-08 07:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Audio: Properly close audio device on emulator destruction

Browse source
This commit is contained in:
wheremyfoodat 2024-11-19 23:40:15 +02:00 • committed by GitHub
parent 452510b932
commit 37ee5c5477
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/audio/miniaudio_device.hpp
View file

@ -21,10 +21,12 @@ class MiniAudioDevice {
bool running = false; bool running = false;
std::vector<std::string> audioDevices; std::vector<std::string> audioDevices;
public: public:
MiniAudioDevice(); MiniAudioDevice();
// If safe is on, we create a null audio device // If safe is on, we create a null audio device
void init(Samples& samples, bool safe = false); void init(Samples& samples, bool safe = false);
void close();
void start(); void start();
void stop(); void stop();

13
src/core/audio/miniaudio_device.cpp
View file

@ -130,7 +130,7 @@ void MiniAudioDevice::start() {
void MiniAudioDevice::stop() { void MiniAudioDevice::stop() {
if (!initialized) { if (!initialized) {
Helpers::warn("MiniAudio device not initialized, can't start"); Helpers::warn("MiniAudio device not initialized, can't stop");
return; return;
} }
@ -142,3 +142,14 @@ void MiniAudioDevice::stop() {
} }
} }
} }
void MiniAudioDevice::close() {
stop();
if (initialized) {
initialized = false;
ma_device_uninit(&device);
ma_context_uninit(&context);
}
}

3
src/emulator.cpp
View file

@ -50,6 +50,7 @@ Emulator::Emulator()
Emulator::~Emulator() { Emulator::~Emulator() {
config.save(); config.save();
lua.close(); lua.close();
audioDevice.close();
#ifdef PANDA3DS_ENABLE_DISCORD_RPC #ifdef PANDA3DS_ENABLE_DISCORD_RPC
discordRpc.stop(); discordRpc.stop();
@ -249,7 +250,7 @@ bool Emulator::loadROM(const std::filesystem::path& path) {
success = loadELF(path); success = loadELF(path);
else if (extension == ".3ds" || extension == ".cci") else if (extension == ".3ds" || extension == ".cci")
success = loadNCSD(path, ROMType::NCSD); success = loadNCSD(path, ROMType::NCSD);
else if (extension == ".cxi" || extension == ".app" || extension == ".ncch") else if (extension == ".cxi" || extension == ".app")
success = loadNCSD(path, ROMType::CXI); success = loadNCSD(path, ROMType::CXI);
else if (extension == ".3dsx") else if (extension == ".3dsx")
success = load3DSX(path); success = load3DSX(path);