1 files changed, 41 insertions, 13 deletions
diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs
index 9309ae41..16b4c376 100644
--- a/Ryujinx.HLE/HOS/Horizon.cs
+++ b/Ryujinx.HLE/HOS/Horizon.cs
@@ -2,9 +2,11 @@ using LibHac;
 using LibHac.Bcat;
 using LibHac.Fs;
 using LibHac.FsSystem;
-using Ryujinx.Audio.Renderer;
+using Ryujinx.Audio;
+using Ryujinx.Audio.Input;
+using Ryujinx.Audio.Integration;
+using Ryujinx.Audio.Output;
 using Ryujinx.Audio.Renderer.Device;
-using Ryujinx.Audio.Renderer.Integration;
 using Ryujinx.Audio.Renderer.Server;
 using Ryujinx.Common;
 using Ryujinx.Configuration;
@@ -51,6 +53,9 @@ namespace Ryujinx.HLE.HOS
         internal Switch Device { get; private set; }
 
         internal SurfaceFlinger SurfaceFlinger { get; private set; }
+        internal AudioManager AudioManager { get; private set; }
+        internal AudioOutputManager AudioOutputManager { get; private set; }
+        internal AudioInputManager AudioInputManager { get; private set; }
         internal AudioRendererManager AudioRendererManager { get; private set; }
         internal VirtualDeviceSessionRegistry AudioDeviceSessionRegistry { get; private set; }
 
@@ -206,29 +211,48 @@ namespace Ryujinx.HLE.HOS
 
         private void InitializeAudioRenderer()
         {
+            AudioManager = new AudioManager();
+            AudioOutputManager = new AudioOutputManager();
+            AudioInputManager = new AudioInputManager();
             AudioRendererManager = new AudioRendererManager();
             AudioDeviceSessionRegistry = new VirtualDeviceSessionRegistry();
 
-            IWritableEvent[] writableEvents = new IWritableEvent[RendererConstants.AudioRendererSessionCountMax];
+            IWritableEvent[] audioOutputRegisterBufferEvents = new IWritableEvent[Constants.AudioOutSessionCountMax];
 
-            for (int i = 0; i < writableEvents.Length; i++)
+            for (int i = 0; i < audioOutputRegisterBufferEvents.Length; i++)
             {
-                KEvent systemEvent = new KEvent(KernelContext);
+                KEvent registerBufferEvent = new KEvent(KernelContext);
 
-                writableEvents[i] = new AudioKernelEvent(systemEvent);
+                audioOutputRegisterBufferEvents[i] = new AudioKernelEvent(registerBufferEvent);
             }
 
-            HardwareDevice[] devices = new HardwareDevice[RendererConstants.AudioRendererSessionCountMax];
+            AudioOutputManager.Initialize(Device.AudioDeviceDriver, audioOutputRegisterBufferEvents);
+
+            IWritableEvent[] audioInputRegisterBufferEvents = new IWritableEvent[Constants.AudioInSessionCountMax];
 
-            // TODO: don't hardcode those values.
-            // TODO: keep the device somewhere and dispose it when exiting.
-            // TODO: This is kind of wrong, we should have an high level API for that and mix all buffers between them.
-            for (int i = 0; i < devices.Length; i++)
+            for (int i = 0; i < audioInputRegisterBufferEvents.Length; i++)
             {
-                devices[i] = new AalHardwareDevice(i, Device.AudioOut, 2, RendererConstants.TargetSampleRate);
+                KEvent registerBufferEvent = new KEvent(KernelContext);
+
+                audioInputRegisterBufferEvents[i] = new AudioKernelEvent(registerBufferEvent);
             }
 
-            AudioRendererManager.Initialize(writableEvents, devices);
+            AudioInputManager.Initialize(Device.AudioDeviceDriver, audioInputRegisterBufferEvents);
+
+            IWritableEvent[] systemEvents = new IWritableEvent[Constants.AudioRendererSessionCountMax];
+
+            for (int i = 0; i < systemEvents.Length; i++)
+            {
+                KEvent systemEvent = new KEvent(KernelContext);
+
+                systemEvents[i] = new AudioKernelEvent(systemEvent);
+            }
+
+            AudioManager.Initialize(Device.AudioDeviceDriver.GetUpdateRequiredEvent(), AudioOutputManager.Update, AudioInputManager.Update);
+
+            AudioRendererManager.Initialize(systemEvents, Device.AudioDeviceDriver);
+
+            AudioManager.Start();
         }
 
         public void InitializeServices()
@@ -363,6 +387,10 @@ namespace Ryujinx.HLE.HOS
                 // This is safe as KThread that are likely to call ioctls are going to be terminated by the post handler hook on the SVC facade.
                 INvDrvServices.Destroy();
 
+                AudioManager.Dispose();
+                AudioOutputManager.Dispose();
+                AudioInputManager.Dispose();
+
                 AudioRendererManager.Dispose();
 
                 KernelContext.Dispose();