Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 22:25:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Audio: Properly close audio device on emulator destruction (#637)

Browse source 
* Audio: Properly close audio device on emulator destruction

* Undo oopsie
This commit is contained in:
wheremyfoodat 2024-11-19 23:41:52 +02:00 • committed by GitHub
parent 452510b932
commit 889c2453de
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();

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

@ -27,8 +27,8 @@ void MiniAudioDevice::init(Samples& samples, bool safe) {
// TODO: Make backend selectable here // TODO: Make backend selectable here
found = true; found = true;
//count = 1; // count = 1;
//backends[0] = backend; // backends[0] = backend;
} }
if (!found) { if (!found) {
@ -81,8 +81,8 @@ void MiniAudioDevice::init(Samples& samples, bool safe) {
deviceConfig.playback.format = ma_format_s16; deviceConfig.playback.format = ma_format_s16;
deviceConfig.playback.channels = channelCount; deviceConfig.playback.channels = channelCount;
deviceConfig.sampleRate = sampleRate; deviceConfig.sampleRate = sampleRate;
//deviceConfig.periodSizeInFrames = 64; // deviceConfig.periodSizeInFrames = 64;
//deviceConfig.periods = 16; // deviceConfig.periods = 16;
deviceConfig.pUserData = this; deviceConfig.pUserData = this;
deviceConfig.aaudio.usage = ma_aaudio_usage_game; deviceConfig.aaudio.usage = ma_aaudio_usage_game;
deviceConfig.wasapi.noAutoConvertSRC = true; deviceConfig.wasapi.noAutoConvertSRC = true;
@ -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;
} }
@ -139,6 +139,17 @@ void MiniAudioDevice::stop() {
if (ma_device_stop(&device) != MA_SUCCESS) { if (ma_device_stop(&device) != MA_SUCCESS) {
Helpers::warn("Failed to stop audio device"); Helpers::warn("Failed to stop audio device");
} }
}
}
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();
@ -442,4 +443,4 @@ void Emulator::loadRenderdoc() {
std::string capturePath = (std::filesystem::current_path() / "RenderdocCaptures").generic_string(); std::string capturePath = (std::filesystem::current_path() / "RenderdocCaptures").generic_string();
Renderdoc::loadRenderdoc(); Renderdoc::loadRenderdoc();
Renderdoc::setOutputDir(capturePath, ""); Renderdoc::setOutputDir(capturePath, "");
} }