mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-09-10 05:33:16 +02:00
![Thog](/assets/img/avatar_default.png)
The configuration system was quite fragile and too dependent on everything, this fix #812 . The changes: The file configuration is now entirely independent from the internal configuration state. The file configuration is versioned (current version is 1). Every configuration elements are now reactive properties that the emulator can register on to handle initialization and configuration changes. The configuration system is now in Ryujinx.Common to be accessible on every projects. Discord integration is now independent from the UI and can be reloaded. The primary controller is now configurable at runtime (NOTE: the UI currently doesn't have any options to configure real controller). The logger is entirely reloadable. You can now hotplug your controller when the emulator is running. The logger now takes name for every LogTarget to make them removable at runtime. The logger now always add the default "console" target to avoid loosing early init logs. The configuration system now generates a default file configuration if it's missing or too new. General system stability improvements to enhance the user's experience
147 lines
3.7 KiB
C#
147 lines
3.7 KiB
C#
using LibHac.FsSystem;
|
|
using Ryujinx.Audio;
|
|
using Ryujinx.Configuration;
|
|
using Ryujinx.Graphics;
|
|
using Ryujinx.Graphics.Gal;
|
|
using Ryujinx.HLE.FileSystem;
|
|
using Ryujinx.HLE.HOS;
|
|
using Ryujinx.HLE.HOS.Services;
|
|
using Ryujinx.HLE.HOS.SystemState;
|
|
using Ryujinx.HLE.Input;
|
|
using System;
|
|
using System.Threading;
|
|
|
|
namespace Ryujinx.HLE
|
|
{
|
|
public class Switch : IDisposable
|
|
{
|
|
internal IAalOutput AudioOut { get; private set; }
|
|
|
|
internal DeviceMemory Memory { get; private set; }
|
|
|
|
internal NvGpu Gpu { get; private set; }
|
|
|
|
internal VirtualFileSystem FileSystem { get; private set; }
|
|
|
|
public Horizon System { get; private set; }
|
|
|
|
public PerformanceStatistics Statistics { get; private set; }
|
|
|
|
public Hid Hid { get; private set; }
|
|
|
|
public bool EnableDeviceVsync { get; set; } = true;
|
|
|
|
public AutoResetEvent VsyncEvent { get; private set; }
|
|
|
|
public event EventHandler Finish;
|
|
|
|
public Switch(IGalRenderer renderer, IAalOutput audioOut)
|
|
{
|
|
if (renderer == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(renderer));
|
|
}
|
|
|
|
if (audioOut == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(audioOut));
|
|
}
|
|
|
|
AudioOut = audioOut;
|
|
|
|
Memory = new DeviceMemory();
|
|
|
|
Gpu = new NvGpu(renderer);
|
|
|
|
FileSystem = new VirtualFileSystem();
|
|
|
|
System = new Horizon(this);
|
|
|
|
Statistics = new PerformanceStatistics();
|
|
|
|
Hid = new Hid(this, System.HidBaseAddress);
|
|
|
|
VsyncEvent = new AutoResetEvent(true);
|
|
}
|
|
|
|
public void Initialize()
|
|
{
|
|
System.State.SetLanguage((SystemLanguage)ConfigurationState.Instance.System.Language.Value);
|
|
|
|
EnableDeviceVsync = ConfigurationState.Instance.Graphics.EnableVsync;
|
|
|
|
// TODO: Make this reloadable and implement Docking/Undocking logic.
|
|
System.State.DockedMode = ConfigurationState.Instance.System.EnableDockedMode;
|
|
|
|
if (ConfigurationState.Instance.System.EnableMulticoreScheduling)
|
|
{
|
|
System.EnableMultiCoreScheduling();
|
|
}
|
|
|
|
System.FsIntegrityCheckLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
|
|
? IntegrityCheckLevel.ErrorOnInvalid
|
|
: IntegrityCheckLevel.None;
|
|
|
|
System.GlobalAccessLogMode = ConfigurationState.Instance.System.FsGlobalAccessLogMode;
|
|
|
|
ServiceConfiguration.IgnoreMissingServices = ConfigurationState.Instance.System.IgnoreMissingServices;
|
|
}
|
|
|
|
public void LoadCart(string exeFsDir, string romFsFile = null)
|
|
{
|
|
System.LoadCart(exeFsDir, romFsFile);
|
|
}
|
|
|
|
public void LoadXci(string xciFile)
|
|
{
|
|
System.LoadXci(xciFile);
|
|
}
|
|
|
|
public void LoadNca(string ncaFile)
|
|
{
|
|
System.LoadNca(ncaFile);
|
|
}
|
|
|
|
public void LoadNsp(string nspFile)
|
|
{
|
|
System.LoadNsp(nspFile);
|
|
}
|
|
|
|
public void LoadProgram(string fileName)
|
|
{
|
|
System.LoadProgram(fileName);
|
|
}
|
|
|
|
public bool WaitFifo()
|
|
{
|
|
return Gpu.Pusher.WaitForCommands();
|
|
}
|
|
|
|
public void ProcessFrame()
|
|
{
|
|
Gpu.Pusher.DispatchCalls();
|
|
}
|
|
|
|
internal void Unload()
|
|
{
|
|
FileSystem.Dispose();
|
|
|
|
Memory.Dispose();
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
Dispose(true);
|
|
}
|
|
|
|
protected virtual void Dispose(bool disposing)
|
|
{
|
|
if (disposing)
|
|
{
|
|
System.Dispose();
|
|
VsyncEvent.Dispose();
|
|
}
|
|
}
|
|
}
|
|
}
|