From cee712105850ac3385cd0091a923438167433f9f Mon Sep 17 00:00:00 2001 From: TSR Berry <20988865+TSRBerry@users.noreply.github.com> Date: Sat, 8 Apr 2023 01:22:00 +0200 Subject: Move solution and projects to src --- Ryujinx.Audio/Integration/HardwareDeviceImpl.cs | 75 ---------------------- Ryujinx.Audio/Integration/IHardwareDevice.cs | 55 ---------------- Ryujinx.Audio/Integration/IHardwareDeviceDriver.cs | 36 ----------- .../Integration/IHardwareDeviceSession.cs | 28 -------- Ryujinx.Audio/Integration/IWritableEvent.cs | 18 ------ 5 files changed, 212 deletions(-) delete mode 100644 Ryujinx.Audio/Integration/HardwareDeviceImpl.cs delete mode 100644 Ryujinx.Audio/Integration/IHardwareDevice.cs delete mode 100644 Ryujinx.Audio/Integration/IHardwareDeviceDriver.cs delete mode 100644 Ryujinx.Audio/Integration/IHardwareDeviceSession.cs delete mode 100644 Ryujinx.Audio/Integration/IWritableEvent.cs (limited to 'Ryujinx.Audio/Integration') diff --git a/Ryujinx.Audio/Integration/HardwareDeviceImpl.cs b/Ryujinx.Audio/Integration/HardwareDeviceImpl.cs deleted file mode 100644 index 552f1ab2..00000000 --- a/Ryujinx.Audio/Integration/HardwareDeviceImpl.cs +++ /dev/null @@ -1,75 +0,0 @@ -using Ryujinx.Audio.Common; -using System; -using System.Runtime.InteropServices; - -namespace Ryujinx.Audio.Integration -{ - public class HardwareDeviceImpl : IHardwareDevice - { - private IHardwareDeviceSession _session; - private uint _channelCount; - private uint _sampleRate; - private uint _currentBufferTag; - - private byte[] _buffer; - - public HardwareDeviceImpl(IHardwareDeviceDriver deviceDriver, uint channelCount, uint sampleRate, float volume) - { - _session = deviceDriver.OpenDeviceSession(IHardwareDeviceDriver.Direction.Output, null, SampleFormat.PcmInt16, sampleRate, channelCount, volume); - _channelCount = channelCount; - _sampleRate = sampleRate; - _currentBufferTag = 0; - - _buffer = new byte[Constants.TargetSampleCount * channelCount * sizeof(ushort)]; - - _session.Start(); - } - - public void AppendBuffer(ReadOnlySpan data, uint channelCount) - { - data.CopyTo(MemoryMarshal.Cast(_buffer)); - - _session.QueueBuffer(new AudioBuffer - { - DataPointer = _currentBufferTag++, - Data = _buffer, - DataSize = (ulong)_buffer.Length, - }); - - _currentBufferTag = _currentBufferTag % 4; - } - - public void SetVolume(float volume) - { - _session.SetVolume(volume); - } - - public float GetVolume() - { - return _session.GetVolume(); - } - - public uint GetChannelCount() - { - return _channelCount; - } - - public uint GetSampleRate() - { - return _sampleRate; - } - - public void Dispose() - { - Dispose(true); - } - - protected virtual void Dispose(bool disposing) - { - if (disposing) - { - _session.Dispose(); - } - } - } -} \ No newline at end of file diff --git a/Ryujinx.Audio/Integration/IHardwareDevice.cs b/Ryujinx.Audio/Integration/IHardwareDevice.cs deleted file mode 100644 index 300de8c5..00000000 --- a/Ryujinx.Audio/Integration/IHardwareDevice.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.Diagnostics; - -namespace Ryujinx.Audio.Integration -{ - /// - /// Represent an hardware device used in - /// - public interface IHardwareDevice : IDisposable - { - /// - /// Sets the volume level for this device. - /// - /// The volume level to set. - void SetVolume(float volume); - - /// - /// Gets the volume level for this device. - /// - /// The volume level of this device. - float GetVolume(); - - /// - /// Get the supported sample rate of this device. - /// - /// The supported sample rate of this device. - uint GetSampleRate(); - - /// - /// Get the channel count supported by this device. - /// - /// The channel count supported by this device. - uint GetChannelCount(); - - /// - /// Appends new PCM16 samples to the device. - /// - /// The new PCM16 samples. - /// The number of channels. - void AppendBuffer(ReadOnlySpan data, uint channelCount); - - /// - /// Check if the audio renderer needs to perform downmixing. - /// - /// True if downmixing is needed. - public bool NeedDownmixing() - { - uint channelCount = GetChannelCount(); - - Debug.Assert(channelCount > 0 && channelCount <= Constants.ChannelCountMax); - - return channelCount != Constants.ChannelCountMax; - } - } -} \ No newline at end of file diff --git a/Ryujinx.Audio/Integration/IHardwareDeviceDriver.cs b/Ryujinx.Audio/Integration/IHardwareDeviceDriver.cs deleted file mode 100644 index 4ed17951..00000000 --- a/Ryujinx.Audio/Integration/IHardwareDeviceDriver.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Ryujinx.Audio.Common; -using Ryujinx.Memory; -using System; -using System.Threading; - -namespace Ryujinx.Audio.Integration -{ - /// - /// Represent an hardware device driver used in . - /// - public interface IHardwareDeviceDriver : IDisposable - { - public enum Direction - { - Input, - Output - } - - IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager, SampleFormat sampleFormat, uint sampleRate, uint channelCount, float volume = 1f); - - ManualResetEvent GetUpdateRequiredEvent(); - ManualResetEvent GetPauseEvent(); - - bool SupportsDirection(Direction direction); - bool SupportsSampleRate(uint sampleRate); - bool SupportsSampleFormat(SampleFormat sampleFormat); - bool SupportsChannelCount(uint channelCount); - - static abstract bool IsSupported { get; } - - IHardwareDeviceDriver GetRealDeviceDriver() - { - return this; - } - } -} \ No newline at end of file diff --git a/Ryujinx.Audio/Integration/IHardwareDeviceSession.cs b/Ryujinx.Audio/Integration/IHardwareDeviceSession.cs deleted file mode 100644 index 400daec0..00000000 --- a/Ryujinx.Audio/Integration/IHardwareDeviceSession.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Ryujinx.Audio.Common; -using System; - -namespace Ryujinx.Audio.Integration -{ - public interface IHardwareDeviceSession : IDisposable - { - bool RegisterBuffer(AudioBuffer buffer); - - void UnregisterBuffer(AudioBuffer buffer); - - void QueueBuffer(AudioBuffer buffer); - - bool WasBufferFullyConsumed(AudioBuffer buffer); - - void SetVolume(float volume); - - float GetVolume(); - - ulong GetPlayedSampleCount(); - - void Start(); - - void Stop(); - - void PrepareToClose(); - } -} \ No newline at end of file diff --git a/Ryujinx.Audio/Integration/IWritableEvent.cs b/Ryujinx.Audio/Integration/IWritableEvent.cs deleted file mode 100644 index 9a12e3d2..00000000 --- a/Ryujinx.Audio/Integration/IWritableEvent.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Audio.Integration -{ - /// - /// Represent a writable event with manual clear. - /// - public interface IWritableEvent - { - /// - /// Signal the event. - /// - void Signal(); - - /// - /// Clear the signaled state of the event. - /// - void Clear(); - } -} \ No newline at end of file -- cgit v1.2.3