From 388597b4e66088cece888e1e334a564e0ed19ee2 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Fri, 19 Apr 2024 13:53:23 -0400 Subject: [PATCH] Migrate Audio to SettingsAudioViewModel --- .../Settings/SettingsAudioViewModel.cs | 89 +++++++++++++++++++ .../Settings/SettingsInputViewModel.cs | 4 +- .../ViewModels/Settings/SettingsViewModel.cs | 62 ++++--------- .../UI/Views/Settings/SettingsAudioView.axaml | 4 +- .../Views/Settings/SettingsAudioView.axaml.cs | 4 + .../Settings/SettingsHotkeysView.axaml.cs | 5 ++ .../UI/Windows/SettingsWindow.axaml.cs | 19 ++-- 7 files changed, 129 insertions(+), 58 deletions(-) create mode 100644 src/Ryujinx/UI/ViewModels/Settings/SettingsAudioViewModel.cs diff --git a/src/Ryujinx/UI/ViewModels/Settings/SettingsAudioViewModel.cs b/src/Ryujinx/UI/ViewModels/Settings/SettingsAudioViewModel.cs new file mode 100644 index 0000000000..e2c1404298 --- /dev/null +++ b/src/Ryujinx/UI/ViewModels/Settings/SettingsAudioViewModel.cs @@ -0,0 +1,89 @@ +using Avalonia.Threading; +using Ryujinx.Audio.Backends.OpenAL; +using Ryujinx.Audio.Backends.SDL2; +using Ryujinx.Audio.Backends.SoundIo; +using Ryujinx.Common.Logging; +using Ryujinx.UI.Common.Configuration; +using System; +using System.Threading.Tasks; + +namespace Ryujinx.Ava.UI.ViewModels.Settings +{ + public class SettingsAudioViewModel : BaseModel + { + public event Action DirtyEvent; + + private int _audioBackend; + public int AudioBackend + { + get => _audioBackend; + set + { + _audioBackend = value; + DirtyEvent?.Invoke(); + } + } + + private float _volume; + public float Volume + { + get => _volume; + set + { + _volume = value; + DirtyEvent?.Invoke(); + } + } + + public bool IsOpenAlEnabled { get; set; } + public bool IsSoundIoEnabled { get; set; } + public bool IsSDL2Enabled { get; set; } + + public SettingsAudioViewModel() + { + ConfigurationState config = ConfigurationState.Instance; + + Task.Run(CheckSoundBackends); + + AudioBackend = (int)config.System.AudioBackend.Value; + Volume = config.System.AudioVolume * 100; + } + + public async Task CheckSoundBackends() + { + IsOpenAlEnabled = OpenALHardwareDeviceDriver.IsSupported; + IsSoundIoEnabled = SoundIoHardwareDeviceDriver.IsSupported; + IsSDL2Enabled = SDL2HardwareDeviceDriver.IsSupported; + + await Dispatcher.UIThread.InvokeAsync(() => + { + OnPropertyChanged(nameof(IsOpenAlEnabled)); + OnPropertyChanged(nameof(IsSoundIoEnabled)); + OnPropertyChanged(nameof(IsSDL2Enabled)); + }); + } + + public bool CheckIfModified(ConfigurationState config) + { + bool isDirty = false; + + isDirty |= config.System.AudioBackend.Value != (AudioBackend)AudioBackend; + isDirty |= config.System.AudioVolume.Value != Volume / 100; + + return isDirty; + } + + public void Save(ConfigurationState config) + { + AudioBackend audioBackend = (AudioBackend)AudioBackend; + if (audioBackend != config.System.AudioBackend.Value) + { + config.System.AudioBackend.Value = audioBackend; + + Logger.Info?.Print(LogClass.Application, $"AudioBackend toggled to: {audioBackend}"); + } + + config.System.AudioVolume.Value = Volume / 100; + } + } +} diff --git a/src/Ryujinx/UI/ViewModels/Settings/SettingsInputViewModel.cs b/src/Ryujinx/UI/ViewModels/Settings/SettingsInputViewModel.cs index 29b269a5ce..ac64e84967 100644 --- a/src/Ryujinx/UI/ViewModels/Settings/SettingsInputViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/Settings/SettingsInputViewModel.cs @@ -85,7 +85,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings public event Action NotifyChangesEvent; - public SettingsViewModel SettingsViewModel; + private readonly SettingsViewModel _settingsViewModel; public object ConfigViewModel { @@ -241,7 +241,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings public SettingsInputViewModel(UserControl owner, SettingsViewModel settingsViewModel) : this() { - SettingsViewModel = settingsViewModel; + _settingsViewModel = settingsViewModel; if (Program.PreviewerDetached) { diff --git a/src/Ryujinx/UI/ViewModels/Settings/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/Settings/SettingsViewModel.cs index 827a11966f..36580129db 100644 --- a/src/Ryujinx/UI/ViewModels/Settings/SettingsViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/Settings/SettingsViewModel.cs @@ -42,7 +42,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings private float _customResolutionScale; private int _resolutionScale; private int _graphicsBackendMultithreadingIndex; - private float _volume; private bool _isVulkanAvailable = true; private bool _directoryChanged; private readonly List _gpuIds = new(); @@ -397,9 +396,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings } } - public bool IsOpenAlEnabled { get; set; } - public bool IsSoundIoEnabled { get; set; } - public bool IsSDL2Enabled { get; set; } public bool IsCustomResolutionScaleActive => _resolutionScale == 4; public bool IsScalingFilterActive => _scalingFilter == (int)Ryujinx.Common.Configuration.ScalingFilter.Fsr; @@ -412,7 +408,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings public int Language { get; set; } public int Region { get; set; } public int FsGlobalAccessLogMode { get; set; } - public int AudioBackend { get; set; } public int MaxAnisotropy { get; set; } public int AspectRatio { get; set; } public int AntiAliasingEffect { get; set; } @@ -453,18 +448,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings public int PreferredGpuIndex { get; set; } - public float Volume - { - get => _volume; - set - { - _volume = value; - - ConfigurationState.Instance.System.AudioVolume.Value = _volume / 100; - - OnPropertyChanged(); - } - } + private readonly SettingsAudioViewModel _audioViewModel; public DateTimeOffset CurrentDate { get; set; } public TimeSpan CurrentTime { get; set; } @@ -500,10 +484,17 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings } } - public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this() + public SettingsViewModel( + VirtualFileSystem virtualFileSystem, + ContentManager contentManager, + SettingsAudioViewModel audioViewModel) : this() { _virtualFileSystem = virtualFileSystem; _contentManager = contentManager; + _audioViewModel = audioViewModel; + + _audioViewModel.DirtyEvent += CheckIfModified; + if (Program.PreviewerDetached) { Task.Run(LoadTimeZones); @@ -518,7 +509,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings _validTzRegions = new List(); _networkInterfaces = new Dictionary(); - Task.Run(CheckSoundBackends); Task.Run(PopulateNetworkInterfaces); if (Program.PreviewerDetached) @@ -589,10 +579,10 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings isDirty |= config.Graphics.BackendThreading.Value != (BackendThreading)GraphicsBackendMultithreadingIndex; isDirty |= config.Graphics.ShadersDumpPath.Value != ShaderDumpPath; - // Audio - isDirty |= config.System.AudioBackend.Value != (AudioBackend)AudioBackend; - isDirty |= config.System.AudioVolume.Value != Volume / 100; - + if (_audioViewModel != null) + { + isDirty |= _audioViewModel.CheckIfModified(config); + } // Network isDirty |= config.System.EnableInternetAccess.Value != EnableInternetAccess; @@ -615,19 +605,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings IsModified = isDirty; } - public async Task CheckSoundBackends() - { - IsOpenAlEnabled = OpenALHardwareDeviceDriver.IsSupported; - IsSoundIoEnabled = SoundIoHardwareDeviceDriver.IsSupported; - IsSDL2Enabled = SDL2HardwareDeviceDriver.IsSupported; - await Dispatcher.UIThread.InvokeAsync(() => - { - OnPropertyChanged(nameof(IsOpenAlEnabled)); - OnPropertyChanged(nameof(IsSoundIoEnabled)); - OnPropertyChanged(nameof(IsSDL2Enabled)); - }); - } private async Task LoadAvailableGpus() { @@ -766,10 +744,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings ScalingFilter = (int)config.Graphics.ScalingFilter.Value; ScalingFilterLevel = config.Graphics.ScalingFilterLevel.Value; - // Audio - AudioBackend = (int)config.System.AudioBackend.Value; - Volume = config.System.AudioVolume * 100; - // Network EnableInternetAccess = config.System.EnableInternetAccess; // LAN interface index is loaded asynchronously in PopulateNetworkInterfaces() @@ -854,17 +828,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Settings config.Graphics.BackendThreading.Value = (BackendThreading)GraphicsBackendMultithreadingIndex; config.Graphics.ShadersDumpPath.Value = ShaderDumpPath; - // Audio - AudioBackend audioBackend = (AudioBackend)AudioBackend; - if (audioBackend != config.System.AudioBackend.Value) + if (_audioViewModel != null) { - config.System.AudioBackend.Value = audioBackend; - - Logger.Info?.Print(LogClass.Application, $"AudioBackend toggled to: {audioBackend}"); + _audioViewModel.Save(config); } - config.System.AudioVolume.Value = Volume / 100; - // Network config.System.EnableInternetAccess.Value = EnableInternetAccess; diff --git a/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml index 1c6a4deb4e..4f4c65a1bc 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml @@ -9,9 +9,9 @@ xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale" xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Settings" mc:Ignorable="d" - x:DataType="viewModels:SettingsViewModel"> + x:DataType="viewModels:SettingsAudioViewModel"> - +