Audio: Properly close audio device on emulator destruction (#637)
* Audio: Properly close audio device on emulator destruction * Undo oopsie
This commit is contained in:
@@ -21,10 +21,12 @@ class MiniAudioDevice {
|
||||
bool running = false;
|
||||
|
||||
std::vector<std::string> audioDevices;
|
||||
|
||||
public:
|
||||
MiniAudioDevice();
|
||||
// If safe is on, we create a null audio device
|
||||
void init(Samples& samples, bool safe = false);
|
||||
void close();
|
||||
|
||||
void start();
|
||||
void stop();
|
||||
|
||||
@@ -130,7 +130,7 @@ void MiniAudioDevice::start() {
|
||||
|
||||
void MiniAudioDevice::stop() {
|
||||
if (!initialized) {
|
||||
Helpers::warn("MiniAudio device not initialized, can't start");
|
||||
Helpers::warn("MiniAudio device not initialized, can't stop");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -142,3 +142,14 @@ void MiniAudioDevice::stop() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void MiniAudioDevice::close() {
|
||||
stop();
|
||||
|
||||
if (initialized) {
|
||||
initialized = false;
|
||||
|
||||
ma_device_uninit(&device);
|
||||
ma_context_uninit(&context);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,6 +50,7 @@ Emulator::Emulator()
|
||||
Emulator::~Emulator() {
|
||||
config.save();
|
||||
lua.close();
|
||||
audioDevice.close();
|
||||
|
||||
#ifdef PANDA3DS_ENABLE_DISCORD_RPC
|
||||
discordRpc.stop();
|
||||
|
||||
Reference in New Issue
Block a user