Просмотр исходного кода

audio_manager: Remove dependence on system state

This isn't used by the class, so this can be removed for the time being.
Lioncash 3 лет назад
Родитель
Сommit
b59b967280
3 измененных файлов с 4 добавлено и 10 удалено
  1. 1 1
      src/audio_core/audio_core.cpp
  2. 1 1
      src/audio_core/audio_manager.cpp
  3. 2 8
      src/audio_core/audio_manager.h

+ 1 - 1
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);

+ 1 - 1
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(); });
 }
 

+ 2 - 8
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{};