audio: Cleanup Ryujinx.Audio and fix OpenAL issue (#1746)

* audio: Cleanup SoundIO and fix OpenAL issue

* fix tabs by spaces

* Fix extra spaces

* Fix SoundIO.cs

* Fix ContainsAudioOutBuffer

Ryujinx.Audio/Decoders/Adpcm/AdpcmDecoder.cs

@@ -1,91 +0,0 @@
-namespace Ryujinx.Audio.Adpcm
-{
-    public static class AdpcmDecoder
-    {
-        private const int SamplesPerFrame = 14;
-        private const int BytesPerFrame   = 8;
-
-        public static int[] Decode(byte[] Buffer, AdpcmDecoderContext Context)
-        {
-            int Samples = GetSamplesCountFromSize(Buffer.Length);
-
-            int[] Pcm = new int[Samples * 2];
-
-            short History0 = Context.History0;
-            short History1 = Context.History1;
-
-            int InputOffset  = 0;
-            int OutputOffset = 0;
-
-            while (InputOffset < Buffer.Length)
-            {
-                byte Header = Buffer[InputOffset++];
-
-                int Scale = 0x800 << (Header & 0xf);
-
-                int CoeffIndex = (Header >> 4) & 7;
-
-                short Coeff0 = Context.Coefficients[CoeffIndex * 2 + 0];
-                short Coeff1 = Context.Coefficients[CoeffIndex * 2 + 1];
-
-                int FrameSamples = SamplesPerFrame;
-
-                if (FrameSamples > Samples)
-                {
-                    FrameSamples = Samples;
-                }
-
-                int Value = 0;
-
-                for (int SampleIndex = 0; SampleIndex < FrameSamples; SampleIndex++)
-                {
-                    int Sample;
-
-                    if ((SampleIndex & 1) == 0)
-                    {
-                        Value = Buffer[InputOffset++];
-
-                        Sample = (Value << 24) >> 28;
-                    }
-                    else
-                    {
-                        Sample = (Value << 28) >> 28;
-                    }
-
-                    int Prediction = Coeff0 * History0 + Coeff1 * History1;
-
-                    Sample = (Sample * Scale + Prediction + 0x400) >> 11;
-
-                    short SaturatedSample = DspUtils.Saturate(Sample);
-
-                    History1 = History0;
-                    History0 = SaturatedSample;
-
-                    Pcm[OutputOffset++] = SaturatedSample;
-                    Pcm[OutputOffset++] = SaturatedSample;
-                }
-
-                Samples -= FrameSamples;
-            }
-
-            Context.History0 = History0;
-            Context.History1 = History1;
-
-            return Pcm;
-        }
-
-        public static long GetSizeFromSamplesCount(int SamplesCount)
-        {
-            int Frames = SamplesCount / SamplesPerFrame;
-
-            return Frames * BytesPerFrame;
-        }
-
-        public static int GetSamplesCountFromSize(long Size)
-        {
-            int Frames = (int)(Size / BytesPerFrame);
-
-            return Frames * SamplesPerFrame;
-        }
-    }
-}

Ryujinx.Audio/Decoders/Adpcm/AdpcmDecoderContext.cs

@@ -1,10 +0,0 @@
-namespace Ryujinx.Audio.Adpcm
-{
-    public class AdpcmDecoderContext
-    {
-        public short[] Coefficients;
-
-        public short History0;
-        public short History1;
-    }
-}

Ryujinx.Audio/Downmixing.cs

@@ -31,20 +31,24 @@ namespace Ryujinx.Audio
         private const int Minus6dBInQ15  = (int)(0.501f * RawQ15One);
         private const int Minus12dBInQ15 = (int)(0.251f * RawQ15One);
 
-        private static int[] DefaultSurroundToStereoCoefficients = new int[4]
+        private static readonly int[] DefaultSurroundToStereoCoefficients = new int[4]
         {
             RawQ15One,
             Minus3dBInQ15,
             Minus12dBInQ15,
-            Minus3dBInQ15,
+            Minus3dBInQ15
         };
 
-        private static int[] DefaultStereoToMonoCoefficients = new int[2]
+        private static readonly int[] DefaultStereoToMonoCoefficients = new int[2]
         {
             Minus6dBInQ15,
-            Minus6dBInQ15,
+            Minus6dBInQ15
         };
 
+        private const int SurroundChannelCount = 6;
+        private const int StereoChannelCount   = 2;
+        private const int MonoChannelCount     = 1;
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static ReadOnlySpan<Channel51FormatPCM16> GetSurroundBuffer(ReadOnlySpan<short> data)
         {
@@ -72,9 +76,6 @@ namespace Ryujinx.Audio
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static short[] DownMixSurroundToStereo(ReadOnlySpan<int> coefficients, ReadOnlySpan<short> data)
         {
-            const int SurroundChannelCount = 6;
-            const int StereoChannelCount = 2;
-
             int samplePerChannelCount = data.Length / SurroundChannelCount;
 
             short[] downmixedBuffer = new short[samplePerChannelCount * StereoChannelCount];
@@ -95,9 +96,6 @@ namespace Ryujinx.Audio
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static short[] DownMixStereoToMono(ReadOnlySpan<int> coefficients, ReadOnlySpan<short> data)
         {
-            const int StereoChannelCount = 2;
-            const int MonoChannelCount = 1;
-
             int samplePerChannelCount = data.Length / StereoChannelCount;
 
             short[] downmixedBuffer = new short[samplePerChannelCount * MonoChannelCount];

Ryujinx.Audio/DspUtils.cs

@@ -1,16 +0,0 @@
-namespace Ryujinx.Audio
-{
-    public static class DspUtils
-    {
-        public static short Saturate(int Value)
-        {
-            if (Value > short.MaxValue)
-                Value = short.MaxValue;
-
-            if (Value < short.MinValue)
-                Value = short.MinValue;
-
-            return (short)Value;
-        }
-    }
-}

Ryujinx.Audio/IAalOutput.cs

@@ -13,17 +13,13 @@ namespace Ryujinx.Audio
                 return targetChannelCount;
             }
 
-            switch (targetChannelCount)
+            return targetChannelCount switch
             {
-                case 6:
+                6 => SelectHardwareChannelCount(2),
-                    return SelectHardwareChannelCount(2);
+                2 => SelectHardwareChannelCount(1),
-                case 2:
+                1 => throw new ArgumentException("No valid channel configuration found!"),
-                    return SelectHardwareChannelCount(1);
+                _ => throw new ArgumentException($"Invalid targetChannelCount {targetChannelCount}"),
-                case 1:
+            };
-                    throw new ArgumentException("No valid channel configuration found!");
-                default:
-                    throw new ArgumentException($"Invalid targetChannelCount {targetChannelCount}");
-            }
         }
 
         int OpenTrack(int sampleRate, int channels, ReleaseCallback callback)

Ryujinx.Audio/Native/libsoundio/SoundIO.cs

@@ -21,7 +21,10 @@ namespace SoundIOSharp
         public void Dispose ()
         {
             foreach (var h in allocated_hglobals)
+            {
                 Marshal.FreeHGlobal(h);
+            }
+
             Natives.soundio_destroy(handle);
         }
 
@@ -30,6 +33,7 @@ namespace SoundIOSharp
         public override bool Equals(object other)
         {
             var d = other as SoundIO;
+
             return d != null && this.handle == d.handle;
         }
 
@@ -40,12 +44,12 @@ namespace SoundIOSharp
 
         public static bool operator == (SoundIO obj1, SoundIO obj2)
         {
-			return (object)obj1 == null ? (object)obj2 == null : obj1.Equals (obj2);
+            return obj1 is null ? obj2 is null : obj1.Equals(obj2);
         }
 
         public static bool operator != (SoundIO obj1, SoundIO obj2)
         {
-			return (object)obj1 == null ? (object)obj2 != null : !obj1.Equals (obj2);
+            return obj1 is null ? obj2 is object : !obj1.Equals(obj2);
         }
 
         // fields
@@ -56,124 +60,182 @@ namespace SoundIOSharp
 
         public string ApplicationName {
             get { return Marshal.PtrToStringAnsi(Marshal.ReadIntPtr(handle, app_name_offset)); }
-			set {
+            set
-				unsafe {
+            {
+                unsafe
+                {
                     var existing = Marshal.ReadIntPtr(handle, app_name_offset);
-					if (allocated_hglobals.Contains (existing)) {
+                    if (allocated_hglobals.Contains (existing))
+                    {
                         allocated_hglobals.Remove(existing);
                         Marshal.FreeHGlobal(existing);
                     }
+
                     var ptr = Marshal.StringToHGlobalAnsi(value);
                     Marshal.WriteIntPtr(handle, app_name_offset, ptr);
                     allocated_hglobals.Add(ptr);
                 }
             }
         }
+
         static readonly int app_name_offset = (int)Marshal.OffsetOf<SoundIo>("app_name");
 
-		public SoundIOBackend CurrentBackend {
+        public SoundIOBackend CurrentBackend
+        {
             get { return (SoundIOBackend)Marshal.ReadInt32(handle, current_backend_offset); }
         }
+
         static readonly int current_backend_offset = (int)Marshal.OffsetOf<SoundIo>("current_backend");
 
         // emit_rtprio_warning
-		public Action EmitRealtimePriorityWarning {
+        public Action EmitRealtimePriorityWarning
+        {
             get { return emit_rtprio_warning; }
-			set {
+            set
+            {
                 emit_rtprio_warning = value;
+
                 var ptr = Marshal.GetFunctionPointerForDelegate(on_devices_change);
+
                 Marshal.WriteIntPtr(handle, emit_rtprio_warning_offset, ptr);
             }
         }
+
         static readonly int emit_rtprio_warning_offset = (int)Marshal.OffsetOf<SoundIo>("emit_rtprio_warning");
+
         Action emit_rtprio_warning;
 
         // jack_error_callback
-		public Action<string> JackErrorCallback {
+        public Action<string> JackErrorCallback
+        {
             get { return jack_error_callback; }
-			set {
+            set
+            {
                 jack_error_callback = value;
                 if (value == null)
+                {
                     jack_error_callback = null;
+                }
                 else
+                {
                     jack_error_callback_native = msg => jack_error_callback(msg);
+                }
+
                 var ptr = Marshal.GetFunctionPointerForDelegate(jack_error_callback_native);
                 Marshal.WriteIntPtr(handle, jack_error_callback_offset, ptr);
             }
         }
+
         static readonly int jack_error_callback_offset = (int)Marshal.OffsetOf<SoundIo>("jack_error_callback");
+
         Action<string> jack_error_callback;
         delegate void jack_error_delegate(string message);
         jack_error_delegate jack_error_callback_native;
 
         // jack_info_callback
-		public Action<string> JackInfoCallback {
+        public Action<string> JackInfoCallback
+        {
             get { return jack_info_callback; }
-			set {
+            set
+            {
                 jack_info_callback = value;
                 if (value == null)
+                {
                     jack_info_callback = null;
+                }
                 else
+                {
                     jack_info_callback_native = msg => jack_info_callback(msg);
+                }
+
                 var ptr = Marshal.GetFunctionPointerForDelegate(jack_info_callback_native);
                 Marshal.WriteIntPtr(handle, jack_info_callback_offset, ptr);
             }
         }
+
         static readonly int jack_info_callback_offset = (int)Marshal.OffsetOf<SoundIo>("jack_info_callback");
+
         Action<string> jack_info_callback;
         delegate void jack_info_delegate(string message);
         jack_info_delegate jack_info_callback_native;
 
         // on_backend_disconnect
-		public Action<int> OnBackendDisconnect {
+        public Action<int> OnBackendDisconnect
+        {
             get { return on_backend_disconnect; }
-			set {
+            set
+            {
                 on_backend_disconnect = value;
                 if (value == null)
+                {
                     on_backend_disconnect_native = null;
+                }
                 else
+                {
                     on_backend_disconnect_native = (sio, err) => on_backend_disconnect(err);
+                }
+
                 var ptr = Marshal.GetFunctionPointerForDelegate(on_backend_disconnect_native);
                 Marshal.WriteIntPtr(handle, on_backend_disconnect_offset, ptr);
             }
         }
+
         static readonly int on_backend_disconnect_offset = (int)Marshal.OffsetOf<SoundIo>("on_backend_disconnect");
+
         Action<int> on_backend_disconnect;
         delegate void on_backend_disconnect_delegate(IntPtr handle, int errorCode);
         on_backend_disconnect_delegate on_backend_disconnect_native;
 
         // on_devices_change
-		public Action OnDevicesChange {
+        public Action OnDevicesChange
+        {
             get { return on_devices_change; }
-			set {
+            set
+            {
                 on_devices_change = value;
                 if (value == null)
+                {
                     on_devices_change_native = null;
+                }
                 else
+                {
                     on_devices_change_native = sio => on_devices_change();
+                }
+
                 var ptr = Marshal.GetFunctionPointerForDelegate(on_devices_change_native);
                 Marshal.WriteIntPtr(handle, on_devices_change_offset, ptr);
             }
         }
+
         static readonly int on_devices_change_offset = (int)Marshal.OffsetOf<SoundIo>("on_devices_change");
+
         Action on_devices_change;
         delegate void on_devices_change_delegate(IntPtr handle);
         on_devices_change_delegate on_devices_change_native;
 
         // on_events_signal
-		public Action OnEventsSignal {
+        public Action OnEventsSignal
+        {
             get { return on_events_signal; }
-			set {
+            set
+            {
                 on_events_signal = value;
                 if (value == null)
+                {
                     on_events_signal_native = null;
+                }
                 else
+                {
                     on_events_signal_native = sio => on_events_signal();
+                }
+
                 var ptr = Marshal.GetFunctionPointerForDelegate(on_events_signal_native);
                 Marshal.WriteIntPtr(handle, on_events_signal_offset, ptr);
             }
         }
+
         static readonly int on_events_signal_offset = (int)Marshal.OffsetOf<SoundIo>("on_events_signal");
+
         Action on_events_signal;
         delegate void on_events_signal_delegate(IntPtr handle);
         on_events_signal_delegate on_events_signal_native;
@@ -181,23 +243,28 @@ namespace SoundIOSharp
 
         // functions
 
-		public int BackendCount {
+        public int BackendCount
+        {
             get { return Natives.soundio_backend_count(handle); }
         }
 
-		public int InputDeviceCount {
+        public int InputDeviceCount
+        {
             get { return Natives.soundio_input_device_count(handle); }
         }
 
-		public int OutputDeviceCount {
+        public int OutputDeviceCount
+        {
             get { return Natives.soundio_output_device_count(handle); }
         }
 
-		public int DefaultInputDeviceIndex {
+        public int DefaultInputDeviceIndex
+        {
             get { return Natives.soundio_default_input_device_index(handle); }
         }
 
-		public int DefaultOutputDeviceIndex {
+        public int DefaultOutputDeviceIndex
+        {
             get { return Natives.soundio_default_output_device_index(handle); }
         }
 
@@ -220,15 +287,19 @@ namespace SoundIOSharp
         {
             var ret = (SoundIoError)Natives.soundio_connect(handle);
             if (ret != SoundIoError.SoundIoErrorNone)
+            {
                 throw new SoundIOException(ret);
             }
+        }
 
         public void ConnectBackend(SoundIOBackend backend)
         {
             var ret = (SoundIoError)Natives.soundio_connect_backend(handle, (SoundIoBackend)backend);
             if (ret != SoundIoError.SoundIoErrorNone)
+            {
                 throw new SoundIOException(ret);
             }
+        }
 
         public void Disconnect()
         {
@@ -262,19 +333,23 @@ namespace SoundIOSharp
 
         // static methods
 
-		public static string VersionString {
+        public static string VersionString
+        {
             get { return Marshal.PtrToStringAnsi(Natives.soundio_version_string()); }
         }
 
-		public static int VersionMajor {
+        public static int VersionMajor
+        {
             get { return Natives.soundio_version_major(); }
         }
 
-		public static int VersionMinor {
+        public static int VersionMinor
+        {
             get { return Natives.soundio_version_minor(); }
         }
 
-		public static int VersionPatch {
+        public static int VersionPatch
+        {
             get { return Natives.soundio_version_patch(); }
         }
 

Ryujinx.Audio/Native/libsoundio/SoundIOBackend.cs

@@ -1,15 +1,13 @@
-using System;
+namespace SoundIOSharp
-namespace SoundIOSharp
 {
     public enum SoundIOBackend
     {
-		None = 0,
+        None,
-		Jack = 1,
+        Jack,
-		PulseAudio = 2,
+        PulseAudio,
-		Alsa = 3,
+        Alsa,
-		CoreAudio = 4,
+        CoreAudio,
-		Wasapi = 5,
+        Wasapi,
-		Dummy = 6,
+        Dummy
     }
-
 }

Ryujinx.Audio/Native/libsoundio/SoundIOChannelArea.cs

@@ -12,15 +12,19 @@ namespace SoundIOSharp
 
         Pointer<SoundIoChannelArea> handle;
 
-		public IntPtr Pointer {
+        public IntPtr Pointer
+        {
             get { return Marshal.ReadIntPtr(handle, ptr_offset); }
             set { Marshal.WriteIntPtr(handle, ptr_offset, value); }
         }
+
         static readonly int ptr_offset = (int)Marshal.OffsetOf<SoundIoChannelArea>("ptr");
 
-		public int Step {
+        public int Step
+        {
             get { return Marshal.ReadInt32(handle, step_offset); }
         }
+
         static readonly int step_offset = (int)Marshal.OffsetOf<SoundIoChannelArea>("step");
     }
 }

Ryujinx.Audio/Native/libsoundio/SoundIOChannelAreas.cs

@@ -18,7 +18,8 @@ namespace SoundIOSharp
         int    channel_count;
         int    frame_count;
 
-		public bool IsEmpty {
+        public bool IsEmpty
+        {
             get { return head == IntPtr.Zero; }
         }
 

Ryujinx.Audio/Native/libsoundio/SoundIOChannelId.cs

@@ -1,77 +1,75 @@
-using System;
+namespace SoundIOSharp
-namespace SoundIOSharp
 {
-
     public enum SoundIOChannelId
     {
-		Invalid = 0,
+        Invalid,
-		FrontLeft = 1,
+        FrontLeft,
-		FrontRight = 2,
+        FrontRight,
-		FrontCenter = 3,
+        FrontCenter,
-		Lfe = 4,
+        Lfe,
-		BackLeft = 5,
+        BackLeft,
-		BackRight = 6,
+        BackRight,
-		FrontLeftCenter = 7,
+        FrontLeftCenter,
-		FrontRightCenter = 8,
+        FrontRightCenter,
-		BackCenter = 9,
+        BackCenter,
-		SideLeft = 10,
+        SideLeft,
-		SideRight = 11,
+        SideRight,
-		TopCenter = 12,
+        TopCenter,
-		TopFrontLeft = 13,
+        TopFrontLeft,
-		TopFrontCenter = 14,
+        TopFrontCenter,
-		TopFrontRight = 15,
+        TopFrontRight,
-		TopBackLeft = 16,
+        TopBackLeft,
-		TopBackCenter = 17,
+        TopBackCenter,
-		TopBackRight = 18,
+        TopBackRight,
-		BackLeftCenter = 19,
+        BackLeftCenter,
-		BackRightCenter = 20,
+        BackRightCenter,
-		FrontLeftWide = 21,
+        FrontLeftWide,
-		FrontRightWide = 22,
+        FrontRightWide,
-		FrontLeftHigh = 23,
+        FrontLeftHigh,
-		FrontCenterHigh = 24,
+        FrontCenterHigh,
-		FrontRightHigh = 25,
+        FrontRightHigh,
-		TopFrontLeftCenter = 26,
+        TopFrontLeftCenter,
-		TopFrontRightCenter = 27,
+        TopFrontRightCenter,
-		TopSideLeft = 28,
+        TopSideLeft,
-		TopSideRight = 29,
+        TopSideRight,
-		LeftLfe = 30,
+        LeftLfe,
-		RightLfe = 31,
+        RightLfe,
-		Lfe2 = 32,
+        Lfe2,
-		BottomCenter = 33,
+        BottomCenter,
-		BottomLeftCenter = 34,
+        BottomLeftCenter,
-		BottomRightCenter = 35,
+        BottomRightCenter,
-		MsMid = 36,
+        MsMid,
-		MsSide = 37,
+        MsSide,
-		AmbisonicW = 38,
+        AmbisonicW,
-		AmbisonicX = 39,
+        AmbisonicX,
-		AmbisonicY = 40,
+        AmbisonicY,
-		AmbisonicZ = 41,
+        AmbisonicZ,
-		XyX = 42,
+        XyX,
-		XyY = 43,
+        XyY,
-		HeadphonesLeft = 44,
+        HeadphonesLeft,
-		HeadphonesRight = 45,
+        HeadphonesRight,
-		ClickTrack = 46,
+        ClickTrack,
-		ForeignLanguage = 47,
+        ForeignLanguage,
-		HearingImpaired = 48,
+        HearingImpaired,
-		Narration = 49,
+        Narration,
-		Haptic = 50,
+        Haptic,
-		DialogCentricMix = 51,
+        DialogCentricMix,
-		Aux = 52,
+        Aux,
-		Aux0 = 53,
+        Aux0,
-		Aux1 = 54,
+        Aux1,
-		Aux2 = 55,
+        Aux2,
-		Aux3 = 56,
+        Aux3,
-		Aux4 = 57,
+        Aux4,
-		Aux5 = 58,
+        Aux5,
-		Aux6 = 59,
+        Aux6,
-		Aux7 = 60,
+        Aux7,
-		Aux8 = 61,
+        Aux8,
-		Aux9 = 62,
+        Aux9,
-		Aux10 = 63,
+        Aux10,
-		Aux11 = 64,
+        Aux11,
-		Aux12 = 65,
+        Aux12,
-		Aux13 = 66,
+        Aux13,
-		Aux14 = 67,
+        Aux14,
-		Aux15 = 68,
+        Aux15
     }
 }

Ryujinx.Audio/Native/libsoundio/SoundIOChannelLayout.cs

@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
 
 namespace SoundIOSharp
 {
     public struct SoundIOChannelLayout
     {
-		public static int BuiltInCount {
+        public static int BuiltInCount
+        {
             get { return Natives.soundio_channel_layout_builtin_count(); }
         }
 
@@ -19,15 +19,20 @@ namespace SoundIOSharp
         public static SoundIOChannelLayout GetDefault(int channelCount)
         {
             var handle = Natives.soundio_channel_layout_get_default(channelCount);
+
             return new SoundIOChannelLayout (handle);
         }
 
         public static SoundIOChannelId ParseChannelId(string name)
         {
             var ptr = Marshal.StringToHGlobalAnsi(name);
-			try {
+
+            try 
+            {
                 return (SoundIOChannelId)Natives.soundio_parse_channel_id(ptr, name.Length);
-			} finally {
+            }
+            finally
+            {
                 Marshal.FreeHGlobal(ptr);
             }
         }
@@ -41,39 +46,51 @@ namespace SoundIOSharp
 
         readonly Pointer<SoundIoChannelLayout> handle;
 
-		public bool IsNull {
+        public bool IsNull
+        {
             get { return handle.Handle == IntPtr.Zero; }
         }
 
-		internal IntPtr Handle {
+        internal IntPtr Handle
+        {
             get { return handle; }
         }
 
-		public int ChannelCount {
+        public int ChannelCount
+        {
             get { return IsNull ? 0 : Marshal.ReadInt32((IntPtr)handle + channel_count_offset); }
         }
+
         static readonly int channel_count_offset = (int)Marshal.OffsetOf<SoundIoChannelLayout>("channel_count");
 
-		public string Name {
+        public string Name
+        {
             get { return IsNull ? null : Marshal.PtrToStringAnsi(Marshal.ReadIntPtr((IntPtr)handle + name_offset)); }
         }
+
         static readonly int name_offset = (int)Marshal.OffsetOf<SoundIoChannelLayout>("name");
 
-		public IEnumerable<SoundIOChannelId> Channels {
+        public IEnumerable<SoundIOChannelId> Channels
-			get {
+        {
-				if (IsNull)
+            get
-					yield break;
+            {
+                if (IsNull) yield break;
+
                 for (int i = 0; i < 24; i++)
+                {
                     yield return (SoundIOChannelId)Marshal.ReadInt32((IntPtr)handle + channels_offset + sizeof(SoundIoChannelId) * i);
                 }
             }
+        }
+
         static readonly int channels_offset = (int)Marshal.OffsetOf<SoundIoChannelLayout>("channels");
 
         public override bool Equals(object other)
         {
-			if (!(other is SoundIOChannelLayout))
+            if (!(other is SoundIOChannelLayout)) return false;
-				return false;
+
             var s = (SoundIOChannelLayout) other;
+
             return handle == s.handle || Natives.soundio_channel_layout_equal(handle, s.handle);
         }
 
@@ -84,15 +101,15 @@ namespace SoundIOSharp
 
         public string DetectBuiltInName()
         {
-			if (IsNull)
+            if (IsNull) throw new InvalidOperationException();
-				throw new InvalidOperationException ();
+
             return Natives.soundio_channel_layout_detect_builtin(handle) ? Name : null;
         }
 
         public int FindChannel(SoundIOChannelId channel)
         {
-			if (IsNull)
+            if (IsNull) throw new InvalidOperationException();
-				throw new InvalidOperationException ();
+
             return Natives.soundio_channel_layout_find_channel(handle, (SoundIoChannelId)channel);
         }
     }

Ryujinx.Audio/Native/libsoundio/SoundIODevice.cs

@@ -10,6 +10,7 @@ namespace SoundIOSharp
         {
             var ptr1 = Marshal.ReadIntPtr(device1.handle, layouts_offset);
             var ptr2 = Marshal.ReadIntPtr(device2.handle, layouts_offset);
+
             return new SoundIOChannelLayout(Natives.soundio_best_matching_channel_layout(ptr1, device1.LayoutCount, ptr2, device2.LayoutCount));
         }
 
@@ -25,6 +26,7 @@ namespace SoundIOSharp
         public override bool Equals(object other)
         {
             var d = other as SoundIODevice;
+
             return d != null && (this.handle == d.handle || Natives.soundio_device_equal (this.handle, d.handle));
         }
 
@@ -35,122 +37,167 @@ namespace SoundIOSharp
 
         public static bool operator == (SoundIODevice obj1, SoundIODevice obj2)
         {
-			return (object)obj1 == null ? (object)obj2 == null : obj1.Equals (obj2);
+            return obj1 is null ? obj2 is null : obj1.Equals(obj2);
         }
 
         public static bool operator != (SoundIODevice obj1, SoundIODevice obj2)
         {
-			return (object)obj1 == null ? (object) obj2 != null : !obj1.Equals (obj2);
+            return obj1 is null ? obj2 is object : !obj1.Equals(obj2);
         }
 
         // fields
 
-		public SoundIODeviceAim Aim {
+        public SoundIODeviceAim Aim
+        {
             get { return (SoundIODeviceAim)Marshal.ReadInt32(handle, aim_offset); }
         }
+
         static readonly int aim_offset = (int)Marshal.OffsetOf<SoundIoDevice>("aim");
 
-		public SoundIOFormat CurrentFormat {
+        public SoundIOFormat CurrentFormat
+        {
             get { return (SoundIOFormat)Marshal.ReadInt32(handle, current_format_offset); }
         }
+
         static readonly int current_format_offset = (int)Marshal.OffsetOf<SoundIoDevice>("current_format");
 
-		public SoundIOChannelLayout CurrentLayout {
+        public SoundIOChannelLayout CurrentLayout
-			get { return new SoundIOChannelLayout ((IntPtr) handle + current_layout_offset);
+        {
-			}
+            get { return new SoundIOChannelLayout((IntPtr)handle + current_layout_offset); }
         }
+
         static readonly int current_layout_offset = (int)Marshal.OffsetOf<SoundIoDevice>("current_layout");
 
-		public int FormatCount {
+        public int FormatCount
+        {
             get { return Marshal.ReadInt32(handle, format_count_offset); }
         }
+
         static readonly int format_count_offset = (int)Marshal.OffsetOf<SoundIoDevice>("format_count");
 
-		public IEnumerable<SoundIOFormat> Formats {
+        public IEnumerable<SoundIOFormat> Formats
-			get {
+        {
+            get
+            {
                 var ptr = Marshal.ReadIntPtr(handle, formats_offset);
+
                 for (int i = 0; i < FormatCount; i++)
+                {
                     yield return (SoundIOFormat)Marshal.ReadInt32(ptr, i);
                 }
             }
+        }
+
         static readonly int formats_offset = (int)Marshal.OffsetOf<SoundIoDevice>("formats");
 
-		public string Id {
+        public string Id
+        {
             get { return Marshal.PtrToStringAnsi(Marshal.ReadIntPtr(handle, id_offset)); }
         }
+
         static readonly int id_offset = (int)Marshal.OffsetOf<SoundIoDevice>("id");
 
-		public bool IsRaw {
+        public bool IsRaw
+        {
             get { return Marshal.ReadInt32(handle, is_raw_offset) != 0; }
         }
+
         static readonly int is_raw_offset = (int)Marshal.OffsetOf<SoundIoDevice>("is_raw");
 
-		public int LayoutCount {
+        public int LayoutCount
+        {
             get { return Marshal.ReadInt32(handle, layout_count_offset); }
         }
+
         static readonly int layout_count_offset = (int)Marshal.OffsetOf<SoundIoDevice>("layout_count");
 
-		public IEnumerable<SoundIOChannelLayout> Layouts {
+        public IEnumerable<SoundIOChannelLayout> Layouts
-			get {
+        {
+            get
+            {
                 var ptr = Marshal.ReadIntPtr (handle, layouts_offset);
+
                 for (int i = 0; i < LayoutCount; i++)
+                {
                     yield return new SoundIOChannelLayout(ptr + i * Marshal.SizeOf<SoundIoChannelLayout>());
                 }
             }
+        }
+
         static readonly int layouts_offset = (int)Marshal.OffsetOf<SoundIoDevice>("layouts");
 
-		public string Name {
+        public string Name
+        {
             get { return Marshal.PtrToStringAnsi(Marshal.ReadIntPtr(handle, name_offset)); }
         }
+
         static readonly int name_offset = (int)Marshal.OffsetOf<SoundIoDevice>("name");
 
-		public int ProbeError {
+        public int ProbeError
+        {
             get { return Marshal.ReadInt32(handle, probe_error_offset); }
         }
+
         static readonly int probe_error_offset = (int)Marshal.OffsetOf<SoundIoDevice>("probe_error");
 
-		public int ReferenceCount {
+        public int ReferenceCount
+        {
             get { return Marshal.ReadInt32(handle, ref_count_offset); }
         }
+
         static readonly int ref_count_offset = (int)Marshal.OffsetOf<SoundIoDevice>("ref_count");
 
-		public int SampleRateCount {
+        public int SampleRateCount
+        {
             get { return Marshal.ReadInt32(handle, sample_rate_count_offset); }
         }
+
         static readonly int sample_rate_count_offset = (int)Marshal.OffsetOf<SoundIoDevice>("sample_rate_count");
 
-		public IEnumerable<SoundIOSampleRateRange> SampleRates {
+        public IEnumerable<SoundIOSampleRateRange> SampleRates
-			get {
+        {
+            get
+            {
                 var ptr = Marshal.ReadIntPtr(handle, sample_rates_offset);
+
                 for (int i = 0; i < SampleRateCount; i++)
-					yield return new SoundIOSampleRateRange (
+                {
-						Marshal.ReadInt32 (ptr, i * 2),
+                    yield return new SoundIOSampleRateRange(Marshal.ReadInt32(ptr, i * 2), Marshal.ReadInt32(ptr, i * 2 + 1));
-						Marshal.ReadInt32 (ptr, i * 2 + 1));
                 }
             }
+        }
+
         static readonly int sample_rates_offset = (int)Marshal.OffsetOf<SoundIoDevice>("sample_rates");
 
-		public double SoftwareLatencyCurrent {
+        public double SoftwareLatencyCurrent
+        {
             get { return MarshalEx.ReadDouble(handle, software_latency_current_offset); }
             set { MarshalEx.WriteDouble(handle, software_latency_current_offset, value); }
         }
+
         static readonly int software_latency_current_offset = (int)Marshal.OffsetOf<SoundIoDevice>("software_latency_current");
 
-		public double SoftwareLatencyMin {
+        public double SoftwareLatencyMin
+        {
             get { return MarshalEx.ReadDouble(handle, software_latency_min_offset); }
             set { MarshalEx.WriteDouble(handle, software_latency_min_offset, value); }
         }
+
         static readonly int software_latency_min_offset = (int)Marshal.OffsetOf<SoundIoDevice>("software_latency_min");
 
-		public double SoftwareLatencyMax {
+        public double SoftwareLatencyMax
+        {
             get { return MarshalEx.ReadDouble(handle, software_latency_max_offset); }
             set { MarshalEx.WriteDouble(handle, software_latency_max_offset, value); }
         }
+
         static readonly int software_latency_max_offset = (int)Marshal.OffsetOf<SoundIoDevice>("software_latency_max");
 
-		public SoundIO SoundIO {
+        public SoundIO SoundIO
+        {
             get { return new SoundIO(Marshal.ReadIntPtr(handle, soundio_offset)); }
         }
+
         static readonly int soundio_offset = (int)Marshal.OffsetOf<SoundIoDevice>("soundio");
 
         // functions

Ryujinx.Audio/Native/libsoundio/SoundIODeviceAim.cs

@@ -1,9 +1,8 @@
-using System;
+namespace SoundIOSharp
-namespace SoundIOSharp
 {
     public enum SoundIODeviceAim // soundio.h (228, 6)
     {
-		Input = 0,
+        Input,
-		Output = 1,
+        Output
     }
 }

Ryujinx.Audio/Native/libsoundio/SoundIOException.cs

@@ -5,9 +5,6 @@ namespace SoundIOSharp
 {
     public class SoundIOException : Exception
     {
-		internal SoundIOException (SoundIoError errorCode)
+        internal SoundIOException(SoundIoError errorCode) : base (Marshal.PtrToStringAnsi(Natives.soundio_strerror((int) errorCode))) { }
-			: base (Marshal.PtrToStringAnsi (Natives.soundio_strerror ((int) errorCode)))
-		{
-		}
     }
 }

Ryujinx.Audio/Native/libsoundio/SoundIOFormat.cs

@@ -1,26 +1,25 @@
-using System;
+namespace SoundIOSharp
-namespace SoundIOSharp
 {
     public enum SoundIOFormat
 	{
-		Invalid = 0,
+		Invalid,
-		S8 = 1,
+		S8,
-		U8 = 2,
+		U8,
-		S16LE = 3,
+		S16LE,
-		S16BE = 4,
+		S16BE,
-		U16LE = 5,
+		U16LE,
-		U16BE = 6,
+		U16BE,
-		S24LE = 7,
+		S24LE,
-		S24BE = 8,
+		S24BE,
-		U24LE = 9,
+		U24LE,
-		U24BE = 10,
+		U24BE,
-		S32LE = 11,
+		S32LE,
-		S32BE = 12,
+		S32BE,
-		U32LE = 13,
+		U32LE,
-		U32BE = 14,
+		U32BE,
-		Float32LE = 15,
+		Float32LE,
-		Float32BE = 16,
+		Float32BE,
-		Float64LE = 17,
+		Float64LE,
-		Float64BE = 18,
+		Float64BE
 	}
 }

Ryujinx.Audio/Native/libsoundio/SoundIOInStream.cs

@@ -23,6 +23,7 @@ namespace SoundIOSharp
         public override bool Equals(object other)
         {
             var d = other as SoundIOInStream;
+
             return d != null && (this.handle == d.handle);
         }
 
@@ -33,92 +34,119 @@ namespace SoundIOSharp
 
         public static bool operator == (SoundIOInStream obj1, SoundIOInStream obj2)
         {
-			return (object)obj1 == null ? (object)obj2 == null : obj1.Equals (obj2);
+            return obj1 is null ? obj2 is null : obj1.Equals(obj2);
         }
 
         public static bool operator != (SoundIOInStream obj1, SoundIOInStream obj2)
         {
-			return (object)obj1 == null ? (object)obj2 != null : !obj1.Equals (obj2);
+            return obj1 is null ? obj2 is object : !obj1.Equals(obj2);
         }
 
         // fields
 
-		public SoundIODevice Device {
+        public SoundIODevice Device
+        {
             get { return new SoundIODevice(Marshal.ReadIntPtr(handle, device_offset)); }
         }
+
         static readonly int device_offset = (int)Marshal.OffsetOf<SoundIoInStream>("device");
 
-		public SoundIOFormat Format {
+        public SoundIOFormat Format
+        {
             get { return (SoundIOFormat)Marshal.ReadInt32(handle, format_offset); }
             set { Marshal.WriteInt32(handle, format_offset, (int) value); }
         }
+
         static readonly int format_offset = (int)Marshal.OffsetOf<SoundIoInStream>("format");
 
-		public int SampleRate {
+        public int SampleRate
+        {
             get { return Marshal.ReadInt32(handle, sample_rate_offset); }
             set { Marshal.WriteInt32(handle, sample_rate_offset, value); }
         }
+
         static readonly int sample_rate_offset = (int)Marshal.OffsetOf<SoundIoInStream>("sample_rate");
 
-		public SoundIOChannelLayout Layout {
+        public SoundIOChannelLayout Layout
+        {
             get { return new SoundIOChannelLayout ((IntPtr) handle + layout_offset); }
-			set {
+            set 
-				unsafe {
+            {
-					Buffer.MemoryCopy ((void*) ((IntPtr) handle + layout_offset), (void*)value.Handle,
+                unsafe
-							   Marshal.SizeOf<SoundIoChannelLayout> (), Marshal.SizeOf<SoundIoChannelLayout> ());
+                {
+                    Buffer.MemoryCopy((void*)((IntPtr)handle + layout_offset), (void*)value.Handle, Marshal.SizeOf<SoundIoChannelLayout>(), Marshal.SizeOf<SoundIoChannelLayout>());
                 }
             }
         }
+
         static readonly int layout_offset = (int)Marshal.OffsetOf<SoundIoInStream>("layout");
 
-
+        public double SoftwareLatency
-		public double SoftwareLatency {
+        {
             get { return MarshalEx.ReadDouble(handle, software_latency_offset); }
             set { MarshalEx.WriteDouble(handle, software_latency_offset, value); }
         }
+
         static readonly int software_latency_offset = (int)Marshal.OffsetOf<SoundIoInStream>("software_latency");
 
         // error_callback
-		public Action ErrorCallback {
+        public Action ErrorCallback
+        {
             get { return error_callback; }
-			set {
+            set
+            {
                 error_callback = value;
                 error_callback_native = _ => error_callback();
+
                 var ptr = Marshal.GetFunctionPointerForDelegate(error_callback_native);
+
                 Marshal.WriteIntPtr(handle, error_callback_offset, ptr);
             }
         }
+
         static readonly int error_callback_offset = (int)Marshal.OffsetOf<SoundIoInStream>("error_callback");
+
         Action error_callback;
         delegate void error_callback_delegate(IntPtr handle);
         error_callback_delegate error_callback_native;
 
         // read_callback
-		public Action<int,int> ReadCallback {
+        public Action<int,int> ReadCallback
+        {
             get { return read_callback; }
-			set {
+            set
+            {
                 read_callback = value;
                 read_callback_native = (_, minFrameCount, maxFrameCount) => read_callback(minFrameCount, maxFrameCount);
+
                 var ptr = Marshal.GetFunctionPointerForDelegate(read_callback_native);
+
                 Marshal.WriteIntPtr(handle, read_callback_offset, ptr);
             }
         }
+
         static readonly int read_callback_offset = (int)Marshal.OffsetOf<SoundIoInStream>("read_callback");
+
         Action<int, int> read_callback;
         delegate void read_callback_delegate(IntPtr handle, int min, int max);
         read_callback_delegate read_callback_native;
 
         // overflow_callback
-		public Action OverflowCallback {
+        public Action OverflowCallback
+        {
             get { return overflow_callback; }
-			set {
+            set
+            {
                 overflow_callback = value;
                 overflow_callback_native = _ => overflow_callback();
+
                 var ptr = Marshal.GetFunctionPointerForDelegate(overflow_callback_native);
+
                 Marshal.WriteIntPtr(handle, overflow_callback_offset, ptr);
             }
         }
         static readonly int overflow_callback_offset = (int)Marshal.OffsetOf<SoundIoInStream>("overflow_callback");
+
         Action overflow_callback;
         delegate void overflow_callback_delegate(IntPtr handle);
         overflow_callback_delegate overflow_callback_native;
@@ -127,44 +155,60 @@ namespace SoundIOSharp
         // this kind of code anywhere we need string marshaling.
         List<IntPtr> allocated_hglobals = new List<IntPtr>();
 
-		public string Name {
+        public string Name
+        {
             get { return Marshal.PtrToStringAnsi(Marshal.ReadIntPtr(handle, name_offset)); }
-			set {
+            set
-				unsafe {
+            {
+                unsafe
+                {
                     var existing = Marshal.ReadIntPtr(handle, name_offset);
-					if (allocated_hglobals.Contains (existing)) {
+                    if (allocated_hglobals.Contains(existing))
+                    {
                         allocated_hglobals.Remove(existing);
                         Marshal.FreeHGlobal(existing);
                     }
+
                     var ptr = Marshal.StringToHGlobalAnsi(value);
                     Marshal.WriteIntPtr(handle, name_offset, ptr);
                     allocated_hglobals.Add(ptr);
                 }
             }
         }
+
         static readonly int name_offset = (int)Marshal.OffsetOf<SoundIoInStream>("name");
 
-		public bool NonTerminalHint {
+        public bool NonTerminalHint
+        {
             get { return Marshal.ReadInt32(handle, non_terminal_hint_offset) != 0; }
         }
+
         static readonly int non_terminal_hint_offset = (int)Marshal.OffsetOf<SoundIoInStream>("non_terminal_hint");
 
-		public int BytesPerFrame {
+        public int BytesPerFrame
+        {
             get { return Marshal.ReadInt32(handle, bytes_per_frame_offset); }
         }
+
         static readonly int bytes_per_frame_offset = (int)Marshal.OffsetOf<SoundIoInStream>("bytes_per_frame");
 
-		public int BytesPerSample {
+        public int BytesPerSample
+        {
             get { return Marshal.ReadInt32(handle, bytes_per_sample_offset); }
         }
+
         static readonly int bytes_per_sample_offset = (int)Marshal.OffsetOf<SoundIoInStream>("bytes_per_sample");
 
-		public string LayoutErrorMessage {
+        public string LayoutErrorMessage
-			get {
+        {
+            get 
+            {
                 var code = (SoundIoError)Marshal.ReadInt32(handle, layout_error_offset);
+
                 return code == SoundIoError.SoundIoErrorNone ? null : Marshal.PtrToStringAnsi(Natives.soundio_strerror((int)code));
             }
         }
+
         static readonly int layout_error_offset = (int)Marshal.OffsetOf<SoundIoInStream>("layout_error");
 
         // functions
@@ -173,27 +217,38 @@ namespace SoundIOSharp
         {
             var ret = (SoundIoError)Natives.soundio_instream_open(handle);
             if (ret != SoundIoError.SoundIoErrorNone)
+            {
                 throw new SoundIOException(ret);
             }
+        }
 
         public void Start()
         {
             var ret = (SoundIoError)Natives.soundio_instream_start(handle);
             if (ret != SoundIoError.SoundIoErrorNone)
+            {
                 throw new SoundIOException(ret);
             }
+        }
 
         public SoundIOChannelAreas BeginRead(ref int frameCount)
         {
-			IntPtr ptrs = default (IntPtr);
+            IntPtr ptrs             = default;
             int    nativeFrameCount = frameCount;
-			unsafe {
+
+            unsafe
+            {
                 var frameCountPtr = &nativeFrameCount;
                 var ptrptr        = &ptrs;
                 var ret           = (SoundIoError)Natives.soundio_instream_begin_read(handle, (IntPtr)ptrptr, (IntPtr)frameCountPtr);
+
                 frameCount = *frameCountPtr;
+
                 if (ret != SoundIoError.SoundIoErrorNone)
+                {
                     throw new SoundIOException(ret);
+                }
+
                 return new SoundIOChannelAreas(ptrs, Layout.ChannelCount, frameCount);
             }
         }
@@ -202,25 +257,35 @@ namespace SoundIOSharp
         {
             var ret = (SoundIoError)Natives.soundio_instream_end_read(handle);
             if (ret != SoundIoError.SoundIoErrorNone)
+            {
                 throw new SoundIOException(ret);
             }
+        }
 
         public void Pause(bool pause)
         {
             var ret = (SoundIoError)Natives.soundio_instream_pause(handle, pause);
             if (ret != SoundIoError.SoundIoErrorNone)
+            {
                 throw new SoundIOException(ret);
             }
+        }
 
         public double GetLatency()
         {
-			unsafe {
+            unsafe
+            {
                 double* dptr = null;
                 IntPtr  p    = new IntPtr(dptr);
+
                 var ret = (SoundIoError)Natives.soundio_instream_get_latency(handle, p);
                 if (ret != SoundIoError.SoundIoErrorNone)
+                {
                     throw new SoundIOException(ret);
+                }
+
                 dptr = (double*)p;
+
                 return *dptr;
             }
         }

Ryujinx.Audio/Native/libsoundio/SoundIOOutStream.cs

@@ -22,6 +22,7 @@ namespace SoundIOSharp
         public override bool Equals (object other)
         {
             var d = other as SoundIOOutStream;
+
             return d != null && (this.handle == d.handle);
         }
 
@@ -32,107 +33,145 @@ namespace SoundIOSharp
 
         public static bool operator == (SoundIOOutStream obj1, SoundIOOutStream obj2)
         {
-			return (object)obj1 == null ? (object)obj2 == null : obj1.Equals (obj2);
+            return obj1 is null ? obj2 is null : obj1.Equals(obj2);
         }
 
         public static bool operator != (SoundIOOutStream obj1, SoundIOOutStream obj2)
         {
-			return (object)obj1 == null ? (object)obj2 != null : !obj1.Equals (obj2);
+            return obj1 is null ? obj2 is object : !obj1.Equals(obj2);
         }
 
         // fields
 
-		public SoundIODevice Device {
+        public SoundIODevice Device
+        {
             get { return new SoundIODevice(Marshal.ReadIntPtr(handle, device_offset)); }
         }
+
         static readonly int device_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("device");
 
-		public SoundIOFormat Format {
+        public SoundIOFormat Format
+        {
             get { return (SoundIOFormat) Marshal.ReadInt32(handle, format_offset); }
             set { Marshal.WriteInt32(handle, format_offset, (int) value); }
         }
+
         static readonly int format_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("format");
 
-		public int SampleRate {
+        public int SampleRate
+        {
             get { return Marshal.ReadInt32(handle, sample_rate_offset); }
             set { Marshal.WriteInt32(handle, sample_rate_offset, value); }
         }
+
         static readonly int sample_rate_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("sample_rate");
 
-
+        public SoundIOChannelLayout Layout
-		public SoundIOChannelLayout Layout {
+        {
-			get { unsafe { return new SoundIOChannelLayout ((IntPtr) ((void*) ((IntPtr) handle + layout_offset))); } }
+            get { unsafe { return new SoundIOChannelLayout((IntPtr) (void*)((IntPtr)handle + layout_offset)); } }
-			set {
+            set
-				unsafe {
+            {
-					Buffer.MemoryCopy ((void*)value.Handle, (void*)((IntPtr)handle + layout_offset),
+                unsafe
-							   Marshal.SizeOf<SoundIoChannelLayout> (), Marshal.SizeOf<SoundIoChannelLayout> ());
+                {
+                    Buffer.MemoryCopy((void*)value.Handle, (void*)((IntPtr)handle + layout_offset), Marshal.SizeOf<SoundIoChannelLayout>(), Marshal.SizeOf<SoundIoChannelLayout>());
                 }
             }
         }
         static readonly int layout_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("layout");
 
-		public double SoftwareLatency {
+        public double SoftwareLatency
+        {
             get { return MarshalEx.ReadDouble (handle, software_latency_offset); }
             set { MarshalEx.WriteDouble (handle, software_latency_offset, value); }
         }
+
         static readonly int software_latency_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("software_latency");
 
-		public float Volume {
+        public float Volume
+        {
             get { return MarshalEx.ReadFloat(handle, volume_offset); }
             set { MarshalEx.WriteFloat(handle, volume_offset, value); }
         }
+
         static readonly int volume_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("volume");
 
         // error_callback
-		public Action ErrorCallback {
+        public Action ErrorCallback
+        {
             get { return error_callback; }
-			set {
+            set
+            {
                 error_callback = value;
                 if (value == null)
+                {
                     error_callback_native = null;
+                }
                 else
+                {
                     error_callback_native = stream => error_callback();
+                }
+
                 var ptr = Marshal.GetFunctionPointerForDelegate(error_callback_native);
                 Marshal.WriteIntPtr(handle, error_callback_offset, ptr);
             }
         }
+
         static readonly int error_callback_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("error_callback");
+
         Action error_callback;
         delegate void error_callback_delegate (IntPtr handle);
         error_callback_delegate error_callback_native;
 
         // write_callback
-		public Action<int, int> WriteCallback {
+        public Action<int, int> WriteCallback
+        {
             get { return write_callback; }
-			set {
+            set
+            {
                 write_callback = value;
                 if (value == null)
+                {
                     write_callback_native = null;
+                }
                 else
+                {
                     write_callback_native = (h, frame_count_min, frame_count_max) => write_callback(frame_count_min, frame_count_max);
+                }
+
                 var ptr = Marshal.GetFunctionPointerForDelegate (write_callback_native);
                 Marshal.WriteIntPtr (handle, write_callback_offset, ptr);
             }
         }
+
         static readonly int write_callback_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("write_callback");
+
         Action<int, int> write_callback;
         delegate void write_callback_delegate(IntPtr handle, int min, int max);
         write_callback_delegate write_callback_native;
 
         // underflow_callback
-		public Action UnderflowCallback {
+        public Action UnderflowCallback
+        {
             get { return underflow_callback; }
-			set {
+            set
+            {
                 underflow_callback = value;
                 if (value == null)
+                {
                     underflow_callback_native = null;
+                }
                 else
+                {
                     underflow_callback_native = h => underflow_callback();
+                }
+
                 var ptr = Marshal.GetFunctionPointerForDelegate (underflow_callback_native);
                 Marshal.WriteIntPtr (handle, underflow_callback_offset, ptr);
             }
         }
+
         static readonly int underflow_callback_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("underflow_callback");
+        
         Action underflow_callback;
         delegate void underflow_callback_delegate(IntPtr handle);
         underflow_callback_delegate underflow_callback_native;
@@ -143,42 +182,57 @@ namespace SoundIOSharp
 
         public string Name {
             get { return Marshal.PtrToStringAnsi(Marshal.ReadIntPtr(handle, name_offset)); }
-			set {
+            set
-				unsafe {
+            {
+                unsafe
+                {
                     var existing = Marshal.ReadIntPtr(handle, name_offset);
-					if (allocated_hglobals.Contains (existing)) {
+                    if (allocated_hglobals.Contains(existing))
+                    {
                         allocated_hglobals.Remove(existing);
                         Marshal.FreeHGlobal(existing);
                     }
+
                     var ptr = Marshal.StringToHGlobalAnsi(value);
                     Marshal.WriteIntPtr(handle, name_offset, ptr);
                     allocated_hglobals.Add(ptr);
                 }
             }
         }
+
         static readonly int name_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("name");
 
-		public bool NonTerminalHint {
+        public bool NonTerminalHint
+        {
             get { return Marshal.ReadInt32(handle, non_terminal_hint_offset) != 0; }
         }
+
         static readonly int non_terminal_hint_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("non_terminal_hint");
 
-		public int BytesPerFrame {
+        public int BytesPerFrame
+        {
             get { return Marshal.ReadInt32(handle, bytes_per_frame_offset); }
         }
+
         static readonly int bytes_per_frame_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("bytes_per_frame");
 
-		public int BytesPerSample {
+        public int BytesPerSample
+        {
             get { return Marshal.ReadInt32(handle, bytes_per_sample_offset); }
         }
+
         static readonly int bytes_per_sample_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("bytes_per_sample");
 
-		public string LayoutErrorMessage {
+        public string LayoutErrorMessage
-			get {
+        {
+            get
+            {
                 var code = (SoundIoError)Marshal.ReadInt32(handle, layout_error_offset);
+
                 return code == SoundIoError.SoundIoErrorNone ? null : Marshal.PtrToStringAnsi(Natives.soundio_strerror((int)code));
             }
         }
+
         static readonly int layout_error_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("layout_error");
 
         // functions
@@ -187,27 +241,38 @@ namespace SoundIOSharp
         {
             var ret = (SoundIoError)Natives.soundio_outstream_open(handle);
             if (ret != SoundIoError.SoundIoErrorNone)
+            {
                 throw new SoundIOException(ret);
             }
+        }
 
         public void Start ()
         {
             var ret = (SoundIoError)Natives.soundio_outstream_start(handle);
             if (ret != SoundIoError.SoundIoErrorNone)
+            {
                 throw new SoundIOException(ret);
             }
+        }
 
         public SoundIOChannelAreas BeginWrite(ref int frameCount)
         {
-			IntPtr ptrs = default (IntPtr);
+            IntPtr ptrs             = default;
             int    nativeFrameCount = frameCount;
-			unsafe {
+
+            unsafe
+            {
                 var frameCountPtr = &nativeFrameCount;
                 var ptrptr        = &ptrs;
                 var ret           = (SoundIoError)Natives.soundio_outstream_begin_write(handle, (IntPtr)ptrptr, (IntPtr)frameCountPtr);
+
                 frameCount = *frameCountPtr;
+
                 if (ret != SoundIoError.SoundIoErrorNone)
+                {
                     throw new SoundIOException(ret);
+                }
+
                 return new SoundIOChannelAreas(ptrs, Layout.ChannelCount, frameCount);
             }
         }
@@ -216,30 +281,40 @@ namespace SoundIOSharp
         {
             var ret = (SoundIoError)Natives.soundio_outstream_end_write(handle);
             if (ret != SoundIoError.SoundIoErrorNone)
+            {
                 throw new SoundIOException(ret);
             }
+        }
 
         public void ClearBuffer ()
         {
-			Natives.soundio_outstream_clear_buffer (handle);
+            _ = Natives.soundio_outstream_clear_buffer(handle);
         }
 
         public void Pause (bool pause)
         {
             var ret = (SoundIoError)Natives.soundio_outstream_pause(handle, pause);
             if (ret != SoundIoError.SoundIoErrorNone)
+            {
                 throw new SoundIOException(ret);
             }
+        }
 
         public double GetLatency ()
         {
-			unsafe {
+            unsafe
+            {
                 double* dptr = null;
                 IntPtr  p    = new IntPtr(dptr);
+
                 var ret = (SoundIoError)Natives.soundio_outstream_get_latency(handle, p);
                 if (ret != SoundIoError.SoundIoErrorNone)
+                {
                     throw new SoundIOException(ret);
+                }
+
                 dptr = (double*)p;
+
                 return *dptr;
             }
         }
@@ -248,7 +323,9 @@ namespace SoundIOSharp
         {
             var ret = (SoundIoError)Natives.soundio_outstream_set_volume(handle, volume);
             if (ret != SoundIoError.SoundIoErrorNone)
+            {
                 throw new SoundIOException(ret);
             }
         }
     }
+}

Ryujinx.Audio/Native/libsoundio/SoundIORingBuffer.cs

@@ -10,7 +10,8 @@ namespace SoundIOSharp
 
         IntPtr handle;
 
-		public int Capacity {
+        public int Capacity
+        {
             get { return Natives.soundio_ring_buffer_capacity(handle); }
         }
 
@@ -24,28 +25,24 @@ namespace SoundIOSharp
             Natives.soundio_ring_buffer_destroy(handle);
         }
 
-		public int FillCount {
+        public int FillCount
-			get {
+        {
-				return Natives.soundio_ring_buffer_fill_count (handle);
+            get { return Natives.soundio_ring_buffer_fill_count(handle); }
-			}
         }
 
-		public int FreeCount {
+        public int FreeCount
-			get {
+        {
-				return Natives.soundio_ring_buffer_free_count (handle);
+            get { return Natives.soundio_ring_buffer_free_count(handle); }
-			}
         }
 
-		public IntPtr ReadPointer {
+        public IntPtr ReadPointer
-			get {
+        {
-				return Natives.soundio_ring_buffer_read_ptr (handle);
+            get { return Natives.soundio_ring_buffer_read_ptr(handle); }
-			}
         }
 
-		public IntPtr WritePointer {
+        public IntPtr WritePointer
-			get {
+        {
-				return Natives.soundio_ring_buffer_write_ptr (handle);
+            get { return Natives.soundio_ring_buffer_write_ptr(handle); }
-			}
         }
 
         public void AdvanceReadPointer(int count)

Ryujinx.Audio/Renderers/OpenAL/OpenALAudioOut.cs

@@ -367,7 +367,7 @@ namespace Ryujinx.Audio
             {
                 lock (track)
                 {
-                    return track.Volume;
+                    return track.GetVolume();
                 }
             }
 

Ryujinx.Audio/Renderers/OpenAL/OpenALAudioTrack.cs

@@ -11,7 +11,6 @@ namespace Ryujinx.Audio
         public int           SampleRate { get; private set; }
         public ALFormat      Format     { get; private set; }
         public PlaybackState State      { get; set; }
-        public float         Volume     { get; private set; }
 
         public int HardwareChannels { get; }
         public int VirtualChannels { get; }
@@ -151,9 +150,14 @@ namespace Ryujinx.Audio
 
         public void SetVolume(float volume)
         {
-            Volume = volume;
+            AL.Source(SourceId, ALSourcef.Gain, volume);
+        }
 
-            AL.Source(SourceId, ALSourcef.Gain, Volume);
+        public float GetVolume()
+        {
+            AL.GetSource(SourceId, ALSourcef.Gain, out float volume);
+
+            return volume;
         }
 
         public void Dispose()

Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs

@@ -1,6 +1,5 @@
 using Ryujinx.Audio.SoundIo;
 using SoundIOSharp;
-using System;
 using System.Collections.Generic;
 
 namespace Ryujinx.Audio

Ryujinx.HLE/HOS/Services/Audio/AudioOutManager/IAudioOut.cs

@@ -85,16 +85,16 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOutManager
         {
             long tag = context.RequestData.ReadInt64();
 
-            context.ResponseData.Write(_audioOut.ContainsBuffer(_track, tag) ? 1 : 0);
+            context.ResponseData.Write(_audioOut.ContainsBuffer(_track, tag));
 
-            return 0;
+            return ResultCode.Success;
         }
 
         [Command(7)] // 3.0.0+
         // AppendAudioOutBufferAuto(u64 tag, buffer<nn::audio::AudioOutBuffer, 0x21>)
         public ResultCode AppendAudioOutBufferAuto(ServiceCtx context)
         {
-            (long position, long size) = context.Request.GetBufferType0x21();
+            (long position, _) = context.Request.GetBufferType0x21();
 
             return AppendAudioOutBufferImpl(context, position);
         }
@@ -103,9 +103,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOutManager
         {
             long tag = context.RequestData.ReadInt64();
 
-            AudioOutData data = MemoryHelper.Read<AudioOutData>(
+            AudioOutData data = MemoryHelper.Read<AudioOutData>(context.Memory, position);
-                context.Memory,
-                position);
 
             // NOTE: Assume PCM16 all the time, change if new format are found.
             short[] buffer = new short[data.SampleBufferSize / sizeof(short)];

Ryujinx.HLE/HOS/Services/Audio/IAudioOutManager.cs

@@ -20,10 +20,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio
         // ListAudioOuts() -> (u32 count, buffer<bytes, 6>)
         public ResultCode ListAudioOuts(ServiceCtx context)
         {
-            return ListAudioOutsImpl(
+            return ListAudioOutsImpl(context, context.Request.ReceiveBuff[0].Position, context.Request.ReceiveBuff[0].Size);
-                context,
-                context.Request.ReceiveBuff[0].Position,
-                context.Request.ReceiveBuff[0].Size);
         }
 
         [Command(1)]
@@ -31,12 +28,8 @@ namespace Ryujinx.HLE.HOS.Services.Audio
         // -> (u32 sample_rate, u32 channel_count, u32 pcm_format, u32, object<nn::audio::detail::IAudioOut>, buffer<bytes, 6> name_out)
         public ResultCode OpenAudioOut(ServiceCtx context)
         {
-            return OpenAudioOutImpl(
+            return OpenAudioOutImpl(context, context.Request.SendBuff[0].Position,    context.Request.SendBuff[0].Size,
-                context,
+                                             context.Request.ReceiveBuff[0].Position, context.Request.ReceiveBuff[0].Size);
-                context.Request.SendBuff[0].Position,
-                context.Request.SendBuff[0].Size,
-                context.Request.ReceiveBuff[0].Position,
-                context.Request.ReceiveBuff[0].Size);
         }
 
         [Command(2)] // 3.0.0+
@@ -56,12 +49,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio
             (long sendPosition, long sendSize) = context.Request.GetBufferType0x21();
             (long recvPosition, long recvSize) = context.Request.GetBufferType0x22();
 
-            return OpenAudioOutImpl(
+            return OpenAudioOutImpl(context, sendPosition, sendSize, recvPosition, recvSize);
-                context,
-                sendPosition,
-                sendSize,
-                recvPosition,
-                recvSize);
         }
 
         private ResultCode ListAudioOutsImpl(ServiceCtx context, long position, long size)
@@ -88,10 +76,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio
 
         private ResultCode OpenAudioOutImpl(ServiceCtx context, long sendPosition, long sendSize, long receivePosition, long receiveSize)
         {
-            string deviceName = MemoryHelper.ReadAsciiString(
+            string deviceName = MemoryHelper.ReadAsciiString(context.Memory, sendPosition, sendSize);
-                context.Memory,
-                sendPosition,
-                sendSize);
 
             if (deviceName == string.Empty)
             {