mchapman/Ryujinx-greemdev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Ryujinx.Audio] Address dotnet-format issues (#5362)

Browse Source 
* 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>
This commit is contained in:
TSRBerry
2023-07-02 01:27:18 +02:00
committed by GitHub
parent 0684b00b3c
commit 515fc32b21
207 changed files with 1354 additions and 1670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ryujinx.Audio/Renderer/Utils/AudioProcessorMemoryManager.cs
View File

@@ -54,4 +54,4 @@ namespace Ryujinx.Audio.Renderer.Utils
{
}
}
}
}

6
src/Ryujinx.Audio/Renderer/Utils/BitArray.cs
View File

@@ -11,7 +11,7 @@ namespace Ryujinx.Audio.Renderer.Utils
/// <summary>
/// The backing storage of the <see cref="BitArray"/>.
/// </summary>
private Memory<byte> _storage;
private readonly Memory<byte> _storage;
/// <summary>
/// Create a new <see cref="BitArray"/> from <see cref="Memory{T}"/>.
@@ -97,7 +97,7 @@ namespace Ryujinx.Audio.Renderer.Utils
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Reset()
{
_storage.Span.Fill(0);
_storage.Span.Clear();
}
}
}
}

8
src/Ryujinx.Audio/Renderer/Utils/FileHardwareDevice.cs
View File

@@ -2,7 +2,6 @@ using Ryujinx.Audio.Integration;
using System;
using System.IO;
using System.Runtime.InteropServices;
using System.Text;
namespace Ryujinx.Audio.Renderer.Utils
{
@@ -12,8 +11,8 @@ namespace Ryujinx.Audio.Renderer.Utils
public class FileHardwareDevice : IHardwareDevice
{
private FileStream _stream;
private uint _channelCount;
private uint _sampleRate;
private readonly uint _channelCount;
private readonly uint _sampleRate;
private const int HeaderSize = 44;
@@ -82,6 +81,7 @@ namespace Ryujinx.Audio.Renderer.Utils
public void Dispose()
{
GC.SuppressFinalize(this);
Dispose(true);
}
@@ -96,4 +96,4 @@ namespace Ryujinx.Audio.Renderer.Utils
}
}
}
}
}

7
src/Ryujinx.Audio/Renderer/Utils/Mailbox.cs
View File

@@ -9,8 +9,8 @@ namespace Ryujinx.Audio.Renderer.Utils
/// <typeparam name="T">The target unmanaged type used</typeparam>
public class Mailbox<T> : IDisposable where T : unmanaged
{
private BlockingCollection<T> _messageQueue;
private BlockingCollection<T> _responseQueue;
private readonly BlockingCollection<T> _messageQueue;
private readonly BlockingCollection<T> _responseQueue;
public Mailbox()
{
@@ -40,6 +40,7 @@ namespace Ryujinx.Audio.Renderer.Utils
public void Dispose()
{
GC.SuppressFinalize(this);
Dispose(true);
}
@@ -52,4 +53,4 @@ namespace Ryujinx.Audio.Renderer.Utils
}
}
}
}
}

2
src/Ryujinx.Audio/Renderer/Utils/Math/Matrix2x2.cs
View File

@@ -68,4 +68,4 @@ namespace Ryujinx.Audio.Renderer.Utils.Math
return m;
}
}
}
}

2
src/Ryujinx.Audio/Renderer/Utils/Math/Matrix6x6.cs
View File

@@ -94,4 +94,4 @@ namespace Ryujinx.Audio.Renderer.Utils.Math
M66 = m66;
}
}
}
}

4
src/Ryujinx.Audio/Renderer/Utils/Math/MatrixHelper.cs
View File

@@ -28,7 +28,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
X = value2.M11 * value1.X + value2.M12 * value1.Y + value2.M13 * value1.Z + value2.M14 * value1.W,
Y = value2.M21 * value1.X + value2.M22 * value1.Y + value2.M23 * value1.Z + value2.M24 * value1.W,
Z = value2.M31 * value1.X + value2.M32 * value1.Y + value2.M33 * value1.Z + value2.M34 * value1.W,
W = value2.M41 * value1.X + value2.M42 * value1.Y + value2.M43 * value1.Z + value2.M44 * value1.W
W = value2.M41 * value1.X + value2.M42 * value1.Y + value2.M43 * value1.Z + value2.M44 * value1.W,
};
}
@@ -42,4 +42,4 @@ namespace Ryujinx.Audio.Renderer.Dsp
};
}
}
}
}

2
src/Ryujinx.Audio/Renderer/Utils/Math/Vector6.cs
View File

@@ -53,4 +53,4 @@ namespace Ryujinx.Audio.Renderer.Utils.Math
return left * new Vector6(right);
}
}
}
}

38
src/Ryujinx.Audio/Renderer/Utils/SpanIOHelper.cs
View File

@@ -22,12 +22,12 @@ namespace Ryujinx.Audio.Renderer.Utils
if (size > backingMemory.Length)
{
throw new ArgumentOutOfRangeException();
throw new ArgumentOutOfRangeException(nameof(backingMemory), backingMemory.Length, null);
}
MemoryMarshal.Write<T>(backingMemory.Span.Slice(0, size), ref data);
MemoryMarshal.Write(backingMemory.Span[..size], ref data);
backingMemory = backingMemory.Slice(size);
backingMemory = backingMemory[size..];
}
/// <summary>
@@ -42,12 +42,12 @@ namespace Ryujinx.Audio.Renderer.Utils
if (size > backingMemory.Length)
{
throw new ArgumentOutOfRangeException();
throw new ArgumentOutOfRangeException(nameof(backingMemory), backingMemory.Length, null);
}
MemoryMarshal.Write<T>(backingMemory.Slice(0, size), ref data);
MemoryMarshal.Write(backingMemory[..size], ref data);
backingMemory = backingMemory.Slice(size);
backingMemory = backingMemory[size..];
}
/// <summary>
@@ -62,12 +62,12 @@ namespace Ryujinx.Audio.Renderer.Utils
if (size > backingMemory.Length)
{
throw new ArgumentOutOfRangeException();
throw new ArgumentOutOfRangeException(nameof(backingMemory), backingMemory.Length, null);
}
Span<T> result = MemoryMarshal.Cast<byte, T>(backingMemory.Span.Slice(0, size));
Span<T> result = MemoryMarshal.Cast<byte, T>(backingMemory.Span[..size]);
backingMemory = backingMemory.Slice(size);
backingMemory = backingMemory[size..];
return result;
}
@@ -84,12 +84,12 @@ namespace Ryujinx.Audio.Renderer.Utils
if (size > backingMemory.Length)
{
throw new ArgumentOutOfRangeException();
throw new ArgumentOutOfRangeException(nameof(backingMemory), backingMemory.Length, null);
}
Span<T> result = MemoryMarshal.Cast<byte, T>(backingMemory.Slice(0, size));
Span<T> result = MemoryMarshal.Cast<byte, T>(backingMemory[..size]);
backingMemory = backingMemory.Slice(size);
backingMemory = backingMemory[size..];
return result;
}
@@ -106,12 +106,12 @@ namespace Ryujinx.Audio.Renderer.Utils
if (size > backingMemory.Length)
{
throw new ArgumentOutOfRangeException();
throw new ArgumentOutOfRangeException(nameof(backingMemory), backingMemory.Length, null);
}
T result = MemoryMarshal.Read<T>(backingMemory.Span.Slice(0, size));
T result = MemoryMarshal.Read<T>(backingMemory.Span[..size]);
backingMemory = backingMemory.Slice(size);
backingMemory = backingMemory[size..];
return result;
}
@@ -128,12 +128,12 @@ namespace Ryujinx.Audio.Renderer.Utils
if (size > backingMemory.Length)
{
throw new ArgumentOutOfRangeException();
throw new ArgumentOutOfRangeException(nameof(backingMemory), backingMemory.Length, null);
}
T result = MemoryMarshal.Read<T>(backingMemory.Slice(0, size));
T result = MemoryMarshal.Read<T>(backingMemory[..size]);
backingMemory = backingMemory.Slice(size);
backingMemory = backingMemory[size..];
return result;
}
@@ -168,4 +168,4 @@ namespace Ryujinx.Audio.Renderer.Utils
return ref GetMemory(memory, id, count).Span[0];
}
}
}
}

4
src/Ryujinx.Audio/Renderer/Utils/SpanMemoryManager.cs
View File

@@ -19,7 +19,7 @@ namespace Ryujinx.Audio.Renderer.Utils
}
}
public override Span<T> GetSpan() => new Span<T>(_pointer, _length);
public override Span<T> GetSpan() => new(_pointer, _length);
public override MemoryHandle Pin(int elementIndex = 0)
{
@@ -40,4 +40,4 @@ namespace Ryujinx.Audio.Renderer.Utils
return new SpanMemoryManager<T>(MemoryMarshal.Cast<TFrom, T>(memory.Span)).Memory;
}
}
}
}

7
src/Ryujinx.Audio/Renderer/Utils/SplitterHardwareDevice.cs
View File

@@ -5,8 +5,8 @@ namespace Ryujinx.Audio.Renderer.Utils
{
public class SplitterHardwareDevice : IHardwareDevice
{
private IHardwareDevice _baseDevice;
private IHardwareDevice _secondaryDevice;
private readonly IHardwareDevice _baseDevice;
private readonly IHardwareDevice _secondaryDevice;
public SplitterHardwareDevice(IHardwareDevice baseDevice, IHardwareDevice secondaryDevice)
{
@@ -43,6 +43,7 @@ namespace Ryujinx.Audio.Renderer.Utils
public void Dispose()
{
GC.SuppressFinalize(this);
Dispose(true);
}
@@ -55,4 +56,4 @@ namespace Ryujinx.Audio.Renderer.Utils
}
}
}
}
}