aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Audio/Input/AudioInputSystem.cs
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/Input/AudioInputSystem.cs
parent0684b00b3c4d000cf627b9c08a49d7469ae50d04 (diff)
[Ryujinx.Audio] Address dotnet-format issues (#5362)1.1.949
* 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/Input/AudioInputSystem.cs')
-rw-r--r--src/Ryujinx.Audio/Input/AudioInputSystem.cs24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/Ryujinx.Audio/Input/AudioInputSystem.cs b/src/Ryujinx.Audio/Input/AudioInputSystem.cs
index 33364e28..34623b34 100644
--- a/src/Ryujinx.Audio/Input/AudioInputSystem.cs
+++ b/src/Ryujinx.Audio/Input/AudioInputSystem.cs
@@ -18,7 +18,7 @@ namespace Ryujinx.Audio.Input
/// <summary>
/// The session the <see cref="AudioInputSystem"/>.
/// </summary>
- private AudioDeviceSession _session;
+ private readonly AudioDeviceSession _session;
/// <summary>
/// The target device name of the <see cref="AudioInputSystem"/>.
@@ -43,7 +43,7 @@ namespace Ryujinx.Audio.Input
/// <summary>
/// The <see cref="AudioInputManager"/> owning this.
/// </summary>
- private AudioInputManager _manager;
+ private readonly AudioInputManager _manager;
/// <summary>
/// The lock of the parent.
@@ -90,11 +90,13 @@ namespace Ryujinx.Audio.Input
{
return ResultCode.DeviceNotFound;
}
- else if (configuration.SampleRate != 0 && configuration.SampleRate != Constants.TargetSampleRate)
+
+ if (configuration.SampleRate != 0 && configuration.SampleRate != Constants.TargetSampleRate)
{
return ResultCode.UnsupportedSampleRate;
}
- else if (configuration.ChannelCount != 0 && configuration.ChannelCount != 1 && configuration.ChannelCount != 2 && configuration.ChannelCount != 6)
+
+ if (configuration.ChannelCount != 0 && configuration.ChannelCount != 1 && configuration.ChannelCount != 2 && configuration.ChannelCount != 6)
{
return ResultCode.UnsupportedChannelConfiguration;
}
@@ -185,11 +187,11 @@ namespace Ryujinx.Audio.Input
{
lock (_parentLock)
{
- AudioBuffer buffer = new AudioBuffer
+ AudioBuffer buffer = new()
{
BufferTag = bufferTag,
DataPointer = userBuffer.Data,
- DataSize = userBuffer.DataSize
+ DataSize = userBuffer.DataSize,
};
if (_session.AppendBuffer(buffer))
@@ -213,14 +215,14 @@ namespace Ryujinx.Audio.Input
{
lock (_parentLock)
{
- AudioBuffer buffer = new AudioBuffer
+ AudioBuffer buffer = new()
{
BufferTag = bufferTag,
DataPointer = userBuffer.Data,
- DataSize = userBuffer.DataSize
+ DataSize = userBuffer.DataSize,
};
- if (_session.AppendUacBuffer(buffer, handle))
+ if (AudioDeviceSession.AppendUacBuffer(buffer, handle))
{
return ResultCode.Success;
}
@@ -373,6 +375,8 @@ namespace Ryujinx.Audio.Input
public void Dispose()
{
+ GC.SuppressFinalize(this);
+
if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
{
Dispose(true);
@@ -389,4 +393,4 @@ namespace Ryujinx.Audio.Input
}
}
}
-} \ No newline at end of file
+}