diff options
Diffstat (limited to 'Ryujinx.Common')
| -rw-r--r-- | Ryujinx.Common/Configuration/AudioBackend.cs | 9 | ||||
| -rw-r--r-- | Ryujinx.Common/Configuration/ConfigurationFileFormat.cs | 275 | ||||
| -rw-r--r-- | Ryujinx.Common/Configuration/ConfigurationState.cs | 886 | ||||
| -rw-r--r-- | Ryujinx.Common/Configuration/LoggerModule.cs | 89 | ||||
| -rw-r--r-- | Ryujinx.Common/Configuration/System/Language.cs | 23 | ||||
| -rw-r--r-- | Ryujinx.Common/Configuration/System/Region.cs | 13 | ||||
| -rw-r--r-- | Ryujinx.Common/Configuration/Ui/ColumnSort.cs | 8 | ||||
| -rw-r--r-- | Ryujinx.Common/Configuration/Ui/GuiColumns.cs | 16 | ||||
| -rw-r--r-- | Ryujinx.Common/Logging/LogClass.cs | 1 |
9 files changed, 1 insertions, 1319 deletions
diff --git a/Ryujinx.Common/Configuration/AudioBackend.cs b/Ryujinx.Common/Configuration/AudioBackend.cs deleted file mode 100644 index 28233354..00000000 --- a/Ryujinx.Common/Configuration/AudioBackend.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Ryujinx.Configuration -{ - public enum AudioBackend - { - Dummy, - OpenAl, - SoundIo - } -}
\ No newline at end of file diff --git a/Ryujinx.Common/Configuration/ConfigurationFileFormat.cs b/Ryujinx.Common/Configuration/ConfigurationFileFormat.cs deleted file mode 100644 index 1d47051a..00000000 --- a/Ryujinx.Common/Configuration/ConfigurationFileFormat.cs +++ /dev/null @@ -1,275 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using Ryujinx.Common.Configuration; -using Ryujinx.Common.Configuration.Hid; -using Ryujinx.Common.Logging; -using Ryujinx.Common.Utilities; -using Ryujinx.Configuration.System; -using Ryujinx.Configuration.Ui; - -namespace Ryujinx.Configuration -{ - public class ConfigurationFileFormat - { - /// <summary> - /// The current version of the file format - /// </summary> - public const int CurrentVersion = 24; - - public int Version { get; set; } - - /// <summary> - /// Resolution Scale. An integer scale applied to applicable render targets. Values 1-4, or -1 to use a custom floating point scale instead. - /// </summary> - public int ResScale { get; set; } - - /// <summary> - /// Custom Resolution Scale. A custom floating point scale applied to applicable render targets. Only active when Resolution Scale is -1. - /// </summary> - public float ResScaleCustom { get; set; } - - /// <summary> - /// Max Anisotropy. Values range from 0 - 16. Set to -1 to let the game decide. - /// </summary> - public float MaxAnisotropy { get; set; } - - /// <summary> - /// Aspect Ratio applied to the renderer window. - /// </summary> - public AspectRatio AspectRatio { get; set; } - - /// <summary> - /// Dumps shaders in this local directory - /// </summary> - public string GraphicsShadersDumpPath { get; set; } - - /// <summary> - /// Enables printing debug log messages - /// </summary> - public bool LoggingEnableDebug { get; set; } - - /// <summary> - /// Enables printing stub log messages - /// </summary> - public bool LoggingEnableStub { get; set; } - - /// <summary> - /// Enables printing info log messages - /// </summary> - public bool LoggingEnableInfo { get; set; } - - /// <summary> - /// Enables printing warning log messages - /// </summary> - public bool LoggingEnableWarn { get; set; } - - /// <summary> - /// Enables printing error log messages - /// </summary> - public bool LoggingEnableError { get; set; } - - /// <summary> - /// Enables printing guest log messages - /// </summary> - public bool LoggingEnableGuest { get; set; } - - /// <summary> - /// Enables printing FS access log messages - /// </summary> - public bool LoggingEnableFsAccessLog { get; set; } - - /// <summary> - /// Controls which log messages are written to the log targets - /// </summary> - public LogClass[] LoggingFilteredClasses { get; set; } - - /// <summary> - /// Change Graphics API debug log level - /// </summary> - public GraphicsDebugLevel LoggingGraphicsDebugLevel { get; set; } - - /// <summary> - /// Enables or disables logging to a file on disk - /// </summary> - public bool EnableFileLog { get; set; } - - /// <summary> - /// Change System Language - /// </summary> - public Language SystemLanguage { get; set; } - - /// <summary> - /// Change System Region - /// </summary> - public Region SystemRegion { get; set; } - - /// <summary> - /// Change System TimeZone - /// </summary> - public string SystemTimeZone { get; set; } - - /// <summary> - /// Change System Time Offset in seconds - /// </summary> - public long SystemTimeOffset { get; set; } - - /// <summary> - /// Enables or disables Docked Mode - /// </summary> - public bool DockedMode { get; set; } - - /// <summary> - /// Enables or disables Discord Rich Presence - /// </summary> - public bool EnableDiscordIntegration { get; set; } - - /// <summary> - /// Checks for updates when Ryujinx starts when enabled - /// </summary> - public bool CheckUpdatesOnStart { get; set; } - - /// <summary> - /// Show "Confirm Exit" Dialog - /// </summary> - public bool ShowConfirmExit { get; set; } - - /// <summary> - /// Hide Cursor on Idle - /// </summary> - public bool HideCursorOnIdle { get; set; } - - /// <summary> - /// Enables or disables Vertical Sync - /// </summary> - public bool EnableVsync { get; set; } - - /// <summary> - /// Enables or disables Shader cache - /// </summary> - public bool EnableShaderCache { get; set; } - - /// <summary> - /// Enables or disables multi-core scheduling of threads - /// </summary> - public bool EnableMulticoreScheduling { get; set; } - - /// <summary> - /// Enables or disables profiled translation cache persistency - /// </summary> - public bool EnablePtc { get; set; } - - /// <summary> - /// Enables integrity checks on Game content files - /// </summary> - public bool EnableFsIntegrityChecks { get; set; } - - /// <summary> - /// Enables FS access log output to the console. Possible modes are 0-3 - /// </summary> - public int FsGlobalAccessLogMode { get; set; } - - /// <summary> - /// The selected audio backend - /// </summary> - public AudioBackend AudioBackend { get; set; } - - /// <summary> - /// Expands the RAM amount on the emulated system from 4GB to 6GB - /// </summary> - public bool ExpandRam { get; set; } - - /// <summary> - /// Enable or disable ignoring missing services - /// </summary> - public bool IgnoreMissingServices { get; set; } - - /// <summary> - /// Used to toggle columns in the GUI - /// </summary> - public GuiColumns GuiColumns { get; set; } - - /// <summary> - /// Used to configure column sort settings in the GUI - /// </summary> - public ColumnSort ColumnSort { get; set; } - - /// <summary> - /// A list of directories containing games to be used to load games into the games list - /// </summary> - public List<string> GameDirs { get; set; } - - /// <summary> - /// Enable or disable custom themes in the GUI - /// </summary> - public bool EnableCustomTheme { get; set; } - - /// <summary> - /// Path to custom GUI theme - /// </summary> - public string CustomThemePath { get; set; } - - /// <summary> - /// Start games in fullscreen mode - /// </summary> - public bool StartFullscreen { get; set; } - - /// <summary> - /// Enable or disable keyboard support (Independent from controllers binding) - /// </summary> - public bool EnableKeyboard { get; set; } - - /// <summary> - /// Hotkey Keyboard Bindings - /// </summary> - public KeyboardHotkeys Hotkeys { get; set; } - - /// <summary> - /// Legacy keyboard control bindings - /// </summary> - /// <remarks>Kept for file format compatibility (to avoid possible failure when parsing configuration on old versions)</remarks> - /// TODO: Remove this when those older versions aren't in use anymore. - public List<object> KeyboardConfig { get; set; } - - /// <summary> - /// Legacy controller control bindings - /// </summary> - /// <remarks>Kept for file format compatibility (to avoid possible failure when parsing configuration on old versions)</remarks> - /// TODO: Remove this when those older versions aren't in use anymore. - public List<object> ControllerConfig { get; set; } - - /// <summary> - /// Input configurations - /// </summary> - public List<InputConfig> InputConfig { get; set; } - - /// <summary> - /// Loads a configuration file from disk - /// </summary> - /// <param name="path">The path to the JSON configuration file</param> - public static bool TryLoad(string path, out ConfigurationFileFormat configurationFileFormat) - { - try - { - configurationFileFormat = JsonHelper.DeserializeFromFile<ConfigurationFileFormat>(path); - - return true; - } - catch - { - configurationFileFormat = null; - - return false; - } - } - - /// <summary> - /// Save a configuration file to disk - /// </summary> - /// <param name="path">The path to the JSON configuration file</param> - public void SaveConfig(string path) - { - using FileStream fileStream = File.Create(path, 4096, FileOptions.WriteThrough); - JsonHelper.Serialize(fileStream, this, true); - } - } -} diff --git a/Ryujinx.Common/Configuration/ConfigurationState.cs b/Ryujinx.Common/Configuration/ConfigurationState.cs deleted file mode 100644 index 7063110f..00000000 --- a/Ryujinx.Common/Configuration/ConfigurationState.cs +++ /dev/null @@ -1,886 +0,0 @@ -using Ryujinx.Common; -using Ryujinx.Common.Configuration; -using Ryujinx.Common.Configuration.Hid; -using Ryujinx.Common.Configuration.Hid.Keyboard; -using Ryujinx.Common.Logging; -using Ryujinx.Configuration.System; -using Ryujinx.Configuration.Ui; -using System; -using System.Collections.Generic; - -namespace Ryujinx.Configuration -{ - public class ConfigurationState - { - /// <summary> - /// UI configuration section - /// </summary> - public class UiSection - { - public class Columns - { - public ReactiveObject<bool> FavColumn { get; private set; } - public ReactiveObject<bool> IconColumn { get; private set; } - public ReactiveObject<bool> AppColumn { get; private set; } - public ReactiveObject<bool> DevColumn { get; private set; } - public ReactiveObject<bool> VersionColumn { get; private set; } - public ReactiveObject<bool> TimePlayedColumn { get; private set; } - public ReactiveObject<bool> LastPlayedColumn { get; private set; } - public ReactiveObject<bool> FileExtColumn { get; private set; } - public ReactiveObject<bool> FileSizeColumn { get; private set; } - public ReactiveObject<bool> PathColumn { get; private set; } - - public Columns() - { - FavColumn = new ReactiveObject<bool>(); - IconColumn = new ReactiveObject<bool>(); - AppColumn = new ReactiveObject<bool>(); - DevColumn = new ReactiveObject<bool>(); - VersionColumn = new ReactiveObject<bool>(); - TimePlayedColumn = new ReactiveObject<bool>(); - LastPlayedColumn = new ReactiveObject<bool>(); - FileExtColumn = new ReactiveObject<bool>(); - FileSizeColumn = new ReactiveObject<bool>(); - PathColumn = new ReactiveObject<bool>(); - } - } - - public class ColumnSortSettings - { - public ReactiveObject<int> SortColumnId { get; private set; } - public ReactiveObject<bool> SortAscending { get; private set; } - - public ColumnSortSettings() - { - SortColumnId = new ReactiveObject<int>(); - SortAscending = new ReactiveObject<bool>(); - } - } - - /// <summary> - /// Used to toggle columns in the GUI - /// </summary> - public Columns GuiColumns { get; private set; } - - /// <summary> - /// Used to configure column sort settings in the GUI - /// </summary> - public ColumnSortSettings ColumnSort { get; private set; } - - /// <summary> - /// A list of directories containing games to be used to load games into the games list - /// </summary> - public ReactiveObject<List<string>> GameDirs { get; private set; } - - /// <summary> - /// Enable or disable custom themes in the GUI - /// </summary> - public ReactiveObject<bool> EnableCustomTheme { get; private set; } - - /// <summary> - /// Path to custom GUI theme - /// </summary> - public ReactiveObject<string> CustomThemePath { get; private set; } - - /// <summary> - /// Start games in fullscreen mode - /// </summary> - public ReactiveObject<bool> StartFullscreen { get; private set; } - - public UiSection() - { - GuiColumns = new Columns(); - ColumnSort = new ColumnSortSettings(); - GameDirs = new ReactiveObject<List<string>>(); - EnableCustomTheme = new ReactiveObject<bool>(); - CustomThemePath = new ReactiveObject<string>(); - StartFullscreen = new ReactiveObject<bool>(); - } - } - - /// <summary> - /// Logger configuration section - /// </summary> - public class LoggerSection - { - /// <summary> - /// Enables printing debug log messages - /// </summary> - public ReactiveObject<bool> EnableDebug { get; private set; } - - /// <summary> - /// Enables printing stub log messages - /// </summary> - public ReactiveObject<bool> EnableStub { get; private set; } - - /// <summary> - /// Enables printing info log messages - /// </summary> - public ReactiveObject<bool> EnableInfo { get; private set; } - - /// <summary> - /// Enables printing warning log messages - /// </summary> - public ReactiveObject<bool> EnableWarn { get; private set; } - - /// <summary> - /// Enables printing error log messages - /// </summary> - public ReactiveObject<bool> EnableError { get; private set; } - - /// <summary> - /// Enables printing guest log messages - /// </summary> - public ReactiveObject<bool> EnableGuest { get; private set; } - - /// <summary> - /// Enables printing FS access log messages - /// </summary> - public ReactiveObject<bool> EnableFsAccessLog { get; private set; } - - /// <summary> - /// Controls which log messages are written to the log targets - /// </summary> - public ReactiveObject<LogClass[]> FilteredClasses { get; private set; } - - /// <summary> - /// Enables or disables logging to a file on disk - /// </summary> - public ReactiveObject<bool> EnableFileLog { get; private set; } - - /// <summary> - /// Controls which OpenGL log messages are recorded in the log - /// </summary> - public ReactiveObject<GraphicsDebugLevel> GraphicsDebugLevel { get; private set; } - - public LoggerSection() - { - EnableDebug = new ReactiveObject<bool>(); - EnableStub = new ReactiveObject<bool>(); - EnableInfo = new ReactiveObject<bool>(); - EnableWarn = new ReactiveObject<bool>(); - EnableError = new ReactiveObject<bool>(); - EnableGuest = new ReactiveObject<bool>(); - EnableFsAccessLog = new ReactiveObject<bool>(); - FilteredClasses = new ReactiveObject<LogClass[]>(); - EnableFileLog = new ReactiveObject<bool>(); - EnableFileLog.Event += static (sender, e) => LogValueChange(sender, e, nameof(EnableFileLog)); - GraphicsDebugLevel = new ReactiveObject<GraphicsDebugLevel>(); - } - } - - /// <summary> - /// System configuration section - /// </summary> - public class SystemSection - { - /// <summary> - /// Change System Language - /// </summary> - public ReactiveObject<Language> Language { get; private set; } - - /// <summary> - /// Change System Region - /// </summary> - public ReactiveObject<Region> Region { get; private set; } - - /// <summary> - /// Change System TimeZone - /// </summary> - public ReactiveObject<string> TimeZone { get; private set; } - - /// <summary> - /// System Time Offset in Seconds - /// </summary> - public ReactiveObject<long> SystemTimeOffset { get; private set; } - - /// <summary> - /// Enables or disables Docked Mode - /// </summary> - public ReactiveObject<bool> EnableDockedMode { get; private set; } - - /// <summary> - /// Enables or disables profiled translation cache persistency - /// </summary> - public ReactiveObject<bool> EnablePtc { get; private set; } - - /// <summary> - /// Enables integrity checks on Game content files - /// </summary> - public ReactiveObject<bool> EnableFsIntegrityChecks { get; private set; } - - /// <summary> - /// Enables FS access log output to the console. Possible modes are 0-3 - /// </summary> - public ReactiveObject<int> FsGlobalAccessLogMode { get; private set; } - - /// <summary> - /// The selected audio backend - /// </summary> - public ReactiveObject<AudioBackend> AudioBackend { get; private set; } - - /// <summary> - /// Defines the amount of RAM available on the emulated system, and how it is distributed - /// </summary> - public ReactiveObject<bool> ExpandRam { get; private set; } - - /// <summary> - /// Enable or disable ignoring missing services - /// </summary> - public ReactiveObject<bool> IgnoreMissingServices { get; private set; } - - public SystemSection() - { - Language = new ReactiveObject<Language>(); - Region = new ReactiveObject<Region>(); - TimeZone = new ReactiveObject<string>(); - SystemTimeOffset = new ReactiveObject<long>(); - EnableDockedMode = new ReactiveObject<bool>(); - EnableDockedMode.Event += static (sender, e) => LogValueChange(sender, e, nameof(EnableDockedMode)); - EnablePtc = new ReactiveObject<bool>(); - EnablePtc.Event += static (sender, e) => LogValueChange(sender, e, nameof(EnablePtc)); - EnableFsIntegrityChecks = new ReactiveObject<bool>(); - EnableFsIntegrityChecks.Event += static (sender, e) => LogValueChange(sender, e, nameof(EnableFsIntegrityChecks)); - FsGlobalAccessLogMode = new ReactiveObject<int>(); - FsGlobalAccessLogMode.Event += static (sender, e) => LogValueChange(sender, e, nameof(FsGlobalAccessLogMode)); - AudioBackend = new ReactiveObject<AudioBackend>(); - AudioBackend.Event += static (sender, e) => LogValueChange(sender, e, nameof(AudioBackend)); - ExpandRam = new ReactiveObject<bool>(); - ExpandRam.Event += static (sender, e) => LogValueChange(sender, e, nameof(ExpandRam)); - IgnoreMissingServices = new ReactiveObject<bool>(); - IgnoreMissingServices.Event += static (sender, e) => LogValueChange(sender, e, nameof(IgnoreMissingServices)); - } - } - - /// <summary> - /// Hid configuration section - /// </summary> - public class HidSection - { - /// <summary> - /// Enable or disable keyboard support (Independent from controllers binding) - /// </summary> - public ReactiveObject<bool> EnableKeyboard { get; private set; } - - /// <summary> - /// Hotkey Keyboard Bindings - /// </summary> - public ReactiveObject<KeyboardHotkeys> Hotkeys { get; private set; } - - /// <summary> - /// Input device configuration. - /// NOTE: This ReactiveObject won't issue an event when the List has elements added or removed. - /// TODO: Implement a ReactiveList class. - /// </summary> - public ReactiveObject<List<InputConfig>> InputConfig { get; private set; } - - public HidSection() - { - EnableKeyboard = new ReactiveObject<bool>(); - Hotkeys = new ReactiveObject<KeyboardHotkeys>(); - InputConfig = new ReactiveObject<List<InputConfig>>(); - } - } - - /// <summary> - /// Graphics configuration section - /// </summary> - public class GraphicsSection - { - /// <summary> - /// Max Anisotropy. Values range from 0 - 16. Set to -1 to let the game decide. - /// </summary> - public ReactiveObject<float> MaxAnisotropy { get; private set; } - - /// <summary> - /// Aspect Ratio applied to the renderer window. - /// </summary> - public ReactiveObject<AspectRatio> AspectRatio { get; private set; } - - /// <summary> - /// Resolution Scale. An integer scale applied to applicable render targets. Values 1-4, or -1 to use a custom floating point scale instead. - /// </summary> - public ReactiveObject<int> ResScale { get; private set; } - - /// <summary> - /// Custom Resolution Scale. A custom floating point scale applied to applicable render targets. Only active when Resolution Scale is -1. - /// </summary> - public ReactiveObject<float> ResScaleCustom { get; private set; } - - /// <summary> - /// Dumps shaders in this local directory - /// </summary> - public ReactiveObject<string> ShadersDumpPath { get; private set; } - - /// <summary> - /// Enables or disables Vertical Sync - /// </summary> - public ReactiveObject<bool> EnableVsync { get; private set; } - - /// <summary> - /// Enables or disables Shader cache - /// </summary> - public ReactiveObject<bool> EnableShaderCache { get; private set; } - - public GraphicsSection() - { - ResScale = new ReactiveObject<int>(); - ResScale.Event += static (sender, e) => LogValueChange(sender, e, nameof(ResScale)); - ResScaleCustom = new ReactiveObject<float>(); - ResScaleCustom.Event += static (sender, e) => LogValueChange(sender, e, nameof(ResScaleCustom)); - MaxAnisotropy = new ReactiveObject<float>(); - MaxAnisotropy.Event += static (sender, e) => LogValueChange(sender, e, nameof(MaxAnisotropy)); - AspectRatio = new ReactiveObject<AspectRatio>(); - AspectRatio.Event += static (sender, e) => LogValueChange(sender, e, nameof(AspectRatio)); - ShadersDumpPath = new ReactiveObject<string>(); - EnableVsync = new ReactiveObject<bool>(); - EnableVsync.Event += static (sender, e) => LogValueChange(sender, e, nameof(EnableVsync)); - EnableShaderCache = new ReactiveObject<bool>(); - EnableShaderCache.Event += static (sender, e) => LogValueChange(sender, e, nameof(EnableShaderCache)); - } - } - - /// <summary> - /// The default configuration instance - /// </summary> - public static ConfigurationState Instance { get; private set; } - - /// <summary> - /// The Ui section - /// </summary> - public UiSection Ui { get; private set; } - - /// <summary> - /// The Logger section - /// </summary> - public LoggerSection Logger { get; private set; } - - /// <summary> - /// The System section - /// </summary> - public SystemSection System { get; private set; } - - /// <summary> - /// The Graphics section - /// </summary> - public GraphicsSection Graphics { get; private set; } - - /// <summary> - /// The Hid section - /// </summary> - public HidSection Hid { get; private set; } - - /// <summary> - /// Enables or disables Discord Rich Presence - /// </summary> - public ReactiveObject<bool> EnableDiscordIntegration { get; private set; } - - /// <summary> - /// Checks for updates when Ryujinx starts when enabled - /// </summary> - public ReactiveObject<bool> CheckUpdatesOnStart { get; private set; } - - /// <summary> - /// Show "Confirm Exit" Dialog - /// </summary> - public ReactiveObject<bool> ShowConfirmExit { get; private set; } - - /// <summary> - /// Hide Cursor on Idle - /// </summary> - public ReactiveObject<bool> HideCursorOnIdle { get; private set; } - - private ConfigurationState() - { - Ui = new UiSection(); - Logger = new LoggerSection(); - System = new SystemSection(); - Graphics = new GraphicsSection(); - Hid = new HidSection(); - EnableDiscordIntegration = new ReactiveObject<bool>(); - CheckUpdatesOnStart = new ReactiveObject<bool>(); - ShowConfirmExit = new ReactiveObject<bool>(); - HideCursorOnIdle = new ReactiveObject<bool>(); - } - - public ConfigurationFileFormat ToFileFormat() - { - ConfigurationFileFormat configurationFile = new ConfigurationFileFormat - { - Version = ConfigurationFileFormat.CurrentVersion, - ResScale = Graphics.ResScale, - ResScaleCustom = Graphics.ResScaleCustom, - MaxAnisotropy = Graphics.MaxAnisotropy, - AspectRatio = Graphics.AspectRatio, - GraphicsShadersDumpPath = Graphics.ShadersDumpPath, - LoggingEnableDebug = Logger.EnableDebug, - LoggingEnableStub = Logger.EnableStub, - LoggingEnableInfo = Logger.EnableInfo, - LoggingEnableWarn = Logger.EnableWarn, - LoggingEnableError = Logger.EnableError, - LoggingEnableGuest = Logger.EnableGuest, - LoggingEnableFsAccessLog = Logger.EnableFsAccessLog, - LoggingFilteredClasses = Logger.FilteredClasses, - LoggingGraphicsDebugLevel = Logger.GraphicsDebugLevel, - EnableFileLog = Logger.EnableFileLog, - SystemLanguage = System.Language, - SystemRegion = System.Region, - SystemTimeZone = System.TimeZone, - SystemTimeOffset = System.SystemTimeOffset, - DockedMode = System.EnableDockedMode, - EnableDiscordIntegration = EnableDiscordIntegration, - CheckUpdatesOnStart = CheckUpdatesOnStart, - ShowConfirmExit = ShowConfirmExit, - HideCursorOnIdle = HideCursorOnIdle, - EnableVsync = Graphics.EnableVsync, - EnableShaderCache = Graphics.EnableShaderCache, - EnablePtc = System.EnablePtc, - EnableFsIntegrityChecks = System.EnableFsIntegrityChecks, - FsGlobalAccessLogMode = System.FsGlobalAccessLogMode, - AudioBackend = System.AudioBackend, - ExpandRam = System.ExpandRam, - IgnoreMissingServices = System.IgnoreMissingServices, - GuiColumns = new GuiColumns - { - FavColumn = Ui.GuiColumns.FavColumn, - IconColumn = Ui.GuiColumns.IconColumn, - AppColumn = Ui.GuiColumns.AppColumn, - DevColumn = Ui.GuiColumns.DevColumn, - VersionColumn = Ui.GuiColumns.VersionColumn, - TimePlayedColumn = Ui.GuiColumns.TimePlayedColumn, - LastPlayedColumn = Ui.GuiColumns.LastPlayedColumn, - FileExtColumn = Ui.GuiColumns.FileExtColumn, - FileSizeColumn = Ui.GuiColumns.FileSizeColumn, - PathColumn = Ui.GuiColumns.PathColumn, - }, - ColumnSort = new ColumnSort - { - SortColumnId = Ui.ColumnSort.SortColumnId, - SortAscending = Ui.ColumnSort.SortAscending - }, - GameDirs = Ui.GameDirs, - EnableCustomTheme = Ui.EnableCustomTheme, - CustomThemePath = Ui.CustomThemePath, - StartFullscreen = Ui.StartFullscreen, - EnableKeyboard = Hid.EnableKeyboard, - Hotkeys = Hid.Hotkeys, - KeyboardConfig = new List<object>(), - ControllerConfig = new List<object>(), - InputConfig = Hid.InputConfig, - }; - - return configurationFile; - } - - public void LoadDefault() - { - Graphics.ResScale.Value = 1; - Graphics.ResScaleCustom.Value = 1.0f; - Graphics.MaxAnisotropy.Value = -1.0f; - Graphics.AspectRatio.Value = AspectRatio.Fixed16x9; - Graphics.ShadersDumpPath.Value = ""; - Logger.EnableDebug.Value = false; - Logger.EnableStub.Value = true; - Logger.EnableInfo.Value = true; - Logger.EnableWarn.Value = true; - Logger.EnableError.Value = true; - Logger.EnableGuest.Value = true; - Logger.EnableFsAccessLog.Value = false; - Logger.FilteredClasses.Value = Array.Empty<LogClass>(); - Logger.GraphicsDebugLevel.Value = GraphicsDebugLevel.None; - Logger.EnableFileLog.Value = true; - System.Language.Value = Language.AmericanEnglish; - System.Region.Value = Region.USA; - System.TimeZone.Value = "UTC"; - System.SystemTimeOffset.Value = 0; - System.EnableDockedMode.Value = true; - EnableDiscordIntegration.Value = true; - CheckUpdatesOnStart.Value = true; - ShowConfirmExit.Value = true; - HideCursorOnIdle.Value = false; - Graphics.EnableVsync.Value = true; - Graphics.EnableShaderCache.Value = true; - System.EnablePtc.Value = true; - System.EnableFsIntegrityChecks.Value = true; - System.FsGlobalAccessLogMode.Value = 0; - System.AudioBackend.Value = AudioBackend.OpenAl; - System.ExpandRam.Value = false; - System.IgnoreMissingServices.Value = false; - Ui.GuiColumns.FavColumn.Value = true; - Ui.GuiColumns.IconColumn.Value = true; - Ui.GuiColumns.AppColumn.Value = true; - Ui.GuiColumns.DevColumn.Value = true; - Ui.GuiColumns.VersionColumn.Value = true; - Ui.GuiColumns.TimePlayedColumn.Value = true; - Ui.GuiColumns.LastPlayedColumn.Value = true; - Ui.GuiColumns.FileExtColumn.Value = true; - Ui.GuiColumns.FileSizeColumn.Value = true; - Ui.GuiColumns.PathColumn.Value = true; - Ui.ColumnSort.SortColumnId.Value = 0; - Ui.ColumnSort.SortAscending.Value = false; - Ui.GameDirs.Value = new List<string>(); - Ui.EnableCustomTheme.Value = false; - Ui.CustomThemePath.Value = ""; - Ui.StartFullscreen.Value = false; - Hid.EnableKeyboard.Value = false; - Hid.Hotkeys.Value = new KeyboardHotkeys - { - ToggleVsync = Key.Tab - }; - Hid.InputConfig.Value = new List<InputConfig> - { - new StandardKeyboardInputConfig - { - Version = InputConfig.CurrentVersion, - Backend = InputBackendType.WindowKeyboard, - Id = "0", - PlayerIndex = PlayerIndex.Player1, - ControllerType = ControllerType.JoyconPair, - LeftJoycon = new LeftJoyconCommonConfig<Key> - { - DpadUp = Key.Up, - DpadDown = Key.Down, - DpadLeft = Key.Left, - DpadRight = Key.Right, - ButtonMinus = Key.Minus, - ButtonL = Key.E, - ButtonZl = Key.Q, - ButtonSl = Key.Unbound, - ButtonSr = Key.Unbound - }, - - LeftJoyconStick = new JoyconConfigKeyboardStick<Key> - { - StickUp = Key.W, - StickDown = Key.S, - StickLeft = Key.A, - StickRight = Key.D, - StickButton = Key.F, - }, - - RightJoycon = new RightJoyconCommonConfig<Key> - { - ButtonA = Key.Z, - ButtonB = Key.X, - ButtonX = Key.C, - ButtonY = Key.V, - ButtonPlus = Key.Plus, - ButtonR = Key.U, - ButtonZr = Key.O, - ButtonSl = Key.Unbound, - ButtonSr = Key.Unbound - }, - - RightJoyconStick = new JoyconConfigKeyboardStick<Key> - { - StickUp = Key.I, - StickDown = Key.K, - StickLeft = Key.J, - StickRight = Key.L, - StickButton = Key.H, - } - } - }; - } - - public void Load(ConfigurationFileFormat configurationFileFormat, string configurationFilePath) - { - bool configurationFileUpdated = false; - - if (configurationFileFormat.Version < 0 || configurationFileFormat.Version > ConfigurationFileFormat.CurrentVersion) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Unsupported configuration version {configurationFileFormat.Version}, loading default."); - - LoadDefault(); - - return; - } - - if (configurationFileFormat.Version < 2) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 2."); - - configurationFileFormat.SystemRegion = Region.USA; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 3) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 3."); - - configurationFileFormat.SystemTimeZone = "UTC"; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 4) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 4."); - - configurationFileFormat.MaxAnisotropy = -1; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 5) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 5."); - - configurationFileFormat.SystemTimeOffset = 0; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 8) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 8."); - - configurationFileFormat.EnablePtc = true; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 9) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 9."); - - configurationFileFormat.ColumnSort = new ColumnSort - { - SortColumnId = 0, - SortAscending = false - }; - - configurationFileFormat.Hotkeys = new KeyboardHotkeys - { - ToggleVsync = Key.Tab - }; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 10) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 10."); - - configurationFileFormat.AudioBackend = AudioBackend.OpenAl; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 11) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 11."); - - configurationFileFormat.ResScale = 1; - configurationFileFormat.ResScaleCustom = 1.0f; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 12) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 12."); - - configurationFileFormat.LoggingGraphicsDebugLevel = GraphicsDebugLevel.None; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 14) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 14."); - - configurationFileFormat.CheckUpdatesOnStart = true; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 16) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 16."); - - configurationFileFormat.EnableShaderCache = true; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 17) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 17."); - - configurationFileFormat.StartFullscreen = false; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 18) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 18."); - - configurationFileFormat.AspectRatio = AspectRatio.Fixed16x9; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 20) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 20."); - - configurationFileFormat.ShowConfirmExit = true; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 22) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 22."); - - configurationFileFormat.HideCursorOnIdle = false; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 24) - { - Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 24."); - - configurationFileFormat.InputConfig = new List<InputConfig> - { - new StandardKeyboardInputConfig - { - Version = InputConfig.CurrentVersion, - Backend = InputBackendType.WindowKeyboard, - Id = "0", - PlayerIndex = PlayerIndex.Player1, - ControllerType = ControllerType.JoyconPair, - LeftJoycon = new LeftJoyconCommonConfig<Key> - { - DpadUp = Key.Up, - DpadDown = Key.Down, - DpadLeft = Key.Left, - DpadRight = Key.Right, - ButtonMinus = Key.Minus, - ButtonL = Key.E, - ButtonZl = Key.Q, - ButtonSl = Key.Unbound, - ButtonSr = Key.Unbound - }, - - LeftJoyconStick = new JoyconConfigKeyboardStick<Key> - { - StickUp = Key.W, - StickDown = Key.S, - StickLeft = Key.A, - StickRight = Key.D, - StickButton = Key.F, - }, - - RightJoycon = new RightJoyconCommonConfig<Key> - { - ButtonA = Key.Z, - ButtonB = Key.X, - ButtonX = Key.C, - ButtonY = Key.V, - ButtonPlus = Key.Plus, - ButtonR = Key.U, - ButtonZr = Key.O, - ButtonSl = Key.Unbound, - ButtonSr = Key.Unbound - }, - - RightJoyconStick = new JoyconConfigKeyboardStick<Key> - { - StickUp = Key.I, - StickDown = Key.K, - StickLeft = Key.J, - StickRight = Key.L, - StickButton = Key.H, - } - } - }; - - configurationFileUpdated = true; - } - - Graphics.ResScale.Value = configurationFileFormat.ResScale; - Graphics.ResScaleCustom.Value = configurationFileFormat.ResScaleCustom; - Graphics.MaxAnisotropy.Value = configurationFileFormat.MaxAnisotropy; - Graphics.AspectRatio.Value = configurationFileFormat.AspectRatio; - Graphics.ShadersDumpPath.Value = configurationFileFormat.GraphicsShadersDumpPath; - Logger.EnableDebug.Value = configurationFileFormat.LoggingEnableDebug; - Logger.EnableStub.Value = configurationFileFormat.LoggingEnableStub; - Logger.EnableInfo.Value = configurationFileFormat.LoggingEnableInfo; - Logger.EnableWarn.Value = configurationFileFormat.LoggingEnableWarn; - Logger.EnableError.Value = configurationFileFormat.LoggingEnableError; - Logger.EnableGuest.Value = configurationFileFormat.LoggingEnableGuest; - Logger.EnableFsAccessLog.Value = configurationFileFormat.LoggingEnableFsAccessLog; - Logger.FilteredClasses.Value = configurationFileFormat.LoggingFilteredClasses; - Logger.GraphicsDebugLevel.Value = configurationFileFormat.LoggingGraphicsDebugLevel; - Logger.EnableFileLog.Value = configurationFileFormat.EnableFileLog; - System.Language.Value = configurationFileFormat.SystemLanguage; - System.Region.Value = configurationFileFormat.SystemRegion; - System.TimeZone.Value = configurationFileFormat.SystemTimeZone; - System.SystemTimeOffset.Value = configurationFileFormat.SystemTimeOffset; - System.EnableDockedMode.Value = configurationFileFormat.DockedMode; - EnableDiscordIntegration.Value = configurationFileFormat.EnableDiscordIntegration; - CheckUpdatesOnStart.Value = configurationFileFormat.CheckUpdatesOnStart; - ShowConfirmExit.Value = configurationFileFormat.ShowConfirmExit; - HideCursorOnIdle.Value = configurationFileFormat.HideCursorOnIdle; - Graphics.EnableVsync.Value = configurationFileFormat.EnableVsync; - Graphics.EnableShaderCache.Value = configurationFileFormat.EnableShaderCache; - System.EnablePtc.Value = configurationFileFormat.EnablePtc; - System.EnableFsIntegrityChecks.Value = configurationFileFormat.EnableFsIntegrityChecks; - System.FsGlobalAccessLogMode.Value = configurationFileFormat.FsGlobalAccessLogMode; - System.AudioBackend.Value = configurationFileFormat.AudioBackend; - System.ExpandRam.Value = configurationFileFormat.ExpandRam; - System.IgnoreMissingServices.Value = configurationFileFormat.IgnoreMissingServices; - Ui.GuiColumns.FavColumn.Value = configurationFileFormat.GuiColumns.FavColumn; - Ui.GuiColumns.IconColumn.Value = configurationFileFormat.GuiColumns.IconColumn; - Ui.GuiColumns.AppColumn.Value = configurationFileFormat.GuiColumns.AppColumn; - Ui.GuiColumns.DevColumn.Value = configurationFileFormat.GuiColumns.DevColumn; - Ui.GuiColumns.VersionColumn.Value = configurationFileFormat.GuiColumns.VersionColumn; - Ui.GuiColumns.TimePlayedColumn.Value = configurationFileFormat.GuiColumns.TimePlayedColumn; - Ui.GuiColumns.LastPlayedColumn.Value = configurationFileFormat.GuiColumns.LastPlayedColumn; - Ui.GuiColumns.FileExtColumn.Value = configurationFileFormat.GuiColumns.FileExtColumn; - Ui.GuiColumns.FileSizeColumn.Value = configurationFileFormat.GuiColumns.FileSizeColumn; - Ui.GuiColumns.PathColumn.Value = configurationFileFormat.GuiColumns.PathColumn; - Ui.ColumnSort.SortColumnId.Value = configurationFileFormat.ColumnSort.SortColumnId; - Ui.ColumnSort.SortAscending.Value = configurationFileFormat.ColumnSort.SortAscending; - Ui.GameDirs.Value = configurationFileFormat.GameDirs; - Ui.EnableCustomTheme.Value = configurationFileFormat.EnableCustomTheme; - Ui.CustomThemePath.Value = configurationFileFormat.CustomThemePath; - Ui.StartFullscreen.Value = configurationFileFormat.StartFullscreen; - Hid.EnableKeyboard.Value = configurationFileFormat.EnableKeyboard; - Hid.Hotkeys.Value = configurationFileFormat.Hotkeys; - Hid.InputConfig.Value = configurationFileFormat.InputConfig; - - if (Hid.InputConfig.Value == null) - { - Hid.InputConfig.Value = new List<InputConfig>(); - } - - if (configurationFileUpdated) - { - ToFileFormat().SaveConfig(configurationFilePath); - - Common.Logging.Logger.Notice.Print(LogClass.Application, $"Configuration file updated to version {ConfigurationFileFormat.CurrentVersion}"); - } - } - - private static void LogValueChange<T>(object sender, ReactiveEventArgs<T> eventArgs, string valueName) - { - Common.Logging.Logger.Info?.Print(LogClass.Configuration, $"{valueName} set to: {eventArgs.NewValue}"); - } - - public static void Initialize() - { - if (Instance != null) - { - throw new InvalidOperationException("Configuration is already initialized"); - } - - Instance = new ConfigurationState(); - } - } -} diff --git a/Ryujinx.Common/Configuration/LoggerModule.cs b/Ryujinx.Common/Configuration/LoggerModule.cs deleted file mode 100644 index 20c0fb46..00000000 --- a/Ryujinx.Common/Configuration/LoggerModule.cs +++ /dev/null @@ -1,89 +0,0 @@ -using Ryujinx.Common; -using Ryujinx.Common.Logging; -using System; -using System.IO; - -namespace Ryujinx.Configuration -{ - public static class LoggerModule - { - public static void Initialize() - { - ConfigurationState.Instance.Logger.EnableDebug.Event += ReloadEnableDebug; - ConfigurationState.Instance.Logger.EnableStub.Event += ReloadEnableStub; - ConfigurationState.Instance.Logger.EnableInfo.Event += ReloadEnableInfo; - ConfigurationState.Instance.Logger.EnableWarn.Event += ReloadEnableWarning; - ConfigurationState.Instance.Logger.EnableError.Event += ReloadEnableError; - ConfigurationState.Instance.Logger.EnableGuest.Event += ReloadEnableGuest; - ConfigurationState.Instance.Logger.EnableFsAccessLog.Event += ReloadEnableFsAccessLog; - ConfigurationState.Instance.Logger.FilteredClasses.Event += ReloadFilteredClasses; - ConfigurationState.Instance.Logger.EnableFileLog.Event += ReloadFileLogger; - } - - private static void ReloadEnableDebug(object sender, ReactiveEventArgs<bool> e) - { - Logger.SetEnable(LogLevel.Debug, e.NewValue); - } - - private static void ReloadEnableStub(object sender, ReactiveEventArgs<bool> e) - { - Logger.SetEnable(LogLevel.Stub, e.NewValue); - } - - private static void ReloadEnableInfo(object sender, ReactiveEventArgs<bool> e) - { - Logger.SetEnable(LogLevel.Info, e.NewValue); - } - - private static void ReloadEnableWarning(object sender, ReactiveEventArgs<bool> e) - { - Logger.SetEnable(LogLevel.Warning, e.NewValue); - } - - private static void ReloadEnableError(object sender, ReactiveEventArgs<bool> e) - { - Logger.SetEnable(LogLevel.Error, e.NewValue); - } - - private static void ReloadEnableGuest(object sender, ReactiveEventArgs<bool> e) - { - Logger.SetEnable(LogLevel.Guest, e.NewValue); - } - - private static void ReloadEnableFsAccessLog(object sender, ReactiveEventArgs<bool> e) - { - Logger.SetEnable(LogLevel.AccessLog, e.NewValue); - } - - private static void ReloadFilteredClasses(object sender, ReactiveEventArgs<LogClass[]> e) - { - bool noFilter = e.NewValue.Length == 0; - - foreach (var logClass in EnumExtensions.GetValues<LogClass>()) - { - Logger.SetEnable(logClass, noFilter); - } - - foreach (var logClass in e.NewValue) - { - Logger.SetEnable(logClass, true); - } - } - - private static void ReloadFileLogger(object sender, ReactiveEventArgs<bool> e) - { - if (e.NewValue) - { - Logger.AddTarget(new AsyncLogTargetWrapper( - new FileLogTarget(AppDomain.CurrentDomain.BaseDirectory, "file"), - 1000, - AsyncLogTargetOverflowAction.Block - )); - } - else - { - Logger.RemoveTarget("file"); - } - } - } -} diff --git a/Ryujinx.Common/Configuration/System/Language.cs b/Ryujinx.Common/Configuration/System/Language.cs deleted file mode 100644 index d3af296b..00000000 --- a/Ryujinx.Common/Configuration/System/Language.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace Ryujinx.Configuration.System -{ - public enum Language - { - Japanese, - AmericanEnglish, - French, - German, - Italian, - Spanish, - Chinese, - Korean, - Dutch, - Portuguese, - Russian, - Taiwanese, - BritishEnglish, - CanadianFrench, - LatinAmericanSpanish, - SimplifiedChinese, - TraditionalChinese - } -} diff --git a/Ryujinx.Common/Configuration/System/Region.cs b/Ryujinx.Common/Configuration/System/Region.cs deleted file mode 100644 index 54b1c36f..00000000 --- a/Ryujinx.Common/Configuration/System/Region.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Ryujinx.Configuration.System -{ - public enum Region - { - Japan, - USA, - Europe, - Australia, - China, - Korea, - Taiwan - } -} diff --git a/Ryujinx.Common/Configuration/Ui/ColumnSort.cs b/Ryujinx.Common/Configuration/Ui/ColumnSort.cs deleted file mode 100644 index fd8b5da1..00000000 --- a/Ryujinx.Common/Configuration/Ui/ColumnSort.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Ryujinx.Configuration.Ui -{ - public struct ColumnSort - { - public int SortColumnId { get; set; } - public bool SortAscending { get; set; } - } -}
\ No newline at end of file diff --git a/Ryujinx.Common/Configuration/Ui/GuiColumns.cs b/Ryujinx.Common/Configuration/Ui/GuiColumns.cs deleted file mode 100644 index de4f7369..00000000 --- a/Ryujinx.Common/Configuration/Ui/GuiColumns.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace Ryujinx.Configuration.Ui -{ - public struct GuiColumns - { - public bool FavColumn { get; set; } - public bool IconColumn { get; set; } - public bool AppColumn { get; set; } - public bool DevColumn { get; set; } - public bool VersionColumn { get; set; } - public bool TimePlayedColumn { get; set; } - public bool LastPlayedColumn { get; set; } - public bool FileExtColumn { get; set; } - public bool FileSizeColumn { get; set; } - public bool PathColumn { get; set; } - } -} diff --git a/Ryujinx.Common/Logging/LogClass.cs b/Ryujinx.Common/Logging/LogClass.cs index 1597805c..28b344cd 100644 --- a/Ryujinx.Common/Logging/LogClass.cs +++ b/Ryujinx.Common/Logging/LogClass.cs @@ -9,6 +9,7 @@ namespace Ryujinx.Common.Logging Cpu, Font, Emulation, + FFmpeg, Gpu, Hid, Host1x, |