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>
---
 .../Renderer/Server/MemoryPool/PoolMapper.cs        | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/Ryujinx.Audio/Renderer/Server/MemoryPool/PoolMapper.cs')

diff --git a/src/Ryujinx.Audio/Renderer/Server/MemoryPool/PoolMapper.cs b/src/Ryujinx.Audio/Renderer/Server/MemoryPool/PoolMapper.cs
index 4a29ead3..391b80f8 100644
--- a/src/Ryujinx.Audio/Renderer/Server/MemoryPool/PoolMapper.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/MemoryPool/PoolMapper.cs
@@ -40,23 +40,23 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
             /// <summary>
             /// <see cref="Dsp.AudioProcessor"/> unmapping failed.
             /// </summary>
-            UnmapError = 3
+            UnmapError = 3,
         }
 
         /// <summary>
         /// The handle of the process owning the CPU memory manipulated.
         /// </summary>
-        private uint _processHandle;
+        private readonly uint _processHandle;
 
         /// <summary>
         /// The <see cref="Memory{MemoryPoolState}"/> that will be manipulated.
         /// </summary>
-        private Memory<MemoryPoolState> _memoryPools;
+        private readonly Memory<MemoryPoolState> _memoryPools;
 
         /// <summary>
         /// If set to true, this will try to force map memory pool even if their state are considered invalid.
         /// </summary>
-        private bool _isForceMapEnabled;
+        private readonly bool _isForceMapEnabled;
 
         /// <summary>
         /// Create a new <see cref="PoolMapper"/> used for system mapping.
@@ -125,7 +125,8 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
             {
                 return CurrentProcessPseudoHandle;
             }
-            else if (memoryPool.Location == MemoryPoolState.LocationType.Dsp)
+
+            if (memoryPool.Location == MemoryPoolState.LocationType.Dsp)
             {
                 return _processHandle;
             }
@@ -234,13 +235,11 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
 
                 return true;
             }
-            else
-            {
-                errorInfo.ErrorCode = ResultCode.InvalidAddressInfo;
-                errorInfo.ExtraErrorInfo = addressInfo.CpuAddress;
 
-                return _isForceMapEnabled;
-            }
+            errorInfo.ErrorCode = ResultCode.InvalidAddressInfo;
+            errorInfo.ExtraErrorInfo = addressInfo.CpuAddress;
+
+            return _isForceMapEnabled;
         }
 
         /// <summary>
-- 
cgit v1.2.3