summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2022-09-21 15:25:00 +0200
committerLioncash <mathew1800@gmail.com>2022-09-21 15:26:42 +0200
commitb59b967280d19348154ab52e2bec085d78605f79 (patch)
treeb826e3b269d322266b033e96901575e6ce5d2699 /src
parentMerge pull request #8849 from Morph1984/parallel-astc (diff)
downloadyuzu-b59b967280d19348154ab52e2bec085d78605f79.tar
yuzu-b59b967280d19348154ab52e2bec085d78605f79.tar.gz
yuzu-b59b967280d19348154ab52e2bec085d78605f79.tar.bz2
yuzu-b59b967280d19348154ab52e2bec085d78605f79.tar.lz
yuzu-b59b967280d19348154ab52e2bec085d78605f79.tar.xz
yuzu-b59b967280d19348154ab52e2bec085d78605f79.tar.zst
yuzu-b59b967280d19348154ab52e2bec085d78605f79.zip
Diffstat (limited to 'src')
-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 @@
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 sinks
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 @@
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.h
index 8cbd95e22..75604df18 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{};