aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Audio/Backends
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-07-02 01:27:18 +0200
committerGitHub <noreply@github.com>2023-07-02 01:27:18 +0200
commit515fc32b21f59298ec8ca45f5d3c36e9d3041084 (patch)
treeac3683b0bc6b6be56e6e4bdf7e37cea0e64a3fd0 /src/Ryujinx.Audio/Backends
parent0684b00b3c4d000cf627b9c08a49d7469ae50d04 (diff)
[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>
Diffstat (limited to 'src/Ryujinx.Audio/Backends')
-rw-r--r--src/Ryujinx.Audio/Backends/Common/BackendHelper.cs2
-rw-r--r--src/Ryujinx.Audio/Backends/Common/DynamicRingBuffer.cs2
-rw-r--r--src/Ryujinx.Audio/Backends/Common/HardwareDeviceSessionOutputBase.cs7
-rw-r--r--src/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceDriver.cs14
-rw-r--r--src/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceSession.cs12
-rw-r--r--src/Ryujinx.Audio/Backends/CompatLayer/Downmixing.cs14
-rw-r--r--src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceDriver.cs15
-rw-r--r--src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceSessionInput.cs8
-rw-r--r--src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceSessionOutput.cs4
9 files changed, 37 insertions, 41 deletions
diff --git a/src/Ryujinx.Audio/Backends/Common/BackendHelper.cs b/src/Ryujinx.Audio/Backends/Common/BackendHelper.cs
index 30db340f..124d8364 100644
--- a/src/Ryujinx.Audio/Backends/Common/BackendHelper.cs
+++ b/src/Ryujinx.Audio/Backends/Common/BackendHelper.cs
@@ -23,4 +23,4 @@ namespace Ryujinx.Audio.Backends.Common
return bufferSize / GetSampleSize(format) / channelCount;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Backends/Common/DynamicRingBuffer.cs b/src/Ryujinx.Audio/Backends/Common/DynamicRingBuffer.cs
index d17303cd..05dd2162 100644
--- a/src/Ryujinx.Audio/Backends/Common/DynamicRingBuffer.cs
+++ b/src/Ryujinx.Audio/Backends/Common/DynamicRingBuffer.cs
@@ -163,4 +163,4 @@ namespace Ryujinx.Audio.Backends.Common
}
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Backends/Common/HardwareDeviceSessionOutputBase.cs b/src/Ryujinx.Audio/Backends/Common/HardwareDeviceSessionOutputBase.cs
index 6fb3bee0..5599c082 100644
--- a/src/Ryujinx.Audio/Backends/Common/HardwareDeviceSessionOutputBase.cs
+++ b/src/Ryujinx.Audio/Backends/Common/HardwareDeviceSessionOutputBase.cs
@@ -66,14 +66,11 @@ namespace Ryujinx.Audio.Backends.Common
return false;
}
- if (buffer.Data == null)
- {
- buffer.Data = samples;
- }
+ buffer.Data ??= samples;
return true;
}
public virtual void UnregisterBuffer(AudioBuffer buffer) { }
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceDriver.cs b/src/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceDriver.cs
index 22919f1e..3f3806c3 100644
--- a/src/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceDriver.cs
+++ b/src/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceDriver.cs
@@ -6,14 +6,13 @@ using Ryujinx.Common.Logging;
using Ryujinx.Memory;
using System;
using System.Threading;
-
using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
namespace Ryujinx.Audio.Backends.CompatLayer
{
public class CompatLayerHardwareDeviceDriver : IHardwareDeviceDriver
{
- private IHardwareDeviceDriver _realDriver;
+ private readonly IHardwareDeviceDriver _realDriver;
public static bool IsSupported => true;
@@ -24,6 +23,7 @@ namespace Ryujinx.Audio.Backends.CompatLayer
public void Dispose()
{
+ GC.SuppressFinalize(this);
_realDriver.Dispose();
}
@@ -49,7 +49,7 @@ namespace Ryujinx.Audio.Backends.CompatLayer
6 => SelectHardwareChannelCount(2),
2 => SelectHardwareChannelCount(1),
1 => throw new ArgumentException("No valid channel configuration found!"),
- _ => throw new ArgumentException($"Invalid targetChannelCount {targetChannelCount}")
+ _ => throw new ArgumentException($"Invalid targetChannelCount {targetChannelCount}"),
};
}
@@ -110,7 +110,7 @@ namespace Ryujinx.Audio.Backends.CompatLayer
{
Logger.Warning?.Print(LogClass.Audio, "The selected audio backend doesn't support audio input, fallback to dummy...");
- return new DummyHardwareDeviceSessionInput(this, memoryManager, sampleFormat, sampleRate, channelCount);
+ return new DummyHardwareDeviceSessionInput(this, memoryManager);
}
throw new NotImplementedException();
@@ -138,12 +138,12 @@ namespace Ryujinx.Audio.Backends.CompatLayer
if (direction == Direction.Input)
{
- Logger.Warning?.Print(LogClass.Audio, $"The selected audio backend doesn't support the requested audio input configuration, fallback to dummy...");
+ Logger.Warning?.Print(LogClass.Audio, "The selected audio backend doesn't support the requested audio input configuration, fallback to dummy...");
// TODO: We currently don't support audio input upsampling/downsampling, implement this.
realSession.Dispose();
- return new DummyHardwareDeviceSessionInput(this, memoryManager, sampleFormat, sampleRate, channelCount);
+ return new DummyHardwareDeviceSessionInput(this, memoryManager);
}
// It must be a HardwareDeviceSessionOutputBase.
@@ -183,4 +183,4 @@ namespace Ryujinx.Audio.Backends.CompatLayer
return direction == Direction.Input || direction == Direction.Output;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceSession.cs b/src/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceSession.cs
index f22a7a69..a9acabec 100644
--- a/src/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceSession.cs
+++ b/src/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceSession.cs
@@ -8,9 +8,9 @@ namespace Ryujinx.Audio.Backends.CompatLayer
{
class CompatLayerHardwareDeviceSession : HardwareDeviceSessionOutputBase
{
- private HardwareDeviceSessionOutputBase _realSession;
- private SampleFormat _userSampleFormat;
- private uint _userChannelCount;
+ private readonly HardwareDeviceSessionOutputBase _realSession;
+ private readonly SampleFormat _userSampleFormat;
+ private readonly uint _userChannelCount;
public CompatLayerHardwareDeviceSession(HardwareDeviceSessionOutputBase realSession, SampleFormat userSampleFormat, uint userChannelCount) : base(realSession.MemoryManager, realSession.RequestedSampleFormat, realSession.RequestedSampleRate, userChannelCount)
{
@@ -116,11 +116,11 @@ namespace Ryujinx.Audio.Backends.CompatLayer
samples = MemoryMarshal.Cast<short, byte>(samplesPCM16).ToArray();
}
- AudioBuffer fakeBuffer = new AudioBuffer
+ AudioBuffer fakeBuffer = new()
{
BufferTag = buffer.BufferTag,
DataPointer = buffer.DataPointer,
- DataSize = (ulong)samples.Length
+ DataSize = (ulong)samples.Length,
};
bool result = _realSession.RegisterBuffer(fakeBuffer, samples);
@@ -159,4 +159,4 @@ namespace Ryujinx.Audio.Backends.CompatLayer
return _realSession.WasBufferFullyConsumed(buffer);
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Backends/CompatLayer/Downmixing.cs b/src/Ryujinx.Audio/Backends/CompatLayer/Downmixing.cs
index 6959c158..ffd427a5 100644
--- a/src/Ryujinx.Audio/Backends/CompatLayer/Downmixing.cs
+++ b/src/Ryujinx.Audio/Backends/CompatLayer/Downmixing.cs
@@ -31,18 +31,18 @@ namespace Ryujinx.Audio.Backends.CompatLayer
private const int Minus6dBInQ15 = (int)(0.501f * RawQ15One);
private const int Minus12dBInQ15 = (int)(0.251f * RawQ15One);
- private static readonly int[] DefaultSurroundToStereoCoefficients = new int[4]
+ private static readonly int[] _defaultSurroundToStereoCoefficients = new int[4]
{
RawQ15One,
Minus3dBInQ15,
Minus12dBInQ15,
- Minus3dBInQ15
+ Minus3dBInQ15,
};
- private static readonly int[] DefaultStereoToMonoCoefficients = new int[2]
+ private static readonly int[] _defaultStereoToMonoCoefficients = new int[2]
{
Minus6dBInQ15,
- Minus6dBInQ15
+ Minus6dBInQ15,
};
private const int SurroundChannelCount = 6;
@@ -114,12 +114,12 @@ namespace Ryujinx.Audio.Backends.CompatLayer
public static short[] DownMixStereoToMono(ReadOnlySpan<short> data)
{
- return DownMixStereoToMono(DefaultStereoToMonoCoefficients, data);
+ return DownMixStereoToMono(_defaultStereoToMonoCoefficients, data);
}
public static short[] DownMixSurroundToStereo(ReadOnlySpan<short> data)
{
- return DownMixSurroundToStereo(DefaultSurroundToStereoCoefficients, data);
+ return DownMixSurroundToStereo(_defaultSurroundToStereoCoefficients, data);
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceDriver.cs b/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceDriver.cs
index 641640f0..bac21c44 100644
--- a/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceDriver.cs
+++ b/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceDriver.cs
@@ -1,16 +1,16 @@
using Ryujinx.Audio.Common;
using Ryujinx.Audio.Integration;
using Ryujinx.Memory;
+using System;
using System.Threading;
-
using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
namespace Ryujinx.Audio.Backends.Dummy
{
public class DummyHardwareDeviceDriver : IHardwareDeviceDriver
{
- private ManualResetEvent _updateRequiredEvent;
- private ManualResetEvent _pauseEvent;
+ private readonly ManualResetEvent _updateRequiredEvent;
+ private readonly ManualResetEvent _pauseEvent;
public static bool IsSupported => true;
@@ -36,10 +36,8 @@ namespace Ryujinx.Audio.Backends.Dummy
{
return new DummyHardwareDeviceSessionOutput(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
}
- else
- {
- return new DummyHardwareDeviceSessionInput(this, memoryManager, sampleFormat, sampleRate, channelCount);
- }
+
+ return new DummyHardwareDeviceSessionInput(this, memoryManager);
}
public ManualResetEvent GetUpdateRequiredEvent()
@@ -54,6 +52,7 @@ namespace Ryujinx.Audio.Backends.Dummy
public void Dispose()
{
+ GC.SuppressFinalize(this);
Dispose(true);
}
@@ -86,4 +85,4 @@ namespace Ryujinx.Audio.Backends.Dummy
return channelCount == 1 || channelCount == 2 || channelCount == 6;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceSessionInput.cs b/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceSessionInput.cs
index 845713a1..f51a6339 100644
--- a/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceSessionInput.cs
+++ b/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceSessionInput.cs
@@ -8,10 +8,10 @@ namespace Ryujinx.Audio.Backends.Dummy
class DummyHardwareDeviceSessionInput : IHardwareDeviceSession
{
private float _volume;
- private IHardwareDeviceDriver _manager;
- private IVirtualMemoryManager _memoryManager;
+ private readonly IHardwareDeviceDriver _manager;
+ private readonly IVirtualMemoryManager _memoryManager;
- public DummyHardwareDeviceSessionInput(IHardwareDeviceDriver manager, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount)
+ public DummyHardwareDeviceSessionInput(IHardwareDeviceDriver manager, IVirtualMemoryManager memoryManager)
{
_volume = 1.0f;
_manager = manager;
@@ -64,4 +64,4 @@ namespace Ryujinx.Audio.Backends.Dummy
return true;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceSessionOutput.cs b/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceSessionOutput.cs
index 8e2c949e..1c248faa 100644
--- a/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceSessionOutput.cs
+++ b/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceSessionOutput.cs
@@ -9,7 +9,7 @@ namespace Ryujinx.Audio.Backends.Dummy
internal class DummyHardwareDeviceSessionOutput : HardwareDeviceSessionOutputBase
{
private float _volume;
- private IHardwareDeviceDriver _manager;
+ private readonly IHardwareDeviceDriver _manager;
private ulong _playedSampleCount;
@@ -59,4 +59,4 @@ namespace Ryujinx.Audio.Backends.Dummy
return true;
}
}
-} \ No newline at end of file
+}