summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/audio_core/audio_core.cpp2
-rw-r--r--src/audio_core/audio_manager.cpp2
-rw-r--r--src/audio_core/audio_manager.h10
3 files changed, 4 insertions, 10 deletions
diff --git a/src/audio_core/audio_core.cpp b/src/audio_core/audio_core.cpp
index c845330cd..07a679c32 100644
--- a/src/audio_core/audio_core.cpp
+++ b/src/audio_core/audio_core.cpp
@@ -8,7 +8,7 @@
8 8
9namespace AudioCore { 9namespace AudioCore {
10 10
11AudioCore::AudioCore(Core::System& system) : audio_manager{std::make_unique<AudioManager>(system)} { 11AudioCore::AudioCore(Core::System& system) : audio_manager{std::make_unique<AudioManager>()} {
12 CreateSinks(); 12 CreateSinks();
13 // Must be created after the sinks 13 // Must be created after the sinks
14 adsp = std::make_unique<AudioRenderer::ADSP::ADSP>(system, *output_sink); 14 adsp = std::make_unique<AudioRenderer::ADSP::ADSP>(system, *output_sink);
diff --git a/src/audio_core/audio_manager.cpp b/src/audio_core/audio_manager.cpp
index 2f1bba9c3..94f2f7e35 100644
--- a/src/audio_core/audio_manager.cpp
+++ b/src/audio_core/audio_manager.cpp
@@ -8,7 +8,7 @@
8 8
9namespace AudioCore { 9namespace AudioCore {
10 10
11AudioManager::AudioManager(Core::System& system_) : system{system_} { 11AudioManager::AudioManager() {
12 thread = std::jthread([this]() { ThreadFunc(); }); 12 thread = std::jthread([this]() { ThreadFunc(); });
13} 13}
14 14
diff --git a/src/audio_core/audio_manager.h b/src/audio_core/audio_manager.h
index 8cbd95e22..75604df18 100644
--- a/src/audio_core/audio_manager.h
+++ b/src/audio_core/audio_manager.h
@@ -12,10 +12,6 @@
12#include "audio_core/audio_event.h" 12#include "audio_core/audio_event.h"
13#include "core/hle/service/audio/errors.h" 13#include "core/hle/service/audio/errors.h"
14 14
15namespace Core {
16class System;
17}
18
19namespace AudioCore { 15namespace AudioCore {
20 16
21namespace AudioOut { 17namespace AudioOut {
@@ -43,7 +39,7 @@ class AudioManager {
43 using BufferEventFunc = std::function<void()>; 39 using BufferEventFunc = std::function<void()>;
44 40
45public: 41public:
46 explicit AudioManager(Core::System& system); 42 explicit AudioManager();
47 43
48 /** 44 /**
49 * Shutdown the audio manager. 45 * Shutdown the audio manager.
@@ -80,9 +76,7 @@ private:
80 */ 76 */
81 void ThreadFunc(); 77 void ThreadFunc();
82 78
83 /// Core system 79 /// Have sessions started playing?
84 Core::System& system;
85 /// Have sessions started palying?
86 bool sessions_started{}; 80 bool sessions_started{};
87 /// Is the main thread running? 81 /// Is the main thread running?
88 std::atomic<bool> running{}; 82 std::atomic<bool> running{};