cleanup

Directory.Packages.props

@@ -44,7 +44,7 @@
     <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.126" />
     <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.44" />
     <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="1.0.44" />
-    <PackageVersion Include="Gommon" Version="2.8.0.1" />
+    <PackageVersion Include="Gommon" Version="2.8.0.4" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="Sep" Version="0.11.1" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
@@ -59,4 +59,4 @@
     <PackageVersion Include="System.Management" Version="9.0.2" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
   </ItemGroup>
-</Project>
+</Project>

Ryujinx.sln

@@ -47,8 +47,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Vic", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Video", "src\Ryujinx.Graphics.Video\Ryujinx.Graphics.Video.csproj", "{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.Apple", "src\Ryujinx.Audio.Backends.Apple\Ryujinx.Audio.Backends.Apple.csproj", "{AC26EFF0-8593-4184-9A09-98E37EFFB32E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.SDL3", "src\Ryujinx.Audio.Backends.SDL3\Ryujinx.Audio.Backends.SDL3.csproj", "{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.OpenAL", "src\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj", "{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}"
@@ -571,8 +569,6 @@ Global
 		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x64.Build.0 = Release|Any CPU
 		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x86.ActiveCfg = Release|Any CPU
 		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x86.Build.0 = Release|Any CPU
-		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

assets/Locales/RenderDoc.json

@@ -7,12 +7,12 @@
         "de_DE": "",
         "el_GR": "",
         "en_US": "Start RenderDoc Frame Capture",
-        "es_ES": "Iniciar una captura de fotograma de RenderDoc",
-        "fr_FR": "Démarrer une capture de trame RenderDoc",
+        "es_ES": "",
+        "fr_FR": "",
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "RenderDoc 프레임 캡처 시작",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -32,12 +32,12 @@
         "de_DE": "",
         "el_GR": "",
         "en_US": "End RenderDoc Frame Capture",
-        "es_ES": "Detener la captura de fotograma de RenderDoc",
-        "fr_FR": "Arrêter la capture de trame RenderDoc",
+        "es_ES": "",
+        "fr_FR": "",
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "RenderDoc 프레임 캡처 종료",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -57,12 +57,12 @@
         "de_DE": "",
         "el_GR": "",
         "en_US": "Discard RenderDoc Frame Capture",
-        "es_ES": "Descartar la captura de fotograma de RenderDoc",
-        "fr_FR": "Supprimer la capture de trame RenderDoc",
+        "es_ES": "",
+        "fr_FR": "",
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "RenderDoc 프레임 캡처 폐기",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -82,12 +82,12 @@
         "de_DE": "",
         "el_GR": "",
         "en_US": "Ends the currently active RenderDoc Frame Capture, immediately discarding its result.",
-        "es_ES": "Finaliza la captura de fotograma de RenderDoc actualmente activa y descarta inmediatamente su resultado.",
-        "fr_FR": "Met fin à la capture de trame RenderDoc en cours, en supprimant immédiatement son résultat.",
+        "es_ES": "",
+        "fr_FR": "",
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "현재 활성화된 RenderDoc 프레임 캡처를 종료하고 결과를 즉시 폐기합니다.",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",

assets/Locales/Root.json

@@ -4850,31 +4850,6 @@
         "zh_TW": null
       }
     },
-    {
-      "ID": "SettingsTabSystemAudioBackendAudioToolbox",
-      "Translations": {
-        "ar_SA": null,
-        "de_DE": null,
-        "el_GR": null,
-        "en_US": "Apple Audio (macOS only)",
-        "es_ES": null,
-        "fr_FR": null,
-        "he_IL": null,
-        "it_IT": null,
-        "ja_JP": null,
-        "ko_KR": null,
-        "no_NO": null,
-        "pl_PL": null,
-        "pt_BR": null,
-        "ru_RU": null,
-        "sv_SE": null,
-        "th_TH": null,
-        "tr_TR": null,
-        "uk_UA": null,
-        "zh_CN": null,
-        "zh_TW": null
-      }
-    },
     {
       "ID": "SettingsTabSystemHacks",
       "Translations": {
@@ -24801,4 +24776,4 @@
       }
     }
   ]
-}
+}

src/ARMeilleure/Common/EntryTable.cs

@@ -168,7 +168,7 @@ namespace ARMeilleure.Common
             {
                 _allocated.Dispose();
 
-                foreach (nint page in _pages.Values)
+                foreach (IntPtr page in _pages.Values)
                 {
                     NativeAllocator.Instance.Free((void*)page);
                 }

src/Ryujinx.Audio.Backends.Apple/AppleAudioBuffer.cs

@@ -1,16 +0,0 @@
-namespace Ryujinx.Audio.Backends.Apple
-{
-    class AppleAudioBuffer
-    {
-        public readonly ulong DriverIdentifier;
-        public readonly ulong SampleCount;
-        public ulong SamplePlayed;
-
-        public AppleAudioBuffer(ulong driverIdentifier, ulong sampleCount)
-        {
-            DriverIdentifier = driverIdentifier;
-            SampleCount = sampleCount;
-            SamplePlayed = 0;
-        }
-    }
-}

src/Ryujinx.Audio.Backends.Apple/AppleHardwareDeviceDriver.cs

@@ -1,196 +0,0 @@
-using Ryujinx.Audio.Common;
-using Ryujinx.Audio.Integration;
-using Ryujinx.Common.Logging;
-using Ryujinx.Memory;
-using System;
-using System.Collections.Concurrent;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Runtime.Versioning;
-using Ryujinx.Audio.Backends.Apple.Native;
-using static Ryujinx.Audio.Backends.Apple.Native.AudioToolbox;
-using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
-
-namespace Ryujinx.Audio.Backends.Apple
-{
-    [SupportedOSPlatform("macos")]
-    [SupportedOSPlatform("ios")]
-    public sealed class AppleHardwareDeviceDriver : IHardwareDeviceDriver
-    {
-        private readonly ManualResetEvent _updateRequiredEvent;
-        private readonly ManualResetEvent _pauseEvent;
-        private readonly ConcurrentDictionary<AppleHardwareDeviceSession, byte> _sessions;
-        private readonly bool _supportSurroundConfiguration;
-
-        public float Volume { get; set; }
-
-        public AppleHardwareDeviceDriver()
-        {
-            _updateRequiredEvent = new ManualResetEvent(false);
-            _pauseEvent = new ManualResetEvent(true);
-            _sessions = new ConcurrentDictionary<AppleHardwareDeviceSession, byte>();
-
-            _supportSurroundConfiguration = TestSurroundSupport();
-
-            Volume = 1f;
-        }
-
-        private bool TestSurroundSupport()
-        {
-            try
-            {
-                AudioStreamBasicDescription format =
-                    GetAudioFormat(SampleFormat.PcmFloat, Constants.TargetSampleRate, 6);
-
-                int result = AudioQueueNewOutput(
-                    ref format,
-                    nint.Zero,
-                    nint.Zero,
-                    nint.Zero,
-                    nint.Zero,
-                    0,
-                    out nint testQueue);
-
-                if (result == 0)
-                {
-                    AudioChannelLayout layout = new AudioChannelLayout
-                    {
-                        AudioChannelLayoutTag = kAudioChannelLayoutTag_MPEG_5_1_A,
-                        AudioChannelBitmap = 0,
-                        NumberChannelDescriptions = 0
-                    };
-
-                    int layoutResult = AudioQueueSetProperty(
-                        testQueue,
-                        kAudioQueueProperty_ChannelLayout,
-                        ref layout,
-                        (uint)Marshal.SizeOf<AudioChannelLayout>());
-
-                    if (layoutResult == 0)
-                    {
-                        AudioQueueDispose(testQueue, true);
-                        return true;
-                    }
-
-                    AudioQueueDispose(testQueue, true);
-                }
-
-                return false;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        public static bool IsSupported => OperatingSystem.IsMacOSVersionAtLeast(10, 5);
-
-        public ManualResetEvent GetUpdateRequiredEvent()
-            => _updateRequiredEvent;
-
-        public ManualResetEvent GetPauseEvent()
-            => _pauseEvent;
-
-        public IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager,
-            SampleFormat sampleFormat, uint sampleRate, uint channelCount)
-        {
-            if (channelCount == 0)
-            {
-                channelCount = 2;
-            }
-
-            if (sampleRate == 0)
-            {
-                sampleRate = Constants.TargetSampleRate;
-            }
-
-            if (direction != Direction.Output)
-            {
-                throw new NotImplementedException("Input direction is currently not implemented on Apple backend!");
-            }
-
-            AppleHardwareDeviceSession session = new(this, memoryManager, sampleFormat, sampleRate, channelCount);
-
-            _sessions.TryAdd(session, 0);
-
-            return session;
-        }
-
-        internal bool Unregister(AppleHardwareDeviceSession session)
-            => _sessions.TryRemove(session, out _);
-
-        internal static AudioStreamBasicDescription GetAudioFormat(SampleFormat sampleFormat, uint sampleRate,
-            uint channelCount)
-        {
-            uint formatFlags;
-            uint bitsPerChannel;
-
-            switch (sampleFormat)
-            {
-                case SampleFormat.PcmInt8:
-                    formatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
-                    bitsPerChannel = 8;
-                    break;
-                case SampleFormat.PcmInt16:
-                    formatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
-                    bitsPerChannel = 16;
-                    break;
-                case SampleFormat.PcmInt32:
-                    formatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
-                    bitsPerChannel = 32;
-                    break;
-                case SampleFormat.PcmFloat:
-                    formatFlags = kAudioFormatFlagIsFloat | kAudioFormatFlagIsPacked;
-                    bitsPerChannel = 32;
-                    break;
-                default:
-                    throw new ArgumentException($"Unsupported sample format {sampleFormat}");
-            }
-
-            uint bytesPerFrame = (bitsPerChannel / 8) * channelCount;
-
-            return new AudioStreamBasicDescription
-            {
-                SampleRate = sampleRate,
-                FormatID = kAudioFormatLinearPCM,
-                FormatFlags = formatFlags,
-                BytesPerPacket = bytesPerFrame,
-                FramesPerPacket = 1,
-                BytesPerFrame = bytesPerFrame,
-                ChannelsPerFrame = channelCount,
-                BitsPerChannel = bitsPerChannel,
-                Reserved = 0
-            };
-        }
-
-        public void Dispose()
-        {
-            GC.SuppressFinalize(this);
-            Dispose(true);
-        }
-
-        private void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                foreach (AppleHardwareDeviceSession session in _sessions.Keys)
-                {
-                    session.Dispose();
-                }
-
-                _pauseEvent.Dispose();
-            }
-        }
-
-        public bool SupportsDirection(Direction direction)
-            => direction != Direction.Input;
-
-        public bool SupportsSampleRate(uint sampleRate) => true;
-
-        public bool SupportsSampleFormat(SampleFormat sampleFormat)
-            => sampleFormat != SampleFormat.PcmInt24;
-
-        public bool SupportsChannelCount(uint channelCount)
-            => channelCount != 6 || _supportSurroundConfiguration;
-    }
-}

src/Ryujinx.Audio.Backends.Apple/AppleHardwareDeviceSession.cs

@@ -1,285 +0,0 @@
-using Ryujinx.Audio.Backends.Common;
-using Ryujinx.Audio.Common;
-using Ryujinx.Memory;
-using System;
-using System.Collections.Concurrent;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Runtime.Versioning;
-using static Ryujinx.Audio.Backends.Apple.Native.AudioToolbox;
-
-namespace Ryujinx.Audio.Backends.Apple
-{
-    [SupportedOSPlatform("macos")]
-    [SupportedOSPlatform("ios")]
-    class AppleHardwareDeviceSession : HardwareDeviceSessionOutputBase
-    {
-        private const int NumBuffers = 3;
-
-        private readonly AppleHardwareDeviceDriver _driver;
-        private readonly ConcurrentQueue<AppleAudioBuffer> _queuedBuffers = new();
-        private readonly DynamicRingBuffer _ringBuffer = new();
-        private readonly ManualResetEvent _updateRequiredEvent;
-
-        private readonly AudioQueueOutputCallback _callbackDelegate;
-        private readonly GCHandle _gcHandle;
-
-        private nint _audioQueue;
-        private readonly nint[] _audioQueueBuffers = new nint[NumBuffers];
-        private readonly int[] _bufferBytesFilled = new int[NumBuffers];
-
-        private readonly int _bytesPerFrame;
-
-        private ulong _playedSampleCount;
-        private bool _started;
-        private float _volume = 1f;
-
-        private readonly object _lock = new();
-
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        private delegate void AudioQueueOutputCallback(
-            nint userData,
-            nint audioQueue,
-            nint buffer);
-
-        public AppleHardwareDeviceSession(
-            AppleHardwareDeviceDriver driver,
-            IVirtualMemoryManager memoryManager,
-            SampleFormat requestedSampleFormat,
-            uint requestedSampleRate,
-            uint requestedChannelCount)
-            : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount)
-        {
-            _driver = driver;
-            _updateRequiredEvent = driver.GetUpdateRequiredEvent();
-            _callbackDelegate = OutputCallback;
-            _bytesPerFrame = BackendHelper.GetSampleSize(requestedSampleFormat) * (int)requestedChannelCount;
-
-            _gcHandle = GCHandle.Alloc(this, GCHandleType.Normal);
-
-            SetupAudioQueue();
-        }
-
-        private void SetupAudioQueue()
-        {
-            lock (_lock)
-            {
-                AudioStreamBasicDescription format = AppleHardwareDeviceDriver.GetAudioFormat(
-                    RequestedSampleFormat,
-                    RequestedSampleRate,
-                    RequestedChannelCount);
-
-                nint callbackPtr = Marshal.GetFunctionPointerForDelegate(_callbackDelegate);
-                nint userData = GCHandle.ToIntPtr(_gcHandle);
-
-                int result = AudioQueueNewOutput(
-                    ref format,
-                    callbackPtr,
-                    userData,
-                    nint.Zero,
-                    nint.Zero,
-                    0,
-                    out _audioQueue);
-
-                if (result != 0)
-                {
-                    throw new InvalidOperationException($"AudioQueueNewOutput failed: {result}");
-                }
-
-                uint framesPerBuffer = RequestedSampleRate / 100;
-                uint bufferSize = framesPerBuffer * (uint)_bytesPerFrame;
-
-                for (int i = 0; i < NumBuffers; i++)
-                {
-                    AudioQueueAllocateBuffer(_audioQueue, bufferSize, out _audioQueueBuffers[i]);
-                    _bufferBytesFilled[i] = 0;
-
-                    PrimeBuffer(_audioQueueBuffers[i], i);
-                }
-            }
-        }
-
-        private unsafe void PrimeBuffer(nint bufferPtr, int bufferIndex)
-        {
-            AudioQueueBuffer* buffer = (AudioQueueBuffer*)bufferPtr;
-
-            int capacityBytes = (int)buffer->AudioDataBytesCapacity;
-            int framesPerBuffer = capacityBytes / _bytesPerFrame;
-
-            int availableFrames = _ringBuffer.Length / _bytesPerFrame;
-            int framesToRead = Math.Min(availableFrames, framesPerBuffer);
-            int bytesToRead = framesToRead * _bytesPerFrame;
-
-            Span<byte> dst = new((void*)buffer->AudioData, capacityBytes);
-            dst.Clear();
-
-            if (bytesToRead > 0)
-            {
-                Span<byte> audio = dst.Slice(0, bytesToRead);
-                _ringBuffer.Read(audio, 0, bytesToRead);
-                ApplyVolume(buffer->AudioData, bytesToRead);
-            }
-
-            buffer->AudioDataByteSize = (uint)capacityBytes;
-            _bufferBytesFilled[bufferIndex] = bytesToRead;
-
-            AudioQueueEnqueueBuffer(_audioQueue, bufferPtr, 0, nint.Zero);
-        }
-
-        private void OutputCallback(nint userData, nint audioQueue, nint bufferPtr)
-        {
-            if (!_started || bufferPtr == nint.Zero)
-                return;
-
-            int bufferIndex = Array.IndexOf(_audioQueueBuffers, bufferPtr);
-            if (bufferIndex < 0)
-                return;
-
-            int bytesPlayed = _bufferBytesFilled[bufferIndex];
-            if (bytesPlayed > 0)
-            {
-                ProcessPlayedSamples(bytesPlayed);
-            }
-
-            PrimeBuffer(bufferPtr, bufferIndex);
-        }
-
-        private void ProcessPlayedSamples(int bytesPlayed)
-        {
-            ulong samplesPlayed = GetSampleCount(bytesPlayed);
-            ulong remaining = samplesPlayed;
-            bool needUpdate = false;
-
-            while (remaining > 0 && _queuedBuffers.TryPeek(out AppleAudioBuffer buffer))
-            {
-                ulong needed = buffer.SampleCount - Interlocked.Read(ref buffer.SamplePlayed);
-                ulong take = Math.Min(needed, remaining);
-
-                ulong played = Interlocked.Add(ref buffer.SamplePlayed, take);
-                remaining -= take;
-
-                if (played == buffer.SampleCount)
-                {
-                    _queuedBuffers.TryDequeue(out _);
-                    needUpdate = true;
-                }
-
-                Interlocked.Add(ref _playedSampleCount, take);
-            }
-
-            if (needUpdate)
-            {
-                _updateRequiredEvent.Set();
-            }
-        }
-
-        private unsafe void ApplyVolume(nint dataPtr, int byteSize)
-        {
-            float volume = Math.Clamp(_volume * _driver.Volume, 0f, 1f);
-            if (volume >= 0.999f)
-                return;
-
-            int sampleCount = byteSize / BackendHelper.GetSampleSize(RequestedSampleFormat);
-
-            switch (RequestedSampleFormat)
-            {
-                case SampleFormat.PcmInt16:
-                    short* s16 = (short*)dataPtr;
-                    for (int i = 0; i < sampleCount; i++)
-                        s16[i] = (short)(s16[i] * volume);
-                    break;
-
-                case SampleFormat.PcmFloat:
-                    float* f32 = (float*)dataPtr;
-                    for (int i = 0; i < sampleCount; i++)
-                        f32[i] *= volume;
-                    break;
-
-                case SampleFormat.PcmInt32:
-                    int* s32 = (int*)dataPtr;
-                    for (int i = 0; i < sampleCount; i++)
-                        s32[i] = (int)(s32[i] * volume);
-                    break;
-
-                case SampleFormat.PcmInt8:
-                    sbyte* s8 = (sbyte*)dataPtr;
-                    for (int i = 0; i < sampleCount; i++)
-                        s8[i] = (sbyte)(s8[i] * volume);
-                    break;
-            }
-        }
-
-        public override void QueueBuffer(AudioBuffer buffer)
-        {
-            _ringBuffer.Write(buffer.Data, 0, buffer.Data.Length);
-            _queuedBuffers.Enqueue(new AppleAudioBuffer(buffer.DataPointer, GetSampleCount(buffer)));
-        }
-
-        public override void Start()
-        {
-            lock (_lock)
-            {
-                if (_started)
-                    return;
-
-                _started = true;
-                AudioQueueStart(_audioQueue, nint.Zero);
-            }
-        }
-
-        public override void Stop()
-        {
-            lock (_lock)
-            {
-                if (!_started)
-                    return;
-
-                _started = false;
-                AudioQueuePause(_audioQueue);
-            }
-        }
-
-        public override ulong GetPlayedSampleCount()
-            => Interlocked.Read(ref _playedSampleCount);
-
-        public override float GetVolume() => _volume;
-        public override void SetVolume(float volume) => _volume = volume;
-
-        public override bool WasBufferFullyConsumed(AudioBuffer buffer)
-        {
-            if (!_queuedBuffers.TryPeek(out AppleAudioBuffer driverBuffer))
-                return true;
-
-            return driverBuffer.DriverIdentifier != buffer.DataPointer;
-        }
-
-        public override void PrepareToClose() { }
-        public override void UnregisterBuffer(AudioBuffer buffer) { }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                Stop();
-
-                if (_audioQueue != nint.Zero)
-                {
-                    AudioQueueStop(_audioQueue, true);
-                    AudioQueueDispose(_audioQueue, true);
-                    _audioQueue = nint.Zero;
-                }
-
-                if (_gcHandle.IsAllocated)
-                {
-                    _gcHandle.Free();
-                }
-            }
-        }
-
-        public override void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-    }
-}

src/Ryujinx.Audio.Backends.Apple/Native/AudioToolbox.cs

@@ -1,102 +0,0 @@
-using System.Runtime.InteropServices;
-// ReSharper disable InconsistentNaming
-
-namespace Ryujinx.Audio.Backends.Apple.Native
-{
-    public static partial class AudioToolbox
-    {
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct AudioStreamBasicDescription
-        {
-            public double SampleRate;
-            public uint FormatID;
-            public uint FormatFlags;
-            public uint BytesPerPacket;
-            public uint FramesPerPacket;
-            public uint BytesPerFrame;
-            public uint ChannelsPerFrame;
-            public uint BitsPerChannel;
-            public uint Reserved;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct AudioChannelLayout
-        {
-            public uint AudioChannelLayoutTag;
-            public uint AudioChannelBitmap;
-            public uint NumberChannelDescriptions;
-        }
-
-        internal const uint kAudioFormatLinearPCM = 0x6C70636D;
-        internal const uint kAudioQueueProperty_ChannelLayout = 0x6171636c;
-        internal const uint kAudioChannelLayoutTag_MPEG_5_1_A = 0x650006;
-        internal const uint kAudioFormatFlagIsFloat = (1 << 0);
-        internal const uint kAudioFormatFlagIsSignedInteger = (1 << 2);
-        internal const uint kAudioFormatFlagIsPacked = (1 << 3);
-        internal const uint kAudioFormatFlagIsBigEndian = (1 << 1);
-        internal const uint kAudioFormatFlagIsAlignedHigh = (1 << 4);
-        internal const uint kAudioFormatFlagIsNonInterleaved = (1 << 5);
-
-        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
-        internal static partial int AudioQueueNewOutput(
-            ref AudioStreamBasicDescription format,
-            nint callback,
-            nint userData,
-            nint callbackRunLoop,
-            nint callbackRunLoopMode,
-            uint flags,
-            out nint audioQueue);
-
-        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
-        internal static partial int AudioQueueSetProperty(
-            nint audioQueue,
-            uint propertyID,
-            ref AudioChannelLayout layout,
-            uint layoutSize);
-
-        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
-        internal static partial int AudioQueueDispose(nint audioQueue, [MarshalAs(UnmanagedType.I1)] bool immediate);
-
-        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
-        internal static partial int AudioQueueAllocateBuffer(
-            nint audioQueue,
-            uint bufferByteSize,
-            out nint buffer);
-
-        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
-        internal static partial int AudioQueueStart(nint audioQueue, nint startTime);
-
-        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
-        internal static partial int AudioQueuePause(nint audioQueue);
-
-        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
-        internal static partial int AudioQueueStop(nint audioQueue, [MarshalAs(UnmanagedType.I1)] bool immediate);
-
-        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
-        internal static partial int AudioQueueSetParameter(
-            nint audioQueue,
-            uint parameterID,
-            float value);
-
-        [LibraryImport("/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox")]
-        internal static partial int AudioQueueEnqueueBuffer(
-            nint audioQueue,
-            nint buffer,
-            uint numPacketDescs,
-            nint packetDescs);
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct AudioQueueBuffer
-        {
-            public uint AudioDataBytesCapacity;
-            public nint AudioData;
-            public uint AudioDataByteSize;
-            public nint UserData;
-            public uint PacketDescriptionCapacity;
-            public nint PacketDescriptions;
-            public uint PacketDescriptionCount;
-        }
-
-        internal const uint kAudioQueueParam_Volume = 1;
-    }
-}

src/Ryujinx.Audio.Backends.Apple/Ryujinx.Audio.Backends.Apple.csproj

@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Ryujinx.Audio\Ryujinx.Audio.csproj" />
-    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
-  </ItemGroup>
-
-</Project>

src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceDriver.cs

@@ -10,8 +10,7 @@ using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
 
 namespace Ryujinx.Audio.Backends.OpenAL
 {
-    // ReSharper disable once InconsistentNaming
-    public sealed class OpenALHardwareDeviceDriver : IHardwareDeviceDriver
+    public class OpenALHardwareDeviceDriver : IHardwareDeviceDriver
     {
         private readonly ALDevice _device;
         private readonly ALContext _context;
@@ -149,7 +148,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
             Dispose(true);
         }
 
-        private void Dispose(bool disposing)
+        protected virtual void Dispose(bool disposing)
         {
             if (disposing)
             {

src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceSession.cs

@@ -9,8 +9,7 @@ using System.Threading;
 
 namespace Ryujinx.Audio.Backends.OpenAL
 {
-    // ReSharper disable once InconsistentNaming
-    sealed class OpenALHardwareDeviceSession : HardwareDeviceSessionOutputBase
+    class OpenALHardwareDeviceSession : HardwareDeviceSessionOutputBase
     {
         private readonly OpenALHardwareDeviceDriver _driver;
         private readonly int _sourceId;
@@ -191,7 +190,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
             }
         }
 
-        private void Dispose(bool disposing)
+        protected virtual void Dispose(bool disposing)
         {
             if (disposing && _driver.Unregister(this))
             {

src/Ryujinx.Audio.Backends.SDL3/SDL3HardwareDeviceDriver.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Audio.Backends.SDL3
 
     using unsafe SDL_AudioStreamCallbackPointer = delegate* unmanaged[Cdecl]<nint, SDL_AudioStream*, int, int, void>;
 
-    public sealed class SDL3HardwareDeviceDriver : IHardwareDeviceDriver
+    public class SDL3HardwareDeviceDriver : IHardwareDeviceDriver
     {
         private readonly ManualResetEvent _updateRequiredEvent;
         private readonly ManualResetEvent _pauseEvent;
@@ -162,7 +162,7 @@ namespace Ryujinx.Audio.Backends.SDL3
             Dispose(true);
         }
 
-        private void Dispose(bool disposing)
+        protected virtual void Dispose(bool disposing)
         {
             if (disposing)
             {

src/Ryujinx.Audio.Backends.SDL3/SDL3HardwareDeviceSession.cs

@@ -12,7 +12,10 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.Audio.Backends.SDL3
 {
-    sealed unsafe class SDL3HardwareDeviceSession : HardwareDeviceSessionOutputBase
+
+
+
+    unsafe class SDL3HardwareDeviceSession : HardwareDeviceSessionOutputBase
     {
         private readonly SDL3HardwareDeviceDriver _driver;
         private readonly ConcurrentQueue<SDL3AudioBuffer> _queuedBuffers;
@@ -223,7 +226,7 @@ namespace Ryujinx.Audio.Backends.SDL3
             return driverBuffer.DriverIdentifier != buffer.DataPointer;
         }
 
-        private void Dispose(bool disposing)
+        protected virtual void Dispose(bool disposing)
         {
             if (disposing && _driver.Unregister(this))
             {

src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIoOutStreamContext.cs

@@ -130,7 +130,7 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
             unsafe
             {
                 int* frameCountPtr = &nativeFrameCount;
-                nint* arenasPtr = &arenas;
+                IntPtr* arenasPtr = &arenas;
                 CheckError(soundio_outstream_begin_write(_context, (nint)arenasPtr, (nint)frameCountPtr));
 
                 frameCount = *frameCountPtr;

src/Ryujinx.Audio.Backends.SoundIo/SoundIoHardwareDeviceDriver.cs

@@ -10,7 +10,7 @@ using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
 
 namespace Ryujinx.Audio.Backends.SoundIo
 {
-    public sealed class SoundIoHardwareDeviceDriver : IHardwareDeviceDriver
+    public class SoundIoHardwareDeviceDriver : IHardwareDeviceDriver
     {
         private readonly SoundIoContext _audioContext;
         private readonly SoundIoDeviceContext _audioDevice;
@@ -227,7 +227,7 @@ namespace Ryujinx.Audio.Backends.SoundIo
             }
         }
 
-        private void Dispose(bool disposing)
+        protected virtual void Dispose(bool disposing)
         {
             if (disposing)
             {

src/Ryujinx.Audio.Backends.SoundIo/SoundIoHardwareDeviceSession.cs

@@ -11,7 +11,7 @@ using static Ryujinx.Audio.Backends.SoundIo.Native.SoundIo;
 
 namespace Ryujinx.Audio.Backends.SoundIo
 {
-    sealed class SoundIoHardwareDeviceSession : HardwareDeviceSessionOutputBase
+    class SoundIoHardwareDeviceSession : HardwareDeviceSessionOutputBase
     {
         private readonly SoundIoHardwareDeviceDriver _driver;
         private readonly ConcurrentQueue<SoundIoAudioBuffer> _queuedBuffers;
@@ -428,7 +428,7 @@ namespace Ryujinx.Audio.Backends.SoundIo
             }
         }
 
-        private void Dispose(bool disposing)
+        protected virtual void Dispose(bool disposing)
         {
             if (disposing && _driver.Unregister(this))
             {

src/Ryujinx.Common/Logging/Logger.cs

@@ -12,6 +12,8 @@ namespace Ryujinx.Common.Logging
 {
     public static class Logger
     {
+        public static readonly TextWriter WriterProxy = new TextWriterProxy();
+
         private static readonly Stopwatch _time;
 
         private static readonly bool[] _enabledClasses;

src/Ryujinx.Common/Logging/TextWriterProxy.cs

@@ -0,0 +1,21 @@
+using System;
+using System.IO;
+using System.Text;
+
+namespace Ryujinx.Common.Logging
+{
+    internal class TextWriterProxy : TextWriter
+    {
+        public override Encoding Encoding => Console.OutputEncoding;
+
+        public override void Write(string value)
+        {
+            if (value is null) return;
+
+            foreach (var line in value.Split(Console.Out.NewLine))
+            {
+                Logger.Info?.PrintMsg(LogClass.Application, line);
+            }
+        }
+    }
+}

src/Ryujinx.Cpu/AddressTable.cs

@@ -30,9 +30,9 @@ namespace ARMeilleure.Common
             /// <summary>
             /// Base address for the page.
             /// </summary>
-            public readonly nint Address;
+            public readonly IntPtr Address;
 
-            public AddressTablePage(bool isSparse, nint address)
+            public AddressTablePage(bool isSparse, IntPtr address)
             {
                 IsSparse = isSparse;
                 Address = address;
@@ -47,20 +47,20 @@ namespace ARMeilleure.Common
             public readonly SparseMemoryBlock Block;
             private readonly TrackingEventDelegate _trackingEvent;
 
-            public TableSparseBlock(ulong size, Action<nint> ensureMapped, PageInitDelegate pageInit)
+            public TableSparseBlock(ulong size, Action<IntPtr> ensureMapped, PageInitDelegate pageInit)
             {
                 SparseMemoryBlock block = new(size, pageInit, null);
 
                 _trackingEvent = (address, size, write) =>
                 {
                     ulong pointer = (ulong)block.Block.Pointer + address;
-                    ensureMapped((nint)pointer);
+                    ensureMapped((IntPtr)pointer);
                     return pointer;
                 };
 
                 bool added = NativeSignalHandler.AddTrackedRegion(
                     (nuint)block.Block.Pointer,
-                    (nuint)(block.Block.Pointer + (nint)block.Block.Size),
+                    (nuint)(block.Block.Pointer + (IntPtr)block.Block.Size),
                     Marshal.GetFunctionPointerForDelegate(_trackingEvent));
 
                 if (!added)
@@ -116,7 +116,7 @@ namespace ARMeilleure.Common
         }
 
         /// <inheritdoc/>
-        public nint Base
+        public IntPtr Base
         {
             get
             {
@@ -124,7 +124,7 @@ namespace ARMeilleure.Common
 
                 lock (_pages)
                 {
-                    return (nint)GetRootPage();
+                    return (IntPtr)GetRootPage();
                 }
             }
         }
@@ -240,7 +240,7 @@ namespace ARMeilleure.Common
 
                 long index = Levels[^1].GetValue(address);
 
-                EnsureMapped((nint)(page + index));
+                EnsureMapped((IntPtr)(page + index));
 
                 return ref page[index];
             }
@@ -284,7 +284,7 @@ namespace ARMeilleure.Common
         /// Ensure the given pointer is mapped in any overlapping sparse reservations.
         /// </summary>
         /// <param name="ptr">Pointer to be mapped</param>
-        private void EnsureMapped(nint ptr)
+        private void EnsureMapped(IntPtr ptr)
         {
             if (Sparse)
             {
@@ -299,7 +299,7 @@ namespace ARMeilleure.Common
                     {
                         SparseMemoryBlock sparse = reserved.Block;
 
-                        if (ptr >= sparse.Block.Pointer && ptr < sparse.Block.Pointer + (nint)sparse.Block.Size)
+                        if (ptr >= sparse.Block.Pointer && ptr < sparse.Block.Pointer + (IntPtr)sparse.Block.Size)
                         {
                             sparse.EnsureMapped((ulong)(ptr - sparse.Block.Pointer));
 
@@ -319,15 +319,15 @@ namespace ARMeilleure.Common
         /// </summary>
         /// <param name="level">Level to get the fill value for</param>
         /// <returns>The fill value</returns>
-        private nint GetFillValue(int level)
+        private IntPtr GetFillValue(int level)
         {
             if (_fillBottomLevel != null && level == Levels.Length - 2)
             {
-                return (nint)_fillBottomLevelPtr;
+                return (IntPtr)_fillBottomLevelPtr;
             }
             else
             {
-                return nint.Zero;
+                return IntPtr.Zero;
             }
         }
 
@@ -379,7 +379,7 @@ namespace ARMeilleure.Common
         /// <param name="fill">Fill value</param>
         /// <param name="leaf"><see langword="true"/> if leaf; otherwise <see langword="false"/></param>
         /// <returns>Allocated block</returns>
-        private nint Allocate<T>(int length, T fill, bool leaf) where T : unmanaged
+        private IntPtr Allocate<T>(int length, T fill, bool leaf) where T : unmanaged
         {
             int size = sizeof(T) * length;
 
@@ -405,7 +405,7 @@ namespace ARMeilleure.Common
                     }
                 }
 
-                page = new AddressTablePage(true, block.Block.Pointer + (nint)_sparseReservedOffset);
+                page = new AddressTablePage(true, block.Block.Pointer + (IntPtr)_sparseReservedOffset);
 
                 _sparseReservedOffset += (ulong)size;
 
@@ -413,7 +413,7 @@ namespace ARMeilleure.Common
             }
             else
             {
-                nint address = (nint)NativeAllocator.Instance.Allocate((uint)size);
+                IntPtr address = (IntPtr)NativeAllocator.Instance.Allocate((uint)size);
                 page = new AddressTablePage(false, address);
 
                 Span<T> span = new((void*)page.Address, length);

src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs

@@ -658,7 +658,7 @@ namespace Ryujinx.Graphics.Gpu.Image
 
                 bool canImport = Storage.Info.IsLinear && Storage.Info.Stride >= Storage.Info.Width * Storage.Info.FormatInfo.BytesPerPixel;
 
-                nint hostPointer = canImport ? _physicalMemory.GetHostPointer(Storage.Range) : 0;
+                IntPtr hostPointer = canImport ? _physicalMemory.GetHostPointer(Storage.Range) : 0;
 
                 if (hostPointer != 0 && _context.Renderer.PrepareHostMapping(hostPointer, Storage.Size))
                 {

src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs

@@ -19,7 +19,7 @@ namespace Ryujinx.Graphics.Vulkan.MoltenVK
 
         public static void Initialize()
         {
-            nint configSize = (nint)Marshal.SizeOf<MVKConfiguration>();
+            IntPtr configSize = (nint)Marshal.SizeOf<MVKConfiguration>();
 
             vkGetMoltenVKConfigurationMVK(nint.Zero, out MVKConfiguration config, configSize);
 

src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs

@@ -86,7 +86,7 @@ namespace Ryujinx.Graphics.Vulkan
                 enabledExtensions = enabledExtensions.Append(ExtDebugUtils.ExtensionName).ToArray();
             }
 
-            nint appName = Marshal.StringToHGlobalAnsi(AppName);
+            IntPtr appName = Marshal.StringToHGlobalAnsi(AppName);
 
             ApplicationInfo applicationInfo = new()
             {
@@ -166,7 +166,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         internal static DeviceInfo[] GetSuitablePhysicalDevices(Vk api)
         {
-            nint appName = Marshal.StringToHGlobalAnsi(AppName);
+            IntPtr appName = Marshal.StringToHGlobalAnsi(AppName);
 
             ApplicationInfo applicationInfo = new()
             {

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocket.cs

@@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
 
         public bool Blocking { get => Socket.Blocking; set => Socket.Blocking = value; }
 
-        public nint Handle => nint.Zero;
+        public nint Handle => IntPtr.Zero;
 
         public IPEndPoint RemoteEndPoint => Socket.RemoteEndPoint as IPEndPoint;
 

src/Ryujinx.Memory/WindowsShared/PlaceholderManager.cs

@@ -159,7 +159,7 @@ namespace Ryujinx.Memory.WindowsShared
         {
             SplitForMap((ulong)location, (ulong)size, srcOffset);
 
-            nint ptr = WindowsApi.MapViewOfFile3(
+            IntPtr ptr = WindowsApi.MapViewOfFile3(
                 sharedMemory,
                 WindowsApi.CurrentProcessHandle,
                 location,

src/Ryujinx.Tests/Memory/PartialUnmaps.cs

@@ -227,7 +227,7 @@ namespace Ryujinx.Tests.Memory
 
             // Create some info to be used for managing the native writing loop.
             int stateSize = Unsafe.SizeOf<NativeWriteLoopState>();
-            nint statePtr = Marshal.AllocHGlobal(stateSize);
+            IntPtr statePtr = Marshal.AllocHGlobal(stateSize);
             Unsafe.InitBlockUnaligned((void*)statePtr, 0, (uint)stateSize);
 
             ref NativeWriteLoopState writeLoopState = ref Unsafe.AsRef<NativeWriteLoopState>((void*)statePtr);

src/Ryujinx/Program.cs

@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Threading;
+using CommandLine;
 using DiscordRPC;
 using Gommon;
 using Projektanker.Icons.Avalonia;
@@ -78,28 +79,38 @@ namespace Ryujinx.Ava
                 }
             }
 
-            bool noGuiArg = ConsumeCommandLineArgument(ref args, "--no-gui") || ConsumeCommandLineArgument(ref args, "nogui");
-            bool coreDumpArg = ConsumeCommandLineArgument(ref args, "--core-dumps");
+            PreviewerDetached = true;
+
+            if (ConsumeCommandLineArgument(ref args, "--no-gui") 
+                || ConsumeCommandLineArgument(ref args, "nogui"))
+            {
+                try
+                {
+                    HeadlessRyujinx.Entrypoint(args);
+                    return 0;
+                }
+                catch (Exception e)
+                {
+                    Logger.Error?.PrintMsg(LogClass.Application, $"Exception occurred when running Headless Ryujinx: {e.Message}\n{e.StackTrace}");
+                    return 1;
+                }
+            }
+
+            if (!Initialize(args, out RyujinxOptions options))
+            {
+                Logger.Flush();
+                return 1;
+            }
 
             // TODO: Ryujinx causes core dumps on Linux when it exits "uncleanly", eg. through an unhandled exception.
             //       This is undesirable and causes very odd behavior during development (the process stops responding, 
             //       the .NET debugger freezes or suddenly detaches, /tmp/ gets filled etc.), unless explicitly requested by the user.
             //       This needs to be investigated, but calling prctl() is better than modifying system-wide settings or leaving this be.
-            if (!coreDumpArg)
+            if (!options.CoreDumpsEnabled)
             {
                 OsUtils.SetCoreDumpable(false);
             }
 
-            PreviewerDetached = true;
-
-            if (noGuiArg)
-            {
-                HeadlessRyujinx.Entrypoint(args);
-                return 0;
-            }
-
-            Initialize(args);
-
             LoggerAdapter.Register();
 
             IconProvider.Current
@@ -137,13 +148,14 @@ namespace Ryujinx.Ava
             return found;
         }
 
-        private static void Initialize(string[] args)
+        private static Result Initialize(string[] args, out RyujinxOptions options)
         {
             // Ensure Discord presence timestamp begins at the absolute start of when Ryujinx is launched
             DiscordIntegrationModule.EmulatorStartedAt = Timestamps.Now;
 
             // Parse arguments
-            CommandLineState.ParseArguments(args);
+            Result res = RyujinxOptions.Read(args, out options);
+            if (!res) return res;
 
             if (OperatingSystem.IsMacOS())
             {
@@ -163,7 +175,7 @@ namespace Ryujinx.Ava
             AppDomain.CurrentDomain.ProcessExit += (_, _) => Exit();
 
             // Setup base data directory.
-            AppDataManager.Initialize(CommandLineState.BaseDirPathArg);
+            AppDataManager.Initialize(options.EmuDataBaseDirPath);
 
             // Initialize the configuration.
             ConfigurationState.Initialize();
@@ -196,10 +208,12 @@ namespace Ryujinx.Ava
                 }
             }
 
-            if (CommandLineState.LaunchPathArg != null)
+            if (options.LaunchPath != null)
             {
-                MainWindow.DeferLoadApplication(CommandLineState.LaunchPathArg, CommandLineState.LaunchApplicationId, CommandLineState.StartFullscreenArg);
+                MainWindow.DeferLoadApplication(options.LaunchPath, options.LaunchApplicationId, options.StartFullscreen);
             }
+
+            return Result.Success;
         }
 
         public static string GetDirGameUserConfig(string gameId, bool changeFolderForGame = false)
@@ -222,7 +236,6 @@ namespace Ryujinx.Ava
 
         public static void ReloadConfig(bool isRunGameWithCustomConfig = false)
         {
-
             string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
             string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);
 
@@ -273,74 +286,50 @@ namespace Ryujinx.Ava
             UseHardwareAcceleration = ConfigurationState.Instance.EnableHardwareAcceleration;
 
             // Check if graphics backend was overridden
-            if (CommandLineState.OverrideGraphicsBackend is not null)
-                ConfigurationState.Instance.Graphics.GraphicsBackend.Value = CommandLineState.OverrideGraphicsBackend.ToLower() switch
-                {
-                    "opengl" => GraphicsBackend.OpenGl,
-                    "vulkan" => GraphicsBackend.Vulkan,
-                    _ => ConfigurationState.Instance.Graphics.GraphicsBackend
-                };
+            if (RyujinxOptions.Shared.GraphicsBackendOverride is not null)
+                ConfigurationState.Instance.Graphics.GraphicsBackend.Value =
+                    RyujinxOptions.Shared.GraphicsBackendOverride.Value;
 
             // Check if backend threading was overridden
-            if (CommandLineState.OverrideBackendThreading is not null)
-                ConfigurationState.Instance.Graphics.BackendThreading.Value = CommandLineState.OverrideBackendThreading.ToLower() switch
-                {
-                    "auto" => BackendThreading.Auto,
-                    "off" => BackendThreading.Off,
-                    "on" => BackendThreading.On,
-                    _ => ConfigurationState.Instance.Graphics.BackendThreading
-                };
+            if (RyujinxOptions.Shared.BackendThreadingOverride is not null)
+                ConfigurationState.Instance.Graphics.BackendThreading.Value =
+                    RyujinxOptions.Shared.BackendThreadingOverride.Value;
+
+            if (RyujinxOptions.Shared.BackendThreadingOverrideAfterReboot is not null)
+                BackendThreadingArg = RyujinxOptions.Shared.BackendThreadingOverrideAfterReboot.Value.ToString();
 
-            if (CommandLineState.OverrideBackendThreadingAfterReboot is not null)
-            {
-                BackendThreadingArg = CommandLineState.OverrideBackendThreadingAfterReboot;
-            }
 
             // Check if docked mode was overriden.
-            if (CommandLineState.OverrideDockedMode.HasValue)
-                ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;
+            if (RyujinxOptions.Shared.DockedModeOverride.HasValue)
+                ConfigurationState.Instance.System.EnableDockedMode.Value =
+                    RyujinxOptions.Shared.DockedModeOverride.Value;
 
             // Check if HideCursor was overridden.
-            if (CommandLineState.OverrideHideCursor is not null)
-                ConfigurationState.Instance.HideCursor.Value = CommandLineState.OverrideHideCursor.ToLower() switch
-                {
-                    "never" => HideCursorMode.Never,
-                    "onidle" => HideCursorMode.OnIdle,
-                    "always" => HideCursorMode.Always,
-                    _ => ConfigurationState.Instance.HideCursor,
-                };
+            if (RyujinxOptions.Shared.HideCursorOverride is not null)
+                ConfigurationState.Instance.HideCursor.Value = RyujinxOptions.Shared.HideCursorOverride.Value;
 
             // Check if memoryManagerMode was overridden. 
-            if (CommandLineState.OverrideMemoryManagerMode is not null)
-                if (Enum.TryParse(CommandLineState.OverrideMemoryManagerMode, true, out MemoryManagerMode result))
-                {
-                    ConfigurationState.Instance.System.MemoryManagerMode.Value = result;
-                }
+            if (RyujinxOptions.Shared.MemoryManagerModeOverride is not null)
+                ConfigurationState.Instance.System.MemoryManagerMode.Value = RyujinxOptions.Shared.MemoryManagerModeOverride.Value;
 
             // Check if PPTC was overridden. 
-            if (CommandLineState.OverridePPTC is not null)
-                if (Enum.TryParse(CommandLineState.OverridePPTC, true, out bool result))
+            if (RyujinxOptions.Shared.PptcOverride is not null)
+                if (Enum.TryParse(RyujinxOptions.Shared.PptcOverride, true, out bool result))
                 {
                     ConfigurationState.Instance.System.EnablePtc.Value = result;
                 }
 
             // Check if region was overridden. 
-            if (CommandLineState.OverrideSystemRegion is not null)
-                if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out Region result))
-                {
-                    ConfigurationState.Instance.System.Region.Value = result;
-                }
+            if (RyujinxOptions.Shared.SystemRegionOverride is not null)
+                ConfigurationState.Instance.System.Region.Value = RyujinxOptions.Shared.SystemRegionOverride.Value;
 
             //Check if language was overridden. 
-            if (CommandLineState.OverrideSystemLanguage is not null)
-                if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out Language result))
-                {
-                    ConfigurationState.Instance.System.Language.Value = result;
-                }
+            if (RyujinxOptions.Shared.SystemLanguageOverride is not null)
+                ConfigurationState.Instance.System.Language.Value = RyujinxOptions.Shared.SystemLanguageOverride.Value;
 
             // Check if hardware-acceleration was overridden.
-            if (CommandLineState.OverrideHardwareAcceleration != null)
-                UseHardwareAcceleration = CommandLineState.OverrideHardwareAcceleration.Value;
+            if (RyujinxOptions.Shared.HardwareAccelerationOverride is not null)
+                UseHardwareAcceleration = RyujinxOptions.Shared.HardwareAccelerationOverride.Value;
         }
 
         internal static void PrintSystemInfo()

src/Ryujinx/Ryujinx.csproj

@@ -77,13 +77,12 @@
   </ItemGroup>
   
   <ItemGroup>
+    <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL3\Ryujinx.Audio.Backends.SDL3.csproj" />
     <ProjectReference Include="..\Ryujinx.Graphics.RenderDocApi\Ryujinx.Graphics.RenderDocApi.csproj" />
     <ProjectReference Include="..\Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj" />
     <ProjectReference Include="..\Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj" />
     <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
     <ProjectReference Include="..\Ryujinx.Input.SDL3\Ryujinx.Input.SDL3.csproj" />
-    <ProjectReference Include="..\Ryujinx.Audio.Backends.Apple\Ryujinx.Audio.Backends.Apple.csproj" />
-    <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL3\Ryujinx.Audio.Backends.SDL3.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
     <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />

src/Ryujinx/Systems/AppHost.cs

@@ -6,7 +6,6 @@ using Avalonia.Threading;
 using DiscordRPC;
 using LibHac.Common;
 using LibHac.Ns;
-using Ryujinx.Audio.Backends.Apple;
 using Ryujinx.Audio.Backends.Dummy;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL3;
@@ -950,9 +949,6 @@ namespace Ryujinx.Ava.Systems
                 AudioBackend.Dummy
             ];
 
-            if (OperatingSystem.IsMacOS())
-                availableBackends.Insert(0, AudioBackend.AudioToolbox);
-
             AudioBackend preferredBackend = ConfigurationState.Instance.System.AudioBackend.Value;
 
             if (preferredBackend is AudioBackend.SDL2)
@@ -989,9 +985,6 @@ namespace Ryujinx.Ava.Systems
 
                 deviceDriver = currentBackend switch
                 {
-#pragma warning disable CA1416 // Platform compatibility is enforced in AppleHardwareDeviceDriver.IsSupported, before any potentially platform-sensitive code can run.
-                    AudioBackend.AudioToolbox => InitializeAudioBackend<AppleHardwareDeviceDriver>(AudioBackend.AudioToolbox, nextBackend),
-#pragma warning restore CA1416
                     AudioBackend.SDL3 => InitializeAudioBackend<SDL3HardwareDeviceDriver>(AudioBackend.SDL3, nextBackend),
                     AudioBackend.SoundIo => InitializeAudioBackend<SoundIoHardwareDeviceDriver>(AudioBackend.SoundIo, nextBackend),
                     AudioBackend.OpenAl => InitializeAudioBackend<OpenALHardwareDeviceDriver>(AudioBackend.OpenAl, nextBackend),

src/Ryujinx/Systems/Configuration/AudioBackend.cs

@@ -9,7 +9,6 @@ namespace Ryujinx.Ava.Systems.Configuration
         OpenAl,
         SoundIo,
         SDL3,
-        AudioToolbox,
         SDL2 = SDL3
     }
 }

src/Ryujinx/Systems/Updater/Updater.GitLab.cs

@@ -7,7 +7,6 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Systems.Update.Client;
 using Ryujinx.Systems.Update.Common;
 using System;
-using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 
@@ -47,12 +46,6 @@ namespace Ryujinx.Ava.Systems
                 return Return<VersionResponse>.Failure(
                     new MessageError("DNS resolution error occurred. Is your internet down?"));
             }
-            catch (HttpRequestException hre)
-                when (hre.StatusCode is HttpStatusCode.BadGateway)
-            {
-                return Return<VersionResponse>.Failure(
-                    new MessageError("Could not connect to the update server, but it appears like you have internet. It seems like the update server is offline, try again later."));
-            }
         }
 
         public static async Task<Optional<(Version Current, Version Incoming)>> CheckVersionAsync(bool showVersionUpToDate = false)

src/Ryujinx/Systems/Updater/Updater.cs

@@ -181,7 +181,7 @@ namespace Ryujinx.Ava.Systems
 
                 if (shouldRestart)
                 {
-                    List<string> arguments = CommandLineState.Arguments.ToList();
+                    List<string> arguments = RyujinxOptions.Shared.InputArguments.ToList();
                     string executableDirectory = AppDomain.CurrentDomain.BaseDirectory;
 
                     // On macOS we perform the update at relaunch.
@@ -218,7 +218,7 @@ namespace Ryujinx.Ava.Systems
                             WorkingDirectory = executableDirectory,
                         };
 
-                        foreach (string argument in CommandLineState.Arguments)
+                        foreach (string argument in arguments)
                         {
                             processStart.ArgumentList.Add(argument);
                         }

src/Ryujinx/UI/RyujinxApp.axaml.cs

@@ -95,7 +95,7 @@ namespace Ryujinx.Ava
 
                     if (result == UserResult.Yes)
                     {
-                        _ = Process.Start(Environment.ProcessPath!, CommandLineState.Arguments);
+                        _ = Process.Start(Environment.ProcessPath!, RyujinxOptions.Shared.InputArguments);
                         desktop.Shutdown();
                         Environment.Exit(0);
                     }

src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs

@@ -255,41 +255,27 @@ namespace Ryujinx.Ava.UI.ViewModels
             return amiiboJson;
         }
 
-        private async Task<AmiiboJson?> ReadLocalJsonFileAsync()
+        private AmiiboJson? ReadLocalJsonFile()
         {
             bool isValid = false;
             AmiiboJson amiiboJson = new();
 
             try
             {
-                try
+                if (File.Exists(_amiiboJsonPath))
                 {
-                    if (File.Exists(_amiiboJsonPath))
-                    {
-                        isValid = TryGetAmiiboJson(await File.ReadAllTextAsync(_amiiboJsonPath), out amiiboJson);
-                    }
-                }
-                catch (Exception exception)
-                {
-                    Logger.Warning?.Print(LogClass.Application, $"Unable to read data from '{_amiiboJsonPath}': {exception}");
-                    isValid = false;
-                }
-
-                if (!isValid)
-                {
-                    return null;
+                    isValid = TryGetAmiiboJson(File.ReadAllText(_amiiboJsonPath), out amiiboJson);
                 }
             }
             catch (Exception exception)
             {
-                if (!isValid)
-                {
-                    Logger.Error?.Print(LogClass.Application, $"Couldn't get valid amiibo data: {exception}");
+                Logger.Warning?.Print(LogClass.Application, $"Unable to read data from '{_amiiboJsonPath}': {exception}");
+                isValid = false;
+            }
 
-                    // Neither local file is not valid JSON, close window.
-                    await ShowInfoDialog();
-                    Close();
-                }
+            if (!isValid)
+            {
+                return null;
             }
 
             return amiiboJson;
@@ -299,8 +285,8 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             AmiiboJson? amiiboJson;
 
-            if (CommandLineState.OnlyLocalAmiibo)
-                amiiboJson = await ReadLocalJsonFileAsync();
+            if (RyujinxOptions.Shared.OnlyLocalAmiibo)
+                amiiboJson = ReadLocalJsonFile();
             else
                 amiiboJson = await GetMostRecentAmiiboListOrDefaultJson();
 

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -5,7 +5,6 @@ using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using LibHac.Tools.FsSystem;
-using Ryujinx.Audio.Backends.Apple;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL3;
 using Ryujinx.Audio.Backends.SoundIo;
@@ -278,7 +277,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool IsOpenAlEnabled { get; set; }
         public bool IsSoundIoEnabled { get; set; }
         public bool IsSDL3Enabled { get; set; }
-        public bool IsAudioToolboxEnabled { get; set; }
         public bool IsCustomResolutionScaleActive => _resolutionScale == 4;
         public bool IsScalingFilterActive => _scalingFilter == (int)Ryujinx.Common.Configuration.ScalingFilter.Fsr;
 
@@ -526,14 +524,12 @@ namespace Ryujinx.Ava.UI.ViewModels
             IsOpenAlEnabled = OpenALHardwareDeviceDriver.IsSupported;
             IsSoundIoEnabled = SoundIoHardwareDeviceDriver.IsSupported;
             IsSDL3Enabled = SDL3HardwareDeviceDriver.IsSupported;
-            IsAudioToolboxEnabled = OperatingSystem.IsMacOS() && AppleHardwareDeviceDriver.IsSupported;
 
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
                 OnPropertyChanged(nameof(IsOpenAlEnabled));
                 OnPropertyChanged(nameof(IsSoundIoEnabled));
                 OnPropertyChanged(nameof(IsSDL3Enabled));
-                OnPropertyChanged(nameof(IsAudioToolboxEnabled));
             });
         }
 

src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml

@@ -46,9 +46,6 @@
                         <ComboBoxItem
                             IsEnabled="{Binding IsSDL3Enabled}"
                             Content="{ext:Locale SettingsTabSystemAudioBackendSDL3}" />
-                        <ComboBoxItem
-                            IsEnabled="{Binding IsAudioToolboxEnabled}"
-                            Content="{ext:Locale SettingsTabSystemAudioBackendAudioToolbox}" />
                     </ComboBox>
                 </StackPanel>
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -139,16 +139,11 @@ namespace Ryujinx.Ava.UI.Windows
             Executor.ExecuteBackgroundAsync(async () =>
             {
                 await ShowIntelMacWarningAsync();
-                if (CommandLineState.FirmwareToInstallPathArg.TryGet(out FilePath fwPath))
+                if (RyujinxOptions.Shared.FirmwareToInstallPath.TryGet(out FilePath fwPath))
                 {
-                    if (fwPath is { ExistsAsFile: true, Extension: "xci" or "zip" } || fwPath.ExistsAsDirectory)
-                    {
-                        await Dispatcher.UIThread.InvokeAsync(() =>
-                            ViewModel.HandleFirmwareInstallation(fwPath));
-                        CommandLineState.FirmwareToInstallPathArg = default;
-                    }
-                    else
-                        Logger.Notice.Print(LogClass.UI, "Invalid firmware type provided. Path must be a directory, or a .zip or .xci file.");
+                    await Dispatcher.UIThread.InvokeAsync(() =>
+                        ViewModel.HandleFirmwareInstallation(fwPath));
+                    RyujinxOptions.Shared.FirmwareToInstallPath = default;
                 }
             });
         }
@@ -278,7 +273,7 @@ namespace Ryujinx.Ava.UI.Windows
             // Consider removing this at some point in the future when we don't need to worry about old saves.
             VirtualFileSystem.FixExtraData(LibHacHorizonManager.RyujinxClient);
 
-            AccountManager = new AccountManager(LibHacHorizonManager.RyujinxClient, CommandLineState.Profile);
+            AccountManager = new AccountManager(LibHacHorizonManager.RyujinxClient, RyujinxOptions.Shared.Profile);
 
             VirtualFileSystem.ReloadKeySet();
 
@@ -406,7 +401,7 @@ namespace Ryujinx.Ava.UI.Windows
                 await Dispatcher.UIThread.InvokeAsync(async () => await UserErrorDialog.ShowUserErrorDialog(UserError.NoKeys));
             }
 
-            if (!Updater.CanUpdate() || CommandLineState.HideAvailableUpdates)
+            if (!Updater.CanUpdate() || RyujinxOptions.Shared.HideAvailableUpdates)
                 return;
 
             switch (ConfigurationState.Instance.UpdateCheckerType.Value)

src/Ryujinx/Utilities/CommandLineState.cs

@@ -1,221 +0,0 @@
-using Gommon;
-using Ryujinx.Common.Logging;
-using System.Collections.Generic;
-
-namespace Ryujinx.Ava.Utilities
-{
-    public static class CommandLineState
-    {
-        public static string[] Arguments { get; private set; }
-        public static int CountArguments { get; private set; }
-        public static bool? OverrideDockedMode { get; private set; }
-        public static bool? OverrideHardwareAcceleration { get; private set; }
-        public static string OverrideGraphicsBackend { get; private set; }
-        public static string OverrideBackendThreading { get; private set; }
-        public static string OverrideBackendThreadingAfterReboot { get; private set; }
-        public static string OverridePPTC { get; private set; }
-        public static string OverrideMemoryManagerMode { get; private set; }
-        public static string OverrideSystemRegion { get; private set; }
-        public static string OverrideSystemLanguage { get; private set; }
-        public static string OverrideHideCursor { get; private set; }
-        public static string BaseDirPathArg { get; private set; }
-
-        public static string RenderDocCaptureTitleFormat { get; private set; } =
-            "{EmuVersion}\n{GuestName} {GuestVersion} {GuestTitleId} {GuestArch}";
-        public static Optional<FilePath> FirmwareToInstallPathArg { get; set; }
-        public static string Profile { get; private set; }
-        public static string LaunchPathArg { get; private set; }
-        public static string LaunchApplicationId { get; private set; }
-        public static bool StartFullscreenArg { get; private set; }
-        public static bool HideAvailableUpdates { get; private set; }
-        public static bool OnlyLocalAmiibo { get; private set; }
-
-        public static void ParseArguments(string[] args)
-        {
-            List<string> arguments = [];
-
-            // Parse Arguments.
-            for (int i = 0; i < args.Length; ++i)
-            {
-                string arg = args[i];
-
-                if (arg.Contains('-') || arg.Contains("--"))
-                {
-                    CountArguments++;
-                }
-
-                switch (arg)
-                {
-                    case "-r":
-                    case "--root-data-dir":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        BaseDirPathArg = args[++i];
-
-                        arguments.Add(arg);
-                        arguments.Add(args[i]);
-                        break;
-                    case "-rdct":
-                    case "--rd-capture-title-format":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        RenderDocCaptureTitleFormat = args[++i];
-
-                        arguments.Add(arg);
-                        arguments.Add(args[i]);
-                        break;
-                    case "--install-firmware":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        FirmwareToInstallPathArg = new FilePath(args[++i]);
-
-                        arguments.Add(arg);
-                        arguments.Add(args[i]);
-                        break;
-                    case "-p":
-                    case "--profile":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        Profile = args[++i];
-
-                        arguments.Add(arg);
-                        arguments.Add(args[i]);
-                        break;
-                    case "-f":
-                    case "--fullscreen":
-                        StartFullscreenArg = true;
-
-                        arguments.Add(arg);
-                        break;
-                    case "-g":
-                    case "--graphics-backend":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideGraphicsBackend = args[++i];
-                        break;
-                    case "--backend-threading":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideBackendThreading = args[++i];
-                        break;
-                    case "--bt":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideBackendThreadingAfterReboot = args[++i];
-                        break;
-                    case "--pptc":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverridePPTC = args[++i];
-                        break;
-                    case "-la":
-                    case "--local-only-amiibo":
-                        OnlyLocalAmiibo = true;
-                        break;
-                    case "-m":
-                    case "--memory-manager-mode":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideMemoryManagerMode = args[++i];
-                        break;
-                    case "--system-region":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideSystemRegion = args[++i];
-                        break;
-                    case "--system-language":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideSystemLanguage = args[++i];
-                        break;
-                    case "-i":
-                    case "--application-id":
-                        LaunchApplicationId = args[++i];
-                        break;
-                    case "--docked-mode":
-                        OverrideDockedMode = true;
-                        break;
-                    case "--handheld-mode":
-                        OverrideDockedMode = false;
-                        break;
-                    case "--hide-cursor":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideHideCursor = args[++i];
-                        break;
-                    case "--hide-updates":
-                        HideAvailableUpdates = true;
-                        break;
-                    case "--software-gui":
-                        OverrideHardwareAcceleration = false;
-                        break;
-                    default:
-                        LaunchPathArg = arg;
-                        break;
-                }
-            }
-
-            Arguments = arguments.ToArray();
-        }
-    }
-}

src/Ryujinx/Utilities/RyujinxOptions.Parse.cs

@@ -0,0 +1,58 @@
+using CommandLine;
+using Gommon;
+using Ryujinx.Common.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Error = Gommon.Error;
+
+namespace Ryujinx.Ava.Utilities
+{
+    public partial class RyujinxOptions
+    {
+        public static RyujinxOptions Shared { get; private set; }
+
+        // ReSharper disable once UnusedMethodReturnValue.Global
+        public static Result Read(string[] args, out RyujinxOptions options)
+        {
+            options = null;
+            args = PatchLegacyArgumentNames(args);
+
+            ParserResult<RyujinxOptions> parseResult =
+                Parser.ParseArguments<RyujinxOptions>(args);
+
+            if (parseResult is NotParsed<RyujinxOptions>)
+                return Result.Fail;
+
+            options = Shared = parseResult.Value;
+
+            return parseResult.Value.Init(args);
+        }
+
+        private static readonly Lazy<Parser> _parser = new(() => new Parser(settings =>
+        {
+            settings.HelpWriter = Logger.WriterProxy;
+            settings.CaseInsensitiveEnumValues = true;
+            settings.CaseSensitive = false;
+            settings.MaximumDisplayWidth -= (int)(settings.MaximumDisplayWidth * 0.175);
+        }));
+
+        public static Parser Parser => _parser.Value;
+
+        private static readonly Dictionary<string, string> _legacyArgs = new()
+        {
+            { "-rdct", "--rd-capture-title-format" },
+            { "-la", "--local-only-amiibo" }
+        };
+
+        public static string[] PatchLegacyArgumentNames(string[] args)
+        {
+            for (int i = 0; i < args.Length; i++)
+                args[i] = Patch(args[i]);
+
+            return args;
+
+            string Patch(string arg) => _legacyArgs.TryGetValue(arg, out string newArgName) ? newArgName : arg;
+        }
+    }
+}

src/Ryujinx/Utilities/RyujinxOptions.cs

@@ -0,0 +1,148 @@
+using Avalonia.Controls;
+using CommandLine;
+using Gommon;
+using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Logging;
+
+namespace Ryujinx.Ava.Utilities
+{
+    public partial class RyujinxOptions
+    {
+        public string[] InputArguments { get; private set; }
+
+        public bool? DockedModeOverride { get; private set; }
+
+        public bool? HardwareAccelerationOverride { get; private set; }
+
+        public Optional<FilePath> FirmwareToInstallPath { get; set; }
+
+        // Ideally I'd use an enum parse, like --docked-mode=Handheld,
+        // but I want to maintain backwards compatibility with shortcuts made a long time ago, as best we can.
+        public Result Init(string[] args)
+        {
+            InputArguments = args;
+
+            {
+                // Docked Mode Override
+                if (DockedMode && HandheldMode)
+                {
+                    return Result.MessageFailure(
+                        "Cannot be in both docked and handheld mode at the same time; choose only one.");
+                }
+
+                if (DockedMode) DockedModeOverride = true;
+                if (HandheldMode) DockedModeOverride = false;
+            }
+            {
+                // Hardware Acceleration Override
+                if (SoftwareGui)
+                {
+                    HardwareAccelerationOverride = false;
+                }
+            }
+
+            FirmwareToInstallPath = Optional.Of(FirmwareToInstallPathRaw)
+                .Convert(x => new FilePath(x))
+                .OnlyIf(fp =>
+                {
+                    bool result = fp is { ExistsAsFile: true, Extension: "xci" or "zip" } || fp.ExistsAsDirectory;
+                    if (!result)
+                    {
+                        Logger.Notice.PrintMsg(LogClass.UI,
+                            "Invalid firmware type provided. Path must be a directory, or a .zip or .xci file.");
+                    }
+
+                    return result;
+                });
+
+            return Result.Success;
+        }
+
+        [Option("docked-mode", Required = false, Default = false,
+            HelpText = "Launch the game in Docked mode. Causes an error if used in tandem with --handheld-mode.")]
+        public bool DockedMode { get; set; }
+
+        [Option("handheld-mode", Required = false, Default = false,
+            HelpText = "Launch the game in Handheld mode. Causes an error if used in tandem with --docked-mode.")]
+        public bool HandheldMode { get; set; }
+
+        [Option("software-gui", Required = false, Default = false,
+            HelpText = "Disables hardware-accelerated rendering for Avalonia. Required for launching with RenderDoc.")]
+        public bool SoftwareGui { get; set; }
+
+        [Option('g', "graphics-backend", Required = false, Default = null,
+            HelpText = "Select the Graphics backend to use when launching.")]
+        public GraphicsBackend? GraphicsBackendOverride { get; set; }
+
+        [Option("backend-threading", Required = false, Default = null,
+            HelpText = "Select the Graphics backend threading option to use when launching.")]
+        public BackendThreading? BackendThreadingOverride { get; set; }
+
+        [Option("bt", Required = false, Default = null, Hidden = true)]
+        public BackendThreading? BackendThreadingOverrideAfterReboot { get; set; }
+
+        [Option("pptc", Required = false, Default = null,
+            HelpText = "Enable/disable PPTC regardless of your settings when launching.")]
+        public string PptcOverride { get; set; }
+
+        [Option('m', "memory-manager-mode", Required = false, Default = null,
+            HelpText = "Select the memory manager mode to use when launching.")]
+        public MemoryManagerMode? MemoryManagerModeOverride { get; set; }
+
+        [Option("system-region", Required = false, Default = null,
+            HelpText = "Select the Region to use for the emulated Switch when launching.")]
+        public Region? SystemRegionOverride { get; set; }
+
+        [Option("system-language", Required = false, Default = null,
+            HelpText = "Select the Language to use for the emulated Switch when launching.")]
+        public Language? SystemLanguageOverride { get; set; }
+
+        [Option("hide-cursor", Required = false, Default = null,
+            HelpText = "Select the cursor hiding strategy to use when launching.")]
+        public HideCursorMode? HideCursorOverride { get; set; }
+
+        [Option('r', "root-data-dir", Required = false, Default = null,
+            HelpText = "Select the folder to use for all of your Ryujinx save data, configs, etc.")]
+        public string EmuDataBaseDirPath { get; set; }
+
+        [Option("rd-capture-title-format", Required = false,
+            HelpText =
+                "Set the format string used for RenderDoc Capture titles when using the Start/Stop Capture buttons in Ryujinx.",
+            Default = "{EmuVersion}\n{GuestName} {GuestVersion} {GuestTitleId} {GuestArch}")]
+        public string RenderDocCaptureTitleFormat { get; set; }
+
+        [Option("install-firmware", Required = false, Default = null,
+            HelpText =
+                "Specify a file path containing Switch firmware to install immediately after starting. Must be a directory or a .zip or .xci file.")]
+        public string FirmwareToInstallPathRaw { get; set; }
+
+        [Option('p', "profile", Required = false, Default = null,
+            HelpText = "The profile name to open the application with. Defaults to your last used profile.")]
+        public string Profile { get; set; }
+
+        [Option('i', "application-id", Required = false, Default = null,
+            HelpText = "Specify which application ID out of the specified content archive path to launch.")]
+        public string LaunchApplicationId { get; set; }
+
+        [Option('f', "fullscreen", Required = false, Default = false,
+            HelpText = "Start the emulator in fullscreen mode.")]
+        public bool StartFullscreen { get; set; }
+
+        [Option("hide-updates", Required = false, Default = false, HelpText = "Hides update prompt/notification.")]
+        public bool HideAvailableUpdates { get; set; }
+
+        [Option("local-only-amiibo", Required = false, Default = false,
+            HelpText = "Only use the local Amiibo cache; do not update it even if there is an update.")]
+        public bool OnlyLocalAmiibo { get; set; }
+
+        [Option("core-dumps", Required = false, Default = false,
+            HelpText = "Enable coredumps on Linux platforms. They are disabled by default.")]
+        public bool CoreDumpsEnabled { get; set; }
+
+        [Value(0, Default = null, Required = false,
+            HelpText =
+                "The Nintendo Switch application content archive to launch immediately after starting, if desired.")]
+        public string LaunchPath { get; set; }
+    }
+}

src/Ryujinx/Utilities/ShortcutHelper.cs

@@ -126,10 +126,10 @@ namespace Ryujinx.Ava.Utilities
             // args are first defined as a list, for easier adjustments in the future
             List<string> argsList = [];
 
-            if (!string.IsNullOrEmpty(CommandLineState.BaseDirPathArg))
+            if (!string.IsNullOrEmpty(RyujinxOptions.Shared.EmuDataBaseDirPath))
             {
                 argsList.Add("--root-data-dir");
-                argsList.Add($"\"{CommandLineState.BaseDirPathArg}\"");
+                argsList.Add($"\"{RyujinxOptions.Shared.EmuDataBaseDirPath}\"");
             }
 
             if (!string.IsNullOrEmpty(config))

src/Ryujinx/Utilities/TitleHelper.cs

@@ -34,7 +34,7 @@ namespace Ryujinx.Ava.Utilities
             string titleIdSection = $"({activeProcess.ProgramIdText.ToUpper()})";
             string titleArchSection = activeProcess.Is64Bit ? "(64-bit)" : "(32-bit)";
 
-            return CommandLineState.RenderDocCaptureTitleFormat
+            return RyujinxOptions.Shared.RenderDocCaptureTitleFormat
                 .ReplaceIgnoreCase("{EmuVersion}", applicationVersion)
                 .ReplaceIgnoreCase("{GuestName}", titleNameSection)
                 .ReplaceIgnoreCase("{GuestVersion}", titleVersionSection)