aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter.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/Renderer/Parameter/VoiceInParameter.cs
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/Renderer/Parameter/VoiceInParameter.cs')
-rw-r--r--src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter.cs40
1 files changed, 14 insertions, 26 deletions
diff --git a/src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter.cs b/src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter.cs
index c4b4ba31..86f92442 100644
--- a/src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter.cs
@@ -94,7 +94,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
/// <summary>
/// Reserved/unused.
/// </summary>
- private uint _reserved1;
+ private readonly uint _reserved1;
/// <summary>
/// User state address required by the data source.
@@ -143,7 +143,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
/// <summary>
/// Reserved/unused.
/// </summary>
- private ushort _reserved2;
+ private readonly ushort _reserved2;
/// <summary>
/// Change the behaviour of the voice.
@@ -222,7 +222,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
/// <summary>
/// Reserved/unused.
/// </summary>
- private byte _reserved;
+ private readonly byte _reserved;
/// <summary>
/// If set to anything other than 0, specifies how many times to loop the wavebuffer.
@@ -260,7 +260,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
/// <typeparam name="T">The PCM sample type</typeparam>
/// <returns>Returns true if the sample offset are in range of the size.</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- private bool IsSampleOffsetInRangeForPcm<T>() where T : unmanaged
+ private readonly bool IsSampleOffsetInRangeForPcm<T>() where T : unmanaged
{
uint dataTypeSize = (uint)Unsafe.SizeOf<T>();
@@ -273,27 +273,15 @@ namespace Ryujinx.Audio.Renderer.Parameter
/// </summary>
/// <param name="format">The target <see cref="SampleFormat"/></param>
/// <returns>Returns true if the sample offset are in range of the size.</returns>
- public bool IsSampleOffsetValid(SampleFormat format)
+ public readonly bool IsSampleOffsetValid(SampleFormat format)
{
- bool result;
-
- switch (format)
+ return format switch
{
- case SampleFormat.PcmInt16:
- result = IsSampleOffsetInRangeForPcm<ushort>();
- break;
- case SampleFormat.PcmFloat:
- result = IsSampleOffsetInRangeForPcm<float>();
- break;
- case SampleFormat.Adpcm:
- result = AdpcmHelper.GetAdpcmDataSize((int)StartSampleOffset) <= Size &&
- AdpcmHelper.GetAdpcmDataSize((int)EndSampleOffset) <= Size;
- break;
- default:
- throw new NotImplementedException($"{format} not implemented!");
- }
-
- return result;
+ SampleFormat.PcmInt16 => IsSampleOffsetInRangeForPcm<ushort>(),
+ SampleFormat.PcmFloat => IsSampleOffsetInRangeForPcm<float>(),
+ SampleFormat.Adpcm => AdpcmHelper.GetAdpcmDataSize((int)StartSampleOffset) <= Size && AdpcmHelper.GetAdpcmDataSize((int)EndSampleOffset) <= Size,
+ _ => throw new NotImplementedException($"{format} not implemented!"),
+ };
}
}
@@ -316,7 +304,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
/// <summary>
/// Skip pitch and Sample Rate Conversion (SRC).
/// </summary>
- SkipPitchAndSampleRateConversion = 2
+ SkipPitchAndSampleRateConversion = 2,
}
/// <summary>
@@ -338,7 +326,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
/// <summary>
/// Resample interpolating 1 samples per output sample.
/// </summary>
- Low
+ Low,
}
}
-} \ No newline at end of file
+}