1 files changed, 13 insertions, 9 deletions
diff --git a/Ryujinx/Ui/MainWindow.cs b/Ryujinx/Ui/MainWindow.cs
index 828fe853..809b693b 100644
--- a/Ryujinx/Ui/MainWindow.cs
+++ b/Ryujinx/Ui/MainWindow.cs
@@ -4,6 +4,10 @@ using Gtk;
 using LibHac.Common;
 using LibHac.Ns;
 using Ryujinx.Audio;
+using Ryujinx.Audio.Backends.Dummy;
+using Ryujinx.Audio.Backends.OpenAL;
+using Ryujinx.Audio.Backends.SoundIo;
+using Ryujinx.Audio.Integration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.System;
@@ -281,14 +285,14 @@ namespace Ryujinx.Ui
         {
             _virtualFileSystem.Reload();
 
-            IRenderer  renderer    = new Renderer();
-            IAalOutput audioEngine = new DummyAudioOut();
+            IRenderer renderer = new Renderer();
+            IHardwareDeviceDriver deviceDriver = new DummyHardwareDeviceDriver();
 
             if (ConfigurationState.Instance.System.AudioBackend.Value == AudioBackend.SoundIo)
             {
-                if (SoundIoAudioOut.IsSupported)
+                if (SoundIoHardwareDeviceDriver.IsSupported)
                 {
-                    audioEngine = new SoundIoAudioOut();
+                    deviceDriver = new SoundIoHardwareDeviceDriver();
                 }
                 else
                 {
@@ -297,22 +301,22 @@ namespace Ryujinx.Ui
             }
             else if (ConfigurationState.Instance.System.AudioBackend.Value == AudioBackend.OpenAl)
             {
-                if (OpenALAudioOut.IsSupported)
+                if (OpenALHardwareDeviceDriver.IsSupported)
                 {
-                    audioEngine = new OpenALAudioOut();
+                    deviceDriver = new OpenALHardwareDeviceDriver();
                 }
                 else
                 {
                     Logger.Warning?.Print(LogClass.Audio, "OpenAL is not supported, trying to fall back to SoundIO.");
 
-                    if (SoundIoAudioOut.IsSupported)
+                    if (SoundIoHardwareDeviceDriver.IsSupported)
                     {
                         Logger.Warning?.Print(LogClass.Audio, "Found SoundIO, changing configuration.");
 
                         ConfigurationState.Instance.System.AudioBackend.Value = AudioBackend.SoundIo;
                         SaveConfig();
 
-                        audioEngine = new SoundIoAudioOut();
+                        deviceDriver = new SoundIoHardwareDeviceDriver();
                     }
                     else
                     {
@@ -321,7 +325,7 @@ namespace Ryujinx.Ui
                 }
             }
 
-            _emulationContext = new HLE.Switch(_virtualFileSystem, _contentManager, _userChannelPersistence, renderer, audioEngine)
+            _emulationContext = new HLE.Switch(_virtualFileSystem, _contentManager, _userChannelPersistence, renderer, deviceDriver)
             {
                 UiHandler = _uiHandler
             };