1 files changed, 12 insertions, 9 deletions
diff --git a/src/core/hle/service/audio/audout_u.h b/src/core/hle/service/audio/audout_u.h
index d82004c2e..fdc0ee754 100644
--- a/src/core/hle/service/audio/audout_u.h
+++ b/src/core/hle/service/audio/audout_u.h
@@ -3,13 +3,11 @@
 
 #pragma once
 
-#include <vector>
+#include "audio_core/audio_out_manager.h"
+#include "audio_core/out/audio_out.h"
+#include "core/hle/service/kernel_helpers.h"
 #include "core/hle/service/service.h"
 
-namespace AudioCore {
-class AudioOut;
-}
-
 namespace Core {
 class System;
 }
@@ -18,6 +16,11 @@ namespace Kernel {
 class HLERequestContext;
 }
 
+namespace AudioCore::AudioOut {
+class Manager;
+class Out;
+} // namespace AudioCore::AudioOut
+
 namespace Service::Audio {
 
 class IAudioOut;
@@ -28,11 +31,11 @@ public:
     ~AudOutU() override;
 
 private:
-    void ListAudioOutsImpl(Kernel::HLERequestContext& ctx);
-    void OpenAudioOutImpl(Kernel::HLERequestContext& ctx);
+    void ListAudioOuts(Kernel::HLERequestContext& ctx);
+    void OpenAudioOut(Kernel::HLERequestContext& ctx);
 
-    std::vector<std::shared_ptr<IAudioOut>> audio_out_interfaces;
-    std::unique_ptr<AudioCore::AudioOut> audio_core;
+    KernelHelpers::ServiceContext service_context;
+    std::unique_ptr<AudioCore::AudioOut::Manager> impl;
 };
 
 } // namespace Service::Audio