From df5be5812f9ebfd6533ef3eefdcdb24d30f29954 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Sun, 25 Jun 2023 01:29:40 +0200
Subject: [PATCH] [Ryujinx.Audio.Backends.OpenAL] Address dotnet-format issues
(#5359)
* dotnet format style --severity info
Some changes were manually reverted.
* Restore a few unused methods and variables
* Address dotnet format CA1816 warnings
* Address most dotnet format whitespace warnings
* Simplify properties and array initialization, Use const when possible, Remove trailing commas
* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"
This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.
* dotnet format whitespace after rebase
---
.../OpenALHardwareDeviceDriver.cs | 5 +--
.../OpenALHardwareDeviceSession.cs | 36 ++++++++-----------
2 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceDriver.cs b/src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceDriver.cs
index 0c793f2481..92946900f7 100644
--- a/src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceDriver.cs
+++ b/src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceDriver.cs
@@ -18,7 +18,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
private readonly ManualResetEvent _pauseEvent;
private readonly ConcurrentDictionary<OpenALHardwareDeviceSession, byte> _sessions;
private bool _stillRunning;
- private Thread _updaterThread;
+ private readonly Thread _updaterThread;
public OpenALHardwareDeviceDriver()
{
@@ -73,7 +73,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
throw new ArgumentException($"{channelCount}");
}
- OpenALHardwareDeviceSession session = new OpenALHardwareDeviceSession(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
+ OpenALHardwareDeviceSession session = new(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
_sessions.TryAdd(session, 0);
@@ -123,6 +123,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
public void Dispose()
{
+ GC.SuppressFinalize(this);
Dispose(true);
}
diff --git a/src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceSession.cs b/src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceSession.cs
index 8d7d0d6a27..4a2d521feb 100644
--- a/src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceSession.cs
+++ b/src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceSession.cs
@@ -10,11 +10,11 @@ namespace Ryujinx.Audio.Backends.OpenAL
{
class OpenALHardwareDeviceSession : HardwareDeviceSessionOutputBase
{
- private OpenALHardwareDeviceDriver _driver;
- private int _sourceId;
- private ALFormat _targetFormat;
+ private readonly OpenALHardwareDeviceDriver _driver;
+ private readonly int _sourceId;
+ private readonly ALFormat _targetFormat;
private bool _isActive;
- private Queue<OpenALAudioBuffer> _queuedBuffers;
+ private readonly Queue<OpenALAudioBuffer> _queuedBuffers;
private ulong _playedSampleCount;
private readonly object _lock = new();
@@ -32,23 +32,17 @@ namespace Ryujinx.Audio.Backends.OpenAL
private ALFormat GetALFormat()
{
- switch (RequestedSampleFormat)
+ return RequestedSampleFormat switch
{
- case SampleFormat.PcmInt16:
- switch (RequestedChannelCount)
- {
- case 1:
- return ALFormat.Mono16;
- case 2:
- return ALFormat.Stereo16;
- case 6:
- return ALFormat.Multi51Chn16Ext;
- default:
- throw new NotImplementedException($"Unsupported channel config {RequestedChannelCount}");
- }
- default:
- throw new NotImplementedException($"Unsupported sample format {RequestedSampleFormat}");
- }
+ SampleFormat.PcmInt16 => RequestedChannelCount switch
+ {
+ 1 => ALFormat.Mono16,
+ 2 => ALFormat.Stereo16,
+ 6 => ALFormat.Multi51Chn16Ext,
+ _ => throw new NotImplementedException($"Unsupported channel config {RequestedChannelCount}"),
+ },
+ _ => throw new NotImplementedException($"Unsupported sample format {RequestedSampleFormat}"),
+ };
}
public override void PrepareToClose() { }
@@ -69,7 +63,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
{
lock (_lock)
{
- OpenALAudioBuffer driverBuffer = new OpenALAudioBuffer
+ OpenALAudioBuffer driverBuffer = new()
{
DriverIdentifier = buffer.DataPointer,
BufferId = AL.GenBuffer(),