diff options
Diffstat (limited to 'src/Ryujinx.Audio/Common')
| -rw-r--r-- | src/Ryujinx.Audio/Common/AudioBuffer.cs | 2 | ||||
| -rw-r--r-- | src/Ryujinx.Audio/Common/AudioDeviceSession.cs | 20 | ||||
| -rw-r--r-- | src/Ryujinx.Audio/Common/AudioDeviceState.cs | 4 | ||||
| -rw-r--r-- | src/Ryujinx.Audio/Common/AudioInputConfiguration.cs | 4 | ||||
| -rw-r--r-- | src/Ryujinx.Audio/Common/AudioOutputConfiguration.cs | 2 | ||||
| -rw-r--r-- | src/Ryujinx.Audio/Common/AudioUserBuffer.cs | 2 | ||||
| -rw-r--r-- | src/Ryujinx.Audio/Common/SampleFormat.cs | 4 |
7 files changed, 18 insertions, 20 deletions
diff --git a/src/Ryujinx.Audio/Common/AudioBuffer.cs b/src/Ryujinx.Audio/Common/AudioBuffer.cs index b79401b7..87a7d5f3 100644 --- a/src/Ryujinx.Audio/Common/AudioBuffer.cs +++ b/src/Ryujinx.Audio/Common/AudioBuffer.cs @@ -34,4 +34,4 @@ namespace Ryujinx.Audio.Common /// </summary> public byte[] Data; } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Audio/Common/AudioDeviceSession.cs b/src/Ryujinx.Audio/Common/AudioDeviceSession.cs index 0191f7cc..a0e04c80 100644 --- a/src/Ryujinx.Audio/Common/AudioDeviceSession.cs +++ b/src/Ryujinx.Audio/Common/AudioDeviceSession.cs @@ -23,7 +23,7 @@ namespace Ryujinx.Audio.Common /// <summary> /// Array of all buffers currently used or released. /// </summary> - private AudioBuffer[] _buffers; + private readonly AudioBuffer[] _buffers; /// <summary> /// The server index inside <see cref="_buffers"/> (appended but not queued to device driver). @@ -58,17 +58,17 @@ namespace Ryujinx.Audio.Common /// <summary> /// The released buffer event. /// </summary> - private IWritableEvent _bufferEvent; + private readonly IWritableEvent _bufferEvent; /// <summary> /// The session on the device driver. /// </summary> - private IHardwareDeviceSession _hardwareDeviceSession; + private readonly IHardwareDeviceSession _hardwareDeviceSession; /// <summary> /// Max number of buffers that can be registered to the device driver at a time. /// </summary> - private uint _bufferRegisteredLimit; + private readonly uint _bufferRegisteredLimit; /// <summary> /// Create a new <see cref="AudioDeviceSession"/>. @@ -311,9 +311,9 @@ namespace Ryujinx.Audio.Common return false; } - public bool AppendUacBuffer(AudioBuffer buffer, uint handle) + public static bool AppendUacBuffer(AudioBuffer buffer, uint handle) { - // NOTE: On hardware, there is another RegisterBuffer method taking an handle. + // NOTE: On hardware, there is another RegisterBuffer method taking a handle. // This variant of the call always return false (stubbed?) as a result this logic will never succeed. return false; @@ -425,10 +425,8 @@ namespace Ryujinx.Audio.Common { return 0; } - else - { - return _hardwareDeviceSession.GetPlayedSampleCount(); - } + + return _hardwareDeviceSession.GetPlayedSampleCount(); } /// <summary> @@ -515,4 +513,4 @@ namespace Ryujinx.Audio.Common } } } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Audio/Common/AudioDeviceState.cs b/src/Ryujinx.Audio/Common/AudioDeviceState.cs index b3f968da..8705e802 100644 --- a/src/Ryujinx.Audio/Common/AudioDeviceState.cs +++ b/src/Ryujinx.Audio/Common/AudioDeviceState.cs @@ -13,6 +13,6 @@ namespace Ryujinx.Audio.Common /// <summary> /// The audio device is stopped. /// </summary> - Stopped + Stopped, } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Audio/Common/AudioInputConfiguration.cs b/src/Ryujinx.Audio/Common/AudioInputConfiguration.cs index d3cfdd47..078c3a39 100644 --- a/src/Ryujinx.Audio/Common/AudioInputConfiguration.cs +++ b/src/Ryujinx.Audio/Common/AudioInputConfiguration.cs @@ -24,6 +24,6 @@ namespace Ryujinx.Audio.Common /// <summary> /// Reserved/unused. /// </summary> - private ushort _reserved; + private readonly ushort _reserved; } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Audio/Common/AudioOutputConfiguration.cs b/src/Ryujinx.Audio/Common/AudioOutputConfiguration.cs index e17e1757..594f1225 100644 --- a/src/Ryujinx.Audio/Common/AudioOutputConfiguration.cs +++ b/src/Ryujinx.Audio/Common/AudioOutputConfiguration.cs @@ -34,4 +34,4 @@ namespace Ryujinx.Audio.Common /// </summary> public AudioDeviceState AudioOutState; } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Audio/Common/AudioUserBuffer.cs b/src/Ryujinx.Audio/Common/AudioUserBuffer.cs index 50ab67fa..bb71165f 100644 --- a/src/Ryujinx.Audio/Common/AudioUserBuffer.cs +++ b/src/Ryujinx.Audio/Common/AudioUserBuffer.cs @@ -33,4 +33,4 @@ namespace Ryujinx.Audio.Common /// </summary> public ulong DataOffset; } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Audio/Common/SampleFormat.cs b/src/Ryujinx.Audio/Common/SampleFormat.cs index 901410a2..39e525e8 100644 --- a/src/Ryujinx.Audio/Common/SampleFormat.cs +++ b/src/Ryujinx.Audio/Common/SampleFormat.cs @@ -38,6 +38,6 @@ namespace Ryujinx.Audio.Common /// <summary> /// ADPCM sample format. (Also known as GC-ADPCM) /// </summary> - Adpcm = 6 + Adpcm = 6, } -}
\ No newline at end of file +} |