From a57cad5d5e1a85efbb93c57686f0f9919d57b145 Mon Sep 17 00:00:00 2001 From: Emmanuel Hansen Date: Tue, 27 Jun 2023 15:58:35 +0000 Subject: [PATCH] add sdl audio backend as default audio --- .../LibRyujinx.NativeSample.csproj | 1 + src/LibRyujinx/LibRyujinx.cs | 18 +++++++++++++++--- src/LibRyujinx/LibRyujinx.csproj | 1 + 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/LibRyujinx.NativeSample/LibRyujinx.NativeSample.csproj b/src/LibRyujinx.NativeSample/LibRyujinx.NativeSample.csproj index 0c44a3456..249f81552 100644 --- a/src/LibRyujinx.NativeSample/LibRyujinx.NativeSample.csproj +++ b/src/LibRyujinx.NativeSample/LibRyujinx.NativeSample.csproj @@ -10,5 +10,6 @@ + diff --git a/src/LibRyujinx/LibRyujinx.cs b/src/LibRyujinx/LibRyujinx.cs index d9ae799d7..1a0c925aa 100644 --- a/src/LibRyujinx/LibRyujinx.cs +++ b/src/LibRyujinx/LibRyujinx.cs @@ -13,11 +13,14 @@ using Ryujinx.Audio.Backends.Dummy; using Ryujinx.HLE.HOS.SystemState; using Ryujinx.Ui.Common.Configuration; using Ryujinx.Common.Logging; +using Ryujinx.Audio.Integration; +using Ryujinx.Audio.Backends.SDL2; namespace LibRyujinx { public static partial class LibRyujinx { + internal static IHardwareDeviceDriver AudioDriver { get; set; } = new DummyHardwareDeviceDriver(); public static SwitchDevice? SwitchDevice { get; set; } [UnmanagedCallersOnly(EntryPoint = "initialize")] @@ -25,7 +28,11 @@ namespace LibRyujinx { var path = Marshal.PtrToStringAnsi(basePathPtr); - return Initialize(path); + var res = Initialize(path); + + InitializeAudio(); + + return res; } public static bool Initialize(string? basePath) @@ -60,6 +67,11 @@ namespace LibRyujinx return true; } + + public static void InitializeAudio() + { + AudioDriver = new SDL2HardwareDeviceDriver(); + } } public class SwitchDevice : IDisposable @@ -117,7 +129,7 @@ namespace LibRyujinx AccountManager, UserChannelPersistence, renderer, - new DummyHardwareDeviceDriver(), //Audio + LibRyujinx.AudioDriver, //Audio MemoryConfiguration.MemoryConfiguration4GiB, null, SystemLanguage.AmericanEnglish, @@ -133,7 +145,7 @@ namespace LibRyujinx isHostMapped ? MemoryManagerMode.HostMappedUnsafe : MemoryManagerMode.SoftwarePageTable, false, LibRyujinx.GraphicsConfiguration.AspectRatio, - 0, + 100, true, ""); diff --git a/src/LibRyujinx/LibRyujinx.csproj b/src/LibRyujinx/LibRyujinx.csproj index e4d099dec..bd4118d43 100644 --- a/src/LibRyujinx/LibRyujinx.csproj +++ b/src/LibRyujinx/LibRyujinx.csproj @@ -14,6 +14,7 @@ Speed +