Move solution and projects to src

2 files changed, 0 insertions, 661 deletions

diff --git a/Ryujinx.Audio/Output/AudioOutputManager.cs b/Ryujinx.Audio/Output/AudioOutputManager.cs
deleted file mode 100644
index 8c21f76a..00000000
--- a/Ryujinx.Audio/Output/AudioOutputManager.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-using Ryujinx.Audio.Common;
-using Ryujinx.Audio.Integration;
-using Ryujinx.Common.Logging;
-using Ryujinx.Memory;
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-
-namespace Ryujinx.Audio.Output
-{
-    /// <summary>
-    /// The audio output manager.
-    /// </summary>
-    public class AudioOutputManager : IDisposable
-    {
-        private object _lock = new object();
-
-        /// <summary>
-        /// Lock used for session allocation.
-        /// </summary>
-        private object _sessionLock = new object();
-
-        /// <summary>
-        /// The session ids allocation table.
-        /// </summary>
-        private int[] _sessionIds;
-
-        /// <summary>
-        /// The device driver.
-        /// </summary>
-        private IHardwareDeviceDriver _deviceDriver;
-
-        /// <summary>
-        /// The events linked to each session.
-        /// </summary>
-        private IWritableEvent[] _sessionsBufferEvents;
-
-        /// <summary>
-        /// The <see cref="AudioOutputSystem"/> session instances.
-        /// </summary>
-        private AudioOutputSystem[] _sessions;
-
-        /// <summary>
-        /// The count of active sessions.
-        /// </summary>
-        private int _activeSessionCount;
-
-        /// <summary>
-        /// The dispose state.
-        /// </summary>
-        private int _disposeState;
-
-        /// <summary>
-        /// Create a new <see cref="AudioOutputManager"/>.
-        /// </summary>
-        public AudioOutputManager()
-        {
-            _sessionIds = new int[Constants.AudioOutSessionCountMax];
-            _sessions = new AudioOutputSystem[Constants.AudioOutSessionCountMax];
-            _activeSessionCount = 0;
-
-            for (int i = 0; i < _sessionIds.Length; i++)
-            {
-                _sessionIds[i] = i;
-            }
-        }
-
-        /// <summary>
-        /// Initialize the <see cref="AudioOutputManager"/>.
-        /// </summary>
-        /// <param name="deviceDriver">The device driver.</param>
-        /// <param name="sessionRegisterEvents">The events associated to each session.</param>
-        public void Initialize(IHardwareDeviceDriver deviceDriver, IWritableEvent[] sessionRegisterEvents)
-        {
-            _deviceDriver = deviceDriver;
-            _sessionsBufferEvents = sessionRegisterEvents;
-        }
-
-        /// <summary>
-        /// Acquire a new session id.
-        /// </summary>
-        /// <returns>A new session id.</returns>
-        private int AcquireSessionId()
-        {
-            lock (_sessionLock)
-            {
-                int index = _activeSessionCount;
-
-                Debug.Assert(index < _sessionIds.Length);
-
-                int sessionId = _sessionIds[index];
-
-                _sessionIds[index] = -1;
-
-                _activeSessionCount++;
-
-                Logger.Info?.Print(LogClass.AudioRenderer, $"Registered new output ({sessionId})");
-
-                return sessionId;
-            }
-        }
-
-        /// <summary>
-        /// Release a given <paramref name="sessionId"/>.
-        /// </summary>
-        /// <param name="sessionId">The session id to release.</param>
-        private void ReleaseSessionId(int sessionId)
-        {
-            lock (_sessionLock)
-            {
-                Debug.Assert(_activeSessionCount > 0);
-
-                int newIndex = --_activeSessionCount;
-
-                _sessionIds[newIndex] = sessionId;
-            }
-
-            Logger.Info?.Print(LogClass.AudioRenderer, $"Unregistered output ({sessionId})");
-        }
-
-        /// <summary>
-        /// Used to update audio output system.
-        /// </summary>
-        public void Update()
-        {
-            lock (_sessionLock)
-            {
-                foreach (AudioOutputSystem output in _sessions)
-                {
-                    output?.Update();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Register a new <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        /// <param name="output">The <see cref="AudioOutputSystem"/> to register.</param>
-        private void Register(AudioOutputSystem output)
-        {
-            lock (_sessionLock)
-            {
-                _sessions[output.GetSessionId()] = output;
-            }
-        }
-
-        /// <summary>
-        /// Unregister a new <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        /// <param name="output">The <see cref="AudioOutputSystem"/> to unregister.</param>
-        internal void Unregister(AudioOutputSystem output)
-        {
-            lock (_sessionLock)
-            {
-                int sessionId = output.GetSessionId();
-
-                _sessions[output.GetSessionId()] = null;
-
-                ReleaseSessionId(sessionId);
-            }
-        }
-
-        /// <summary>
-        /// Get the list of all audio outputs name.
-        /// </summary>
-        /// <returns>The list of all audio outputs name</returns>
-        public string[] ListAudioOuts()
-        {
-            return new string[] { Constants.DefaultDeviceOutputName };
-        }
-
-        /// <summary>
-        /// Open a new <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        /// <param name="outputDeviceName">The output device name selected by the <see cref="AudioOutputSystem"/></param>
-        /// <param name="outputConfiguration">The output audio configuration selected by the <see cref="AudioOutputSystem"/></param>
-        /// <param name="obj">The new <see cref="AudioOutputSystem"/></param>
-        /// <param name="memoryManager">The memory manager that will be used for all guest memory operations</param>
-        /// <param name="inputDeviceName">The input device name wanted by the user</param>
-        /// <param name="sampleFormat">The sample format to use</param>
-        /// <param name="parameter">The user configuration</param>
-        /// <param name="appletResourceUserId">The applet resource user id of the application</param>
-        /// <param name="processHandle">The process handle of the application</param>
-        /// <returns>A <see cref="ResultCode"/> reporting an error or a success</returns>
-        public ResultCode OpenAudioOut(out string outputDeviceName,
-                                       out AudioOutputConfiguration outputConfiguration,
-                                       out AudioOutputSystem obj,
-                                       IVirtualMemoryManager memoryManager,
-                                       string inputDeviceName,
-                                       SampleFormat sampleFormat,
-                                       ref AudioInputConfiguration parameter,
-                                       ulong appletResourceUserId,
-                                       uint processHandle,
-                                       float volume)
-        {
-            int sessionId = AcquireSessionId();
-
-            _sessionsBufferEvents[sessionId].Clear();
-
-            IHardwareDeviceSession deviceSession = _deviceDriver.OpenDeviceSession(IHardwareDeviceDriver.Direction.Output, memoryManager, sampleFormat, parameter.SampleRate, parameter.ChannelCount, volume);
-
-            AudioOutputSystem audioOut = new AudioOutputSystem(this, _lock, deviceSession, _sessionsBufferEvents[sessionId]);
-
-            ResultCode result = audioOut.Initialize(inputDeviceName, sampleFormat, ref parameter, sessionId);
-
-            if (result == ResultCode.Success)
-            {
-                outputDeviceName = audioOut.DeviceName;
-                outputConfiguration = new AudioOutputConfiguration
-                {
-                    ChannelCount = audioOut.ChannelCount,
-                    SampleFormat = audioOut.SampleFormat,
-                    SampleRate = audioOut.SampleRate,
-                    AudioOutState = audioOut.GetState(),
-                };
-
-                obj = audioOut;
-
-                Register(audioOut);
-            }
-            else
-            {
-                ReleaseSessionId(sessionId);
-
-                obj = null;
-                outputDeviceName = null;
-                outputConfiguration = default;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Sets the volume for all output devices.
-        /// </summary>
-        /// <param name="volume">The volume to set.</param>
-        public void SetVolume(float volume)
-        {
-            if (_sessions != null)
-            {
-                foreach (AudioOutputSystem session in _sessions)
-                {
-                    session?.SetVolume(volume);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the volume for all output devices.
-        /// </summary>
-        /// <returns>A float indicating the volume level.</returns>
-        public float GetVolume()
-        {
-            if (_sessions != null)
-            {
-                foreach (AudioOutputSystem session in _sessions)
-                {
-                    if (session != null)
-                    {
-                        return session.GetVolume();
-                    }
-                }
-            }
-
-            return 0.0f;
-        }
-
-        public void Dispose()
-        {
-            if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
-            {
-                Dispose(true);
-            }
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                // Clone the sessions array to dispose them outside the lock.
-                AudioOutputSystem[] sessions;
-
-                lock (_sessionLock)
-                {
-                    sessions = _sessions.ToArray();
-                }
-
-                foreach (AudioOutputSystem output in sessions)
-                {
-                    output?.Dispose();
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Audio/Output/AudioOutputSystem.cs b/Ryujinx.Audio/Output/AudioOutputSystem.cs
deleted file mode 100644
index 93df87aa..00000000
--- a/Ryujinx.Audio/Output/AudioOutputSystem.cs
+++ /dev/null
@@ -1,365 +0,0 @@
-using Ryujinx.Audio.Common;
-using Ryujinx.Audio.Integration;
-using System;
-using System.Threading;
-
-namespace Ryujinx.Audio.Output
-{
-    /// <summary>
-    /// Audio output system.
-    /// </summary>
-    public class AudioOutputSystem : IDisposable
-    {
-        /// <summary>
-        /// The session id associated to the <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        private int _sessionId;
-
-        /// <summary>
-        /// The session the <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        private AudioDeviceSession _session;
-
-        /// <summary>
-        /// The target device name of the <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        public string DeviceName { get; private set; }
-
-        /// <summary>
-        /// The target sample rate of the <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        public uint SampleRate { get; private set; }
-
-        /// <summary>
-        /// The target channel count of the <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        public uint ChannelCount { get; private set; }
-
-        /// <summary>
-        /// The target sample format of the <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        public SampleFormat SampleFormat { get; private set; }
-
-        /// <summary>
-        /// The <see cref="AudioOutputManager"/> owning this.
-        /// </summary>
-        private AudioOutputManager _manager;
-
-        /// <summary>
-        /// THe lock of the parent.
-        /// </summary>
-        private object _parentLock;
-
-        /// <summary>
-        /// The dispose state.
-        /// </summary>
-        private int _disposeState;
-
-        /// <summary>
-        /// Create a new <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        /// <param name="manager">The manager instance</param>
-        /// <param name="parentLock">The lock of the manager</param>
-        /// <param name="deviceSession">The hardware device session</param>
-        /// <param name="bufferEvent">The buffer release event of the audio output</param>
-        public AudioOutputSystem(AudioOutputManager manager, object parentLock, IHardwareDeviceSession deviceSession, IWritableEvent bufferEvent)
-        {
-            _manager = manager;
-            _parentLock = parentLock;
-            _session = new AudioDeviceSession(deviceSession, bufferEvent);
-        }
-
-        /// <summary>
-        /// Get the default device name on the system.
-        /// </summary>
-        /// <returns>The default device name on the system.</returns>
-        private static string GetDeviceDefaultName()
-        {
-            return Constants.DefaultDeviceOutputName;
-        }
-
-        /// <summary>
-        /// Check if a given configuration and device name is valid on the system.
-        /// </summary>
-        /// <param name="configuration">The configuration to check.</param>
-        /// <param name="deviceName">The device name to check.</param>
-        /// <returns>A <see cref="ResultCode"/> reporting an error or a success.</returns>
-        private static ResultCode IsConfigurationValid(ref AudioInputConfiguration configuration, string deviceName)
-        {
-            if (deviceName.Length != 0 && !deviceName.Equals(GetDeviceDefaultName()))
-            {
-                return ResultCode.DeviceNotFound;
-            }
-            else if (configuration.SampleRate != 0 && configuration.SampleRate != Constants.TargetSampleRate)
-            {
-                return ResultCode.UnsupportedSampleRate;
-            }
-            else if (configuration.ChannelCount != 0 && configuration.ChannelCount != 1 && configuration.ChannelCount != 2 && configuration.ChannelCount != 6)
-            {
-                return ResultCode.UnsupportedChannelConfiguration;
-            }
-
-            return ResultCode.Success;
-        }
-
-        /// <summary>
-        /// Get the released buffer event.
-        /// </summary>
-        /// <returns>The released buffer event</returns>
-        public IWritableEvent RegisterBufferEvent()
-        {
-            lock (_parentLock)
-            {
-                return _session.GetBufferEvent();
-            }
-        }
-
-        /// <summary>
-        /// Update the <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        public void Update()
-        {
-            lock (_parentLock)
-            {
-                _session.Update();
-            }
-        }
-
-        /// <summary>
-        /// Get the id of this session.
-        /// </summary>
-        /// <returns>The id of this session</returns>
-        public int GetSessionId()
-        {
-            return _sessionId;
-        }
-
-        /// <summary>
-        /// Initialize the <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        /// <param name="inputDeviceName">The input device name wanted by the user</param>
-        /// <param name="sampleFormat">The sample format to use</param>
-        /// <param name="parameter">The user configuration</param>
-        /// <param name="sessionId">The session id associated to this <see cref="AudioOutputSystem"/></param>
-        /// <returns>A <see cref="ResultCode"/> reporting an error or a success.</returns>
-        public ResultCode Initialize(string inputDeviceName, SampleFormat sampleFormat, ref AudioInputConfiguration parameter, int sessionId)
-        {
-            _sessionId = sessionId;
-
-            ResultCode result = IsConfigurationValid(ref parameter, inputDeviceName);
-
-            if (result == ResultCode.Success)
-            {
-                if (inputDeviceName.Length == 0)
-                {
-                    DeviceName = GetDeviceDefaultName();
-                }
-                else
-                {
-                    DeviceName = inputDeviceName;
-                }
-
-                if (parameter.ChannelCount == 6)
-                {
-                    ChannelCount = 6;
-                }
-                else
-                {
-                    ChannelCount = 2;
-                }
-
-                SampleFormat = sampleFormat;
-                SampleRate = Constants.TargetSampleRate;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Append a new audio buffer to the audio output.
-        /// </summary>
-        /// <param name="bufferTag">The unique tag of this buffer.</param>
-        /// <param name="userBuffer">The buffer informations.</param>
-        /// <returns>A <see cref="ResultCode"/> reporting an error or a success.</returns>
-        public ResultCode AppendBuffer(ulong bufferTag, ref AudioUserBuffer userBuffer)
-        {
-            lock (_parentLock)
-            {
-                AudioBuffer buffer = new AudioBuffer
-                {
-                    BufferTag = bufferTag,
-                    DataPointer = userBuffer.Data,
-                    DataSize = userBuffer.DataSize
-                };
-
-                if (_session.AppendBuffer(buffer))
-                {
-                    return ResultCode.Success;
-                }
-
-                return ResultCode.BufferRingFull;
-            }
-        }
-
-        /// <summary>
-        /// Get the release buffers.
-        /// </summary>
-        /// <param name="releasedBuffers">The buffer to write the release buffers</param>
-        /// <param name="releasedCount">The count of released buffers</param>
-        /// <returns>A <see cref="ResultCode"/> reporting an error or a success.</returns>
-        public ResultCode GetReleasedBuffer(Span<ulong> releasedBuffers, out uint releasedCount)
-        {
-            releasedCount = 0;
-
-            // Ensure that the first entry is set to zero if no entries are returned.
-            if (releasedBuffers.Length > 0)
-            {
-                releasedBuffers[0] = 0;
-            }
-
-            lock (_parentLock)
-            {
-                for (int i = 0; i < releasedBuffers.Length; i++)
-                {
-                    if (!_session.TryPopReleasedBuffer(out AudioBuffer buffer))
-                    {
-                        break;
-                    }
-
-                    releasedBuffers[i] = buffer.BufferTag;
-                    releasedCount++;
-                }
-            }
-
-            return ResultCode.Success;
-        }
-
-        /// <summary>
-        /// Get the current state of the <see cref="AudioOutputSystem"/>.
-        /// </summary>
-        /// <returns>Return the curent sta\te of the <see cref="AudioOutputSystem"/></returns>
-        /// <returns></returns>
-        public AudioDeviceState GetState()
-        {
-            lock (_parentLock)
-            {
-                return _session.GetState();
-            }
-        }
-
-        /// <summary>
-        /// Start the audio session.
-        /// </summary>
-        /// <returns>A <see cref="ResultCode"/> reporting an error or a success</returns>
-        public ResultCode Start()
-        {
-            lock (_parentLock)
-            {
-                return _session.Start();
-            }
-        }
-
-        /// <summary>
-        /// Stop the audio session.
-        /// </summary>
-        /// <returns>A <see cref="ResultCode"/> reporting an error or a success</returns>
-        public ResultCode Stop()
-        {
-            lock (_parentLock)
-            {
-                return _session.Stop();
-            }
-        }
-
-        /// <summary>
-        /// Get the volume of the session.
-        /// </summary>
-        /// <returns>The volume of the session</returns>
-        public float GetVolume()
-        {
-            lock (_parentLock)
-            {
-                return _session.GetVolume();
-            }
-        }
-
-        /// <summary>
-        /// Set the volume of the session.
-        /// </summary>
-        /// <param name="volume">The new volume to set</param>
-        public void SetVolume(float volume)
-        {
-            lock (_parentLock)
-            {
-                _session.SetVolume(volume);
-            }
-        }
-
-        /// <summary>
-        /// Get the count of buffer currently in use (server + driver side).
-        /// </summary>
-        /// <returns>The count of buffer currently in use</returns>
-        public uint GetBufferCount()
-        {
-            lock (_parentLock)
-            {
-                return _session.GetBufferCount();
-            }
-        }
-
-        /// <summary>
-        /// Check if a buffer is present.
-        /// </summary>
-        /// <param name="bufferTag">The unique tag of the buffer</param>
-        /// <returns>Return true if a buffer is present</returns>
-        public bool ContainsBuffer(ulong bufferTag)
-        {
-            lock (_parentLock)
-            {
-                return _session.ContainsBuffer(bufferTag);
-            }
-        }
-
-        /// <summary>
-        /// Get the count of sample played in this session.
-        /// </summary>
-        /// <returns>The count of sample played in this session</returns>
-        public ulong GetPlayedSampleCount()
-        {
-            lock (_parentLock)
-            {
-                return _session.GetPlayedSampleCount();
-            }
-        }
-
-        /// <summary>
-        /// Flush all buffers to the initial state.
-        /// </summary>
-        /// <returns>True if any buffers was flushed</returns>
-        public bool FlushBuffers()
-        {
-            lock (_parentLock)
-            {
-                return _session.FlushBuffers();
-            }
-        }
-
-        public void Dispose()
-        {
-            if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
-            {
-                Dispose(true);
-            }
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                _session.Dispose();
-
-                _manager.Unregister(this);
-            }
-        }
-    }
-}
\ No newline at end of file