VERY experimental Nintendo Switch 2 emulator
C++
audio_manager: Remove dependence on system state
Lioncash1019e52885d3
diff --git a/src/audio_core/audio_core.cpp b/src/audio_core/audio_core.cppindex c845330cd4..07a679c32f 100644--- a/src/audio_core/audio_core.cpp+++ b/src/audio_core/audio_core.cpp@@ -8,7 +8,7 @@namespace AudioCore {-AudioCore::AudioCore(Core::System& system) : audio_manager{std::make_unique<AudioManager>(system)} {+AudioCore::AudioCore(Core::System& system) : audio_manager{std::make_unique<AudioManager>()} {CreateSinks();// Must be created after the sinksadsp = std::make_unique<AudioRenderer::ADSP::ADSP>(system, *output_sink);diff --git a/src/audio_core/audio_manager.cpp b/src/audio_core/audio_manager.cppindex 2f1bba9c3c..94f2f7e35f 100644--- a/src/audio_core/audio_manager.cpp+++ b/src/audio_core/audio_manager.cpp@@ -8,7 +8,7 @@namespace AudioCore {-AudioManager::AudioManager(Core::System& system_) : system{system_} {+AudioManager::AudioManager() {thread = std::jthread([this]() { ThreadFunc(); });}diff --git a/src/audio_core/audio_manager.h b/src/audio_core/audio_manager.hindex 8cbd95e22e..75604df18d 100644--- a/src/audio_core/audio_manager.h+++ b/src/audio_core/audio_manager.h@@ -12,10 +12,6 @@#include "audio_core/audio_event.h"#include "core/hle/service/audio/errors.h"-namespace Core {-class System;-}-namespace AudioCore {namespace AudioOut {@@ -43,7 +39,7 @@ class AudioManager {using BufferEventFunc = std::function<void()>;public:- explicit AudioManager(Core::System& system);+ explicit AudioManager();/*** Shutdown the audio manager.@@ -80,9 +76,7 @@ private:*/void ThreadFunc();- /// Core system- Core::System& system;- /// Have sessions started palying?+ /// Have sessions started playing?bool sessions_started{};/// Is the main thread running?std::atomic<bool> running{};