diff options
Diffstat (limited to 'Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs')
| -rw-r--r-- | Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs | 161 |
1 files changed, 98 insertions, 63 deletions
diff --git a/Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs b/Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs index f5e4c57d..1e487a6d 100644 --- a/Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs +++ b/Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs @@ -1,5 +1,6 @@ using Ryujinx.Audio.SoundIo; using SoundIOSharp; +using System; using System.Collections.Generic; namespace Ryujinx.Audio @@ -15,22 +16,32 @@ namespace Ryujinx.Audio private const int MaximumTracks = 256; /// <summary> + /// The volume of audio renderer + /// </summary> + private float _volume = 1.0f; + + /// <summary> + /// True if the volume of audio renderer have changed + /// </summary> + private bool _volumeChanged; + + /// <summary> /// The <see cref="SoundIO"/> audio context /// </summary> - private SoundIO m_AudioContext; + private SoundIO _audioContext; /// <summary> /// The <see cref="SoundIODevice"/> audio device /// </summary> - private SoundIODevice m_AudioDevice; + private SoundIODevice _audioDevice; /// <summary> /// An object pool containing <see cref="SoundIoAudioTrack"/> objects /// </summary> - private SoundIoAudioTrackPool m_TrackPool; + private SoundIoAudioTrackPool _trackPool; /// <summary> - /// True if SoundIO is supported on the device. + /// True if SoundIO is supported on the device /// </summary> public static bool IsSupported { @@ -45,27 +56,13 @@ namespace Ryujinx.Audio /// </summary> public SoundIoAudioOut() { - m_AudioContext = new SoundIO(); + _audioContext = new SoundIO(); - m_AudioContext.Connect(); - m_AudioContext.FlushEvents(); + _audioContext.Connect(); + _audioContext.FlushEvents(); - m_AudioDevice = FindNonRawDefaultAudioDevice(m_AudioContext, true); - m_TrackPool = new SoundIoAudioTrackPool(m_AudioContext, m_AudioDevice, MaximumTracks); - } - - /// <summary> - /// Gets the current playback state of the specified track - /// </summary> - /// <param name="trackId">The track to retrieve the playback state for</param> - public PlaybackState GetState(int trackId) - { - if (m_TrackPool.TryGet(trackId, out SoundIoAudioTrack track)) - { - return track.State; - } - - return PlaybackState.Stopped; + _audioDevice = FindNonRawDefaultAudioDevice(_audioContext, true); + _trackPool = new SoundIoAudioTrackPool(_audioContext, _audioDevice, MaximumTracks); } /// <summary> @@ -77,7 +74,7 @@ namespace Ryujinx.Audio /// <returns>The created track's Track ID</returns> public int OpenTrack(int sampleRate, int channels, ReleaseCallback callback) { - if (!m_TrackPool.TryGet(out SoundIoAudioTrack track)) + if (!_trackPool.TryGet(out SoundIoAudioTrack track)) { return -1; } @@ -94,38 +91,52 @@ namespace Ryujinx.Audio /// <param name="trackId">The ID of the track to close</param> public void CloseTrack(int trackId) { - if (m_TrackPool.TryGet(trackId, out SoundIoAudioTrack track)) + if (_trackPool.TryGet(trackId, out SoundIoAudioTrack track)) { // Close and dispose of the track track.Close(); // Recycle the track back into the pool - m_TrackPool.Put(track); + _trackPool.Put(track); } } /// <summary> - /// Starts playback + /// Returns a value indicating whether the specified buffer is currently reserved by the specified track /// </summary> - /// <param name="trackId">The ID of the track to start playback on</param> - public void Start(int trackId) + /// <param name="trackId">The track to check</param> + /// <param name="bufferTag">The buffer tag to check</param> + public bool ContainsBuffer(int trackId, long bufferTag) { - if (m_TrackPool.TryGet(trackId, out SoundIoAudioTrack track)) + if (_trackPool.TryGet(trackId, out SoundIoAudioTrack track)) { - track.Start(); + return track.ContainsBuffer(bufferTag); } + + return false; } /// <summary> - /// Stops playback + /// Gets a list of buffer tags the specified track is no longer reserving /// </summary> - /// <param name="trackId">The ID of the track to stop playback on</param> - public void Stop(int trackId) + /// <param name="trackId">The track to retrieve buffer tags from</param> + /// <param name="maxCount">The maximum amount of buffer tags to retrieve</param> + /// <returns>Buffers released by the specified track</returns> + public long[] GetReleasedBuffers(int trackId, int maxCount) { - if (m_TrackPool.TryGet(trackId, out SoundIoAudioTrack track)) + if (_trackPool.TryGet(trackId, out SoundIoAudioTrack track)) { - track.Stop(); + List<long> bufferTags = new List<long>(); + + while(maxCount-- > 0 && track.ReleasedBuffers.TryDequeue(out long tag)) + { + bufferTags.Add(tag); + } + + return bufferTags.ToArray(); } + + return new long[0]; } /// <summary> @@ -135,51 +146,75 @@ namespace Ryujinx.Audio /// <param name="trackId">The track to append the buffer to</param> /// <param name="bufferTag">The internal tag of the buffer</param> /// <param name="buffer">The buffer to append to the track</param> - public void AppendBuffer<T>(int trackId, long bufferTag, T[] buffer) - where T : struct + public void AppendBuffer<T>(int trackId, long bufferTag, T[] buffer) where T : struct { - if (m_TrackPool.TryGet(trackId, out SoundIoAudioTrack track)) + if (_trackPool.TryGet(trackId, out SoundIoAudioTrack track)) { + if (_volumeChanged) + { + track.AudioStream.SetVolume(_volume); + + _volumeChanged = false; + } + track.AppendBuffer(bufferTag, buffer); } } /// <summary> - /// Returns a value indicating whether the specified buffer is currently reserved by the specified track + /// Starts playback /// </summary> - /// <param name="trackId">The track to check</param> - /// <param name="bufferTag">The buffer tag to check</param> - public bool ContainsBuffer(int trackId, long bufferTag) + /// <param name="trackId">The ID of the track to start playback on</param> + public void Start(int trackId) { - if (m_TrackPool.TryGet(trackId, out SoundIoAudioTrack track)) + if (_trackPool.TryGet(trackId, out SoundIoAudioTrack track)) { - return track.ContainsBuffer(bufferTag); + track.Start(); } - - return false; } /// <summary> - /// Gets a list of buffer tags the specified track is no longer reserving + /// Stops playback /// </summary> - /// <param name="trackId">The track to retrieve buffer tags from</param> - /// <param name="maxCount">The maximum amount of buffer tags to retrieve</param> - /// <returns>Buffers released by the specified track</returns> - public long[] GetReleasedBuffers(int trackId, int maxCount) + /// <param name="trackId">The ID of the track to stop playback on</param> + public void Stop(int trackId) { - if (m_TrackPool.TryGet(trackId, out SoundIoAudioTrack track)) + if (_trackPool.TryGet(trackId, out SoundIoAudioTrack track)) { - List<long> bufferTags = new List<long>(); + track.Stop(); + } + } - while(maxCount-- > 0 && track.ReleasedBuffers.TryDequeue(out long tag)) - { - bufferTags.Add(tag); - } + /// <summary> + /// Get playback volume + /// </summary> + public float GetVolume() => _volume; - return bufferTags.ToArray(); + /// <summary> + /// Set playback volume + /// </summary> + /// <param name="volume">The volume of the playback</param> + public void SetVolume(float volume) + { + if (!_volumeChanged) + { + _volume = volume; + _volumeChanged = true; + } + } + + /// <summary> + /// Gets the current playback state of the specified track + /// </summary> + /// <param name="trackId">The track to retrieve the playback state for</param> + public PlaybackState GetState(int trackId) + { + if (_trackPool.TryGet(trackId, out SoundIoAudioTrack track)) + { + return track.State; } - return new long[0]; + return PlaybackState.Stopped; } /// <summary> @@ -187,9 +222,9 @@ namespace Ryujinx.Audio /// </summary> public void Dispose() { - m_TrackPool.Dispose(); - m_AudioContext.Disconnect(); - m_AudioContext.Dispose(); + _trackPool.Dispose(); + _audioContext.Disconnect(); + _audioContext.Dispose(); } /// <summary> |