mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Audio: More style nits

Browse source
This commit is contained in:
jduncanator 2018-11-15 11:10:41 +11:00
commit 74e361cf84
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioTrack.cs
View file

@ -61,13 +61,13 @@ namespace Ryujinx.Audio.SoundIo
/// <param name="audioDevice">The SoundIO audio device</param> /// <param name="audioDevice">The SoundIO audio device</param>
public SoundIoAudioTrack(int trackId, SoundIO audioContext, SoundIODevice audioDevice) public SoundIoAudioTrack(int trackId, SoundIO audioContext, SoundIODevice audioDevice)
{ {
TrackID = trackId; TrackID = trackId;
AudioContext = audioContext; AudioContext = audioContext;
AudioDevice = audioDevice; AudioDevice = audioDevice;
State = PlaybackState.Stopped; State = PlaybackState.Stopped;
ReleasedBuffers = new ConcurrentQueue<long>(); ReleasedBuffers = new ConcurrentQueue<long>();
m_Buffer = new SoundIoRingBuffer(); m_Buffer = new SoundIoRingBuffer();
m_ReservedBuffers = new ConcurrentQueue<SoundIoBuffer>(); m_ReservedBuffers = new ConcurrentQueue<SoundIoBuffer>();
} }
@ -121,16 +121,18 @@ namespace Ryujinx.Audio.SoundIo
/// <param name="maxFrameCount">The maximum amount of frames that can be written to the audio backend</param> /// <param name="maxFrameCount">The maximum amount of frames that can be written to the audio backend</param>
private unsafe void WriteCallback(int minFrameCount, int maxFrameCount) private unsafe void WriteCallback(int minFrameCount, int maxFrameCount)
{ {
int bytesPerFrame = AudioStream.BytesPerFrame; int bytesPerFrame = AudioStream.BytesPerFrame;
uint bytesPerSample = (uint)AudioStream.BytesPerSample; uint bytesPerSample = (uint)AudioStream.BytesPerSample;
int bufferedFrames = m_Buffer.Length / bytesPerFrame; int bufferedFrames = m_Buffer.Length / bytesPerFrame;
long bufferedSamples = m_Buffer.Length / bytesPerSample; long bufferedSamples = m_Buffer.Length / bytesPerSample;
int frameCount = Math.Min(bufferedFrames, maxFrameCount); int frameCount = Math.Min(bufferedFrames, maxFrameCount);
if (frameCount == 0) if (frameCount == 0)
{
return; return;
}
SoundIOChannelAreas areas = AudioStream.BeginWrite(ref frameCount); SoundIOChannelAreas areas = AudioStream.BeginWrite(ref frameCount);
int channelCount = areas.ChannelCount; int channelCount = areas.ChannelCount;
@ -395,7 +397,9 @@ namespace Ryujinx.Audio.SoundIo
// Obtain the channel area for each channel // Obtain the channel area for each channel
for (int i = 0; i < channelCount; i++) for (int i = 0; i < channelCount; i++)
{
channels[i] = areas.GetArea(i); channels[i] = areas.GetArea(i);
}
fixed (byte* srcptr = samples) fixed (byte* srcptr = samples)
{ {
@ -530,9 +534,9 @@ namespace Ryujinx.Audio.SoundIo
OnBufferReleased(); OnBufferReleased();
ReleasedBuffers.Clear(); ReleasedBuffers.Clear();
AudioStream = null; State = PlaybackState.Stopped;
AudioStream = null;
BufferReleased = null; BufferReleased = null;
State = PlaybackState.Stopped;
} }
private void OnBufferReleased() private void OnBufferReleased()