|
@@ -12,19 +12,19 @@ namespace Ryujinx.Audio.Backends.SDL2
|
|
|
{
|
|
{
|
|
|
class SDL2HardwareDeviceSession : HardwareDeviceSessionOutputBase
|
|
class SDL2HardwareDeviceSession : HardwareDeviceSessionOutputBase
|
|
|
{
|
|
{
|
|
|
- private SDL2HardwareDeviceDriver _driver;
|
|
|
|
|
- private ConcurrentQueue<SDL2AudioBuffer> _queuedBuffers;
|
|
|
|
|
- private DynamicRingBuffer _ringBuffer;
|
|
|
|
|
|
|
+ private readonly SDL2HardwareDeviceDriver _driver;
|
|
|
|
|
+ private readonly ConcurrentQueue<SDL2AudioBuffer> _queuedBuffers;
|
|
|
|
|
+ private readonly DynamicRingBuffer _ringBuffer;
|
|
|
private ulong _playedSampleCount;
|
|
private ulong _playedSampleCount;
|
|
|
- private ManualResetEvent _updateRequiredEvent;
|
|
|
|
|
|
|
+ private readonly ManualResetEvent _updateRequiredEvent;
|
|
|
private uint _outputStream;
|
|
private uint _outputStream;
|
|
|
private bool _hasSetupError;
|
|
private bool _hasSetupError;
|
|
|
- private SDL_AudioCallback _callbackDelegate;
|
|
|
|
|
- private int _bytesPerFrame;
|
|
|
|
|
|
|
+ private readonly SDL_AudioCallback _callbackDelegate;
|
|
|
|
|
+ private readonly int _bytesPerFrame;
|
|
|
private uint _sampleCount;
|
|
private uint _sampleCount;
|
|
|
private bool _started;
|
|
private bool _started;
|
|
|
private float _volume;
|
|
private float _volume;
|
|
|
- private ushort _nativeSampleFormat;
|
|
|
|
|
|
|
+ private readonly ushort _nativeSampleFormat;
|
|
|
|
|
|
|
|
public SDL2HardwareDeviceSession(SDL2HardwareDeviceDriver driver, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, float requestedVolume) : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount)
|
|
public SDL2HardwareDeviceSession(SDL2HardwareDeviceDriver driver, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, float requestedVolume) : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount)
|
|
|
{
|
|
{
|
|
@@ -72,7 +72,7 @@ namespace Ryujinx.Audio.Backends.SDL2
|
|
|
|
|
|
|
|
private unsafe void Update(IntPtr userdata, IntPtr stream, int streamLength)
|
|
private unsafe void Update(IntPtr userdata, IntPtr stream, int streamLength)
|
|
|
{
|
|
{
|
|
|
- Span<byte> streamSpan = new Span<byte>((void*)stream, streamLength);
|
|
|
|
|
|
|
+ Span<byte> streamSpan = new((void*)stream, streamLength);
|
|
|
|
|
|
|
|
int maxFrameCount = (int)GetSampleCount(streamLength);
|
|
int maxFrameCount = (int)GetSampleCount(streamLength);
|
|
|
int bufferedFrames = _ringBuffer.Length / _bytesPerFrame;
|
|
int bufferedFrames = _ringBuffer.Length / _bytesPerFrame;
|
|
@@ -82,7 +82,7 @@ namespace Ryujinx.Audio.Backends.SDL2
|
|
|
if (frameCount == 0)
|
|
if (frameCount == 0)
|
|
|
{
|
|
{
|
|
|
// SDL2 left the responsibility to the user to clear the buffer.
|
|
// SDL2 left the responsibility to the user to clear the buffer.
|
|
|
- streamSpan.Fill(0);
|
|
|
|
|
|
|
+ streamSpan.Clear();
|
|
|
|
|
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
@@ -96,7 +96,7 @@ namespace Ryujinx.Audio.Backends.SDL2
|
|
|
IntPtr pStreamSrc = (IntPtr)p;
|
|
IntPtr pStreamSrc = (IntPtr)p;
|
|
|
|
|
|
|
|
// Zero the dest buffer
|
|
// Zero the dest buffer
|
|
|
- streamSpan.Fill(0);
|
|
|
|
|
|
|
+ streamSpan.Clear();
|
|
|
|
|
|
|
|
// Apply volume to written data
|
|
// Apply volume to written data
|
|
|
SDL_MixAudioFormat(stream, pStreamSrc, _nativeSampleFormat, (uint)samples.Length, (int)(_volume * SDL_MIX_MAXVOLUME));
|
|
SDL_MixAudioFormat(stream, pStreamSrc, _nativeSampleFormat, (uint)samples.Length, (int)(_volume * SDL_MIX_MAXVOLUME));
|
|
@@ -151,7 +151,7 @@ namespace Ryujinx.Audio.Backends.SDL2
|
|
|
|
|
|
|
|
if (_outputStream != 0)
|
|
if (_outputStream != 0)
|
|
|
{
|
|
{
|
|
|
- SDL2AudioBuffer driverBuffer = new SDL2AudioBuffer(buffer.DataPointer, GetSampleCount(buffer));
|
|
|
|
|
|
|
+ SDL2AudioBuffer driverBuffer = new(buffer.DataPointer, GetSampleCount(buffer));
|
|
|
|
|
|
|
|
_ringBuffer.Write(buffer.Data, 0, buffer.Data.Length);
|
|
_ringBuffer.Write(buffer.Data, 0, buffer.Data.Length);
|
|
|
|
|
|