From 515fc32b21f59298ec8ca45f5d3c36e9d3041084 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Sun, 2 Jul 2023 01:27:18 +0200
Subject: [Ryujinx.Audio] Address dotnet-format issues (#5362)

* dotnet format style --severity info

Some changes were manually reverted.

* dotnet format analyzers --serverity info

Some changes have been minimally adapted.

* Restore a few unused methods and variables

* Silence dotnet format IDE0060 warnings

* Silence dotnet format IDE0052 warnings

* Address dotnet format CA1816 warnings

* Address or silence dotnet format CA2208 warnings

* Address or silence dotnet format CA2211 warnings

* Address review comments

* Address most dotnet format whitespace warnings

* Apply dotnet format whitespace formatting

A few of them have been manually reverted and the corresponding warning was silenced

* Format if-blocks correctly

* Run dotnet format whitespace after rebase

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Add comments to disabled warnings

* Remove a few unused parameters

* Simplify properties and array initialization, Use const when possible, Remove trailing commas

* Start working on disabled warnings

* Fix and silence a few dotnet-format warnings again

* Address IDE0251 warnings

* Silence IDE0060 in .editorconfig

* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"

This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.

* dotnet format whitespace after rebase

* Fix naming rule violations, remove redundant code and fix build issues

* Apply suggestions from code review

Co-authored-by: Ac_K <Acoustik666@gmail.com>

* Add trailing commas

* Apply suggestions from code review

Co-authored-by: Ac_K <Acoustik666@gmail.com>

* Address review feedback

---------

Co-authored-by: Ac_K <Acoustik666@gmail.com>
---
 src/Ryujinx.Audio/Renderer/Server/Mix/MixContext.cs | 12 +++++-------
 src/Ryujinx.Audio/Renderer/Server/Mix/MixState.cs   | 11 +++++------
 2 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'src/Ryujinx.Audio/Renderer/Server/Mix')

diff --git a/src/Ryujinx.Audio/Renderer/Server/Mix/MixContext.cs b/src/Ryujinx.Audio/Renderer/Server/Mix/MixContext.cs
index cda6f737..8991ceaf 100644
--- a/src/Ryujinx.Audio/Renderer/Server/Mix/MixContext.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/Mix/MixContext.cs
@@ -206,7 +206,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
         {
             UpdateDistancesFromFinalMix();
 
-            int[] sortedMixesTemp = _sortedMixes.Slice(0, (int)GetCount()).ToArray();
+            int[] sortedMixesTemp = _sortedMixes[..(int)GetCount()].ToArray();
 
             Array.Sort(sortedMixesTemp, (a, b) =>
             {
@@ -248,12 +248,10 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
 
                 return isValid;
             }
-            else
-            {
-                UpdateMixBufferOffset();
 
-                return true;
-            }
+            UpdateMixBufferOffset();
+
+            return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Server/Mix/MixState.cs b/src/Ryujinx.Audio/Renderer/Server/Mix/MixState.cs
index 146e6781..88ae4483 100644
--- a/src/Ryujinx.Audio/Renderer/Server/Mix/MixState.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/Mix/MixState.cs
@@ -7,7 +7,6 @@ using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 using static Ryujinx.Audio.Constants;
 
 namespace Ryujinx.Audio.Renderer.Server.Mix
@@ -66,7 +65,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
         /// <summary>
         /// The effect processing order storage.
         /// </summary>
-        private IntPtr _effectProcessingOrderArrayPointer;
+        private readonly IntPtr _effectProcessingOrderArrayPointer;
 
         /// <summary>
         /// The max element count that can be found in the effect processing order storage.
@@ -120,7 +119,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
         /// <summary>
         /// The array used to order effects associated to this mix.
         /// </summary>
-        public Span<int> EffectProcessingOrderArray
+        public readonly Span<int> EffectProcessingOrderArray
         {
             get
             {
@@ -175,7 +174,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
         /// <summary>
         /// Clear the <see cref="EffectProcessingOrderArray"/> to its default state.
         /// </summary>
-        public void ClearEffectProcessingOrder()
+        public readonly void ClearEffectProcessingOrder()
         {
             EffectProcessingOrderArray.Fill(-1);
         }
@@ -184,7 +183,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
         /// Return true if the mix has any destinations.
         /// </summary>
         /// <returns>True if the mix has any destinations.</returns>
-        public bool HasAnyDestination()
+        public readonly bool HasAnyDestination()
         {
             return DestinationMixId != UnusedMixId || DestinationSplitterId != UnusedSplitterId;
         }
@@ -310,4 +309,4 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
             return isDirty;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3