Merge branch 'master' into Master_PR

This is an attempt to decouple "saving gamepad settings" from the rest of the emulator settings. Should fix the issue where the gamepad was not detected when starting the emulator and the game (usually after saving settings with the gamepad turned off)

Directory.Packages.props

@@ -42,7 +42,7 @@
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
-    <PackageVersion Include="Gommon" Version="2.7.1.1" />
+    <PackageVersion Include="Gommon" Version="2.7.1" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="Sep" Version="0.6.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />

docs/compatibility.csv

@@ -1800,7 +1800,6 @@
 010005A00B312000,"Megaton Rainfall",gpu;opengl,boots,2022-08-04 18:29:43
 0100EA100DF92000,"Meiji Katsugeki Haikara Ryuuseigumi - Seibai Shimaseu, Yonaoshi Kagyou",32-bit;nvdec,playable,2022-12-05 13:19:12
 0100B360068B2000,"Mekorama",gpu,boots,2021-06-17 16:37:21
-010012301932A000,"Melatonin",,playable,2025-02-16 04:08:17
 01000FA010340000,"Melbits World",nvdec;online,menus,2021-11-26 13:51:22
 0100F68019636000,"Melon Journey",,playable,2023-04-23 21:20:01
 010079C012896000,"Memories Off -Innocent Fille- for Dearest",,playable,2020-08-04 07:31:22

src/Ryujinx.Common/SharedConstants.cs

@@ -1,9 +0,0 @@
-namespace Ryujinx.Common
-{
-    public static class SharedConstants
-    {
-        public const string DefaultLanPlayHost = "ryuldn.vudjun.com";
-        public const short LanPlayPort = 30456;
-        public const string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
-    }
-}

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs

@@ -23,6 +23,9 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 {
     class IUserLocalCommunicationService : IpcService, IDisposable
     {
+        public static string DefaultLanPlayHost = "ryuldn.vudjun.com";
+        public static short LanPlayPort = 30456;
+
         public INetworkClient NetworkClient { get; private set; }
 
         private const int NifmRequestID = 90;
@@ -1089,18 +1092,20 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                             case MultiplayerMode.LdnRyu:
                                 try
                                 {
-                                    string ldnServer = context.Device.Configuration.MultiplayerLdnServer 
-                                                       ?? throw new InvalidOperationException("Cannot initialize RyuLDN with a null Multiplayer server.");
-
+                                    string ldnServer = context.Device.Configuration.MultiplayerLdnServer;
+                                    if (string.IsNullOrEmpty(ldnServer))
+                                    {
+                                        ldnServer = DefaultLanPlayHost;
+                                    }
                                     if (!IPAddress.TryParse(ldnServer, out IPAddress ipAddress))
                                     {
                                         ipAddress = Dns.GetHostEntry(ldnServer).AddressList[0];
                                     }
-                                    NetworkClient = new LdnMasterProxyClient(ipAddress.ToString(), SharedConstants.LanPlayPort, context.Device.Configuration);
+                                    NetworkClient = new LdnMasterProxyClient(ipAddress.ToString(), LanPlayPort, context.Device.Configuration);
                                 }
                                 catch (Exception ex)
                                 {
-                                    Logger.Error?.Print(LogClass.ServiceLdn, "Could not locate RyuLDN server. Defaulting to stubbed wireless.");
+                                    Logger.Error?.Print(LogClass.ServiceLdn, "Could not locate LdnRyu server. Defaulting to stubbed wireless.");
                                     Logger.Error?.Print(LogClass.ServiceLdn, ex.Message);
                                     NetworkClient = new LdnDisabledClient();
                                 }

src/Ryujinx.Input.SDL2/SDL2Gamepad.cs

@@ -111,7 +111,7 @@ namespace Ryujinx.Input.SDL2
             byte blue = packedRgb > 0 ? (byte)(packedRgb % 256) : (byte)0;
             
             if (SDL_GameControllerSetLED(_gamepadHandle, red, green, blue) != 0)
-                Logger.Debug?.Print(LogClass.Hid, "LED setting failed; probably in the middle of disconnecting.");
+                Logger.Error?.Print(LogClass.Hid, "LED setting failed; probably in the middle of disconnecting.");
         }
 
         private GamepadFeaturesFlag GetFeaturesFlag()

src/Ryujinx/AppHost.cs

@@ -951,7 +951,7 @@ namespace Ryujinx.Ava
                 ConfigurationState.Instance.Multiplayer.Mode,
                 ConfigurationState.Instance.Multiplayer.DisableP2p,
                 ConfigurationState.Instance.Multiplayer.LdnPassphrase,
-                ConfigurationState.Instance.Multiplayer.GetLdnServer(),
+                ConfigurationState.Instance.Multiplayer.LdnServer,
                 ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value,
                 ConfigurationState.Instance.Hacks.ShowDirtyHacks ? ConfigurationState.Instance.Hacks.EnabledHacks : null));
         }

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -52,6 +52,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         [ObservableProperty] private object _configViewModel;
         [ObservableProperty] private string _profileName;
         private bool _isLoaded;
+        public bool InitInputPage { get; set; }
 
         private static readonly InputConfigJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
 
@@ -92,6 +93,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool CanClearLed => SelectedGamepad.Name.ContainsIgnoreCase("DualSense");
 
         public bool IsModified { get; set; }
+        public bool IsInputConfigChanged { get; set; }
+
         public event Action NotifyChangesEvent;
 
         public PlayerIndex PlayerIdChoose
@@ -121,13 +124,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 }
                 _isLoaded = false;
-
                 LoadConfiguration();
                 LoadDevice();
                 LoadProfiles();
 
                 _isLoaded = true;
-
+               
                 OnPropertyChanged();
             }
         }
@@ -296,7 +298,10 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig));
             }
-        }
+
+            IsInputConfigChanged |= InitInputPage; // If the field has been changed, the control settings will be overwritten
+            InitInputPage = true; // initialization variable
+        } 
 
         public void LoadDevice()
         {
@@ -817,6 +822,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         {
             IsModified = false;
 
+            if (!IsInputConfigChanged)
+            {
+                return; //If the input settings were not touched, then do nothing
+            }
+
+            IsInputConfigChanged = false; // Input settings have been changed
+
             List<InputConfig> newConfig = [];
 
             newConfig.AddRange(ConfigurationState.Instance.Hid.InputConfig.Value);

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -793,7 +793,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             return false;
         }
 
-        public async Task HandleFirmwareInstallation(string filename)
+        private async Task HandleFirmwareInstallation(string filename)
         {
             try
             {

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs

@@ -65,6 +65,9 @@ namespace Ryujinx.Ava.UI.Views.Input
                 if (!float.IsNaN(_changeSlider) && _changeSlider != (float)check.Value)
                 {
                     (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
+
+                    FlagInputConfigChanged();
+
                     _changeSlider = (float)check.Value;
                 }
             }
@@ -75,6 +78,9 @@ namespace Ryujinx.Ava.UI.Views.Input
             if (sender is CheckBox { IsPointerOver: true })
             {
                 (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
+
+                FlagInputConfigChanged();
+
                 _currentAssigner?.Cancel();
                 _currentAssigner = null;
             }
@@ -102,6 +108,8 @@ namespace Ryujinx.Ava.UI.Views.Input
 
                         PointerPressed += MouseClick;
 
+                        FlagInputConfigChanged();
+
                         ControllerInputViewModel viewModel = (DataContext as ControllerInputViewModel);
 
                         IKeyboard keyboard =
@@ -208,6 +216,11 @@ namespace Ryujinx.Ava.UI.Views.Input
             }
         }
 
+        private void FlagInputConfigChanged()
+        {
+            (DataContext as ControllerInputViewModel)!.ParentModel.IsInputConfigChanged = true;
+        }
+
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
@@ -239,7 +252,6 @@ namespace Ryujinx.Ava.UI.Views.Input
             {
                 gamepad?.ClearLed();
             }
-            
             _currentAssigner?.Cancel();
             _currentAssigner = null;
         }

src/Ryujinx/UI/Views/Input/InputView.axaml.cs

@@ -48,6 +48,7 @@ namespace Ryujinx.Ava.UI.Views.Input
 
                 if (result == UserResult.Yes)
                 {
+                    ViewModel.InitInputPage = false;
                     ViewModel.Save();
                 }
 

src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs

@@ -60,6 +60,8 @@ namespace Ryujinx.Ava.UI.Views.Input
 
                     PointerPressed += MouseClick;
 
+                    FlagInputConfigChanged();
+
                     if (DataContext is not KeyboardInputViewModel viewModel)
                         return;
 
@@ -184,6 +186,11 @@ namespace Ryujinx.Ava.UI.Views.Input
             }
         }
 
+        private void FlagInputConfigChanged()
+        {
+            (DataContext as KeyboardInputViewModel)!.ParentModel.IsInputConfigChanged = true;
+        }
+
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;

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

@@ -133,6 +133,12 @@
                             <ComboBoxItem>
                                 <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                             </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSwedish}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageNorwegian}" />
+                            </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel

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

@@ -139,24 +139,8 @@ namespace Ryujinx.Ava.UI.Windows
             base.OnApplyTemplate(e);
 
             NotificationHelper.SetNotificationManager(this);
-            
-            Executor.ExecuteBackgroundAsync(async () =>
-            {
-                await ShowIntelMacWarningAsync();
-                FilePath firmwarePath = CommandLineState.FirmwareToInstallPathArg;
-                if (firmwarePath is not null)
-                {
-                    if ((firmwarePath.ExistsAsFile && firmwarePath.Extension is "xci" or "zip") ||
-                        firmwarePath.ExistsAsDirectory)
-                    {
-                        await Dispatcher.UIThread.InvokeAsync(() => 
-                            ViewModel.HandleFirmwareInstallation(firmwarePath));
-                        CommandLineState.FirmwareToInstallPathArg = null;
-                    }
-                    else
-                        Logger.Notice.Print(LogClass.UI, "Invalid firmware type provided. Path must be a directory, or a .zip or .xci file.");
-                }
-            });
+
+            Executor.ExecuteBackgroundAsync(ShowIntelMacWarningAsync);
         }
 
         private void OnScalingChanged(object sender, EventArgs e)
@@ -189,12 +173,17 @@ namespace Ryujinx.Ava.UI.Windows
         {
             Dispatcher.UIThread.Post(() =>
             {
+                List<LdnGameData> ldnGameDataArray = e.LdnData.ToList();
                 ViewModel.LdnData.Clear();
                 foreach (ApplicationData application in ViewModel.Applications.Where(it => it.HasControlHolder))
                 {
                     ref ApplicationControlProperty controlHolder = ref application.ControlHolder.Value;
-
-                    ViewModel.LdnData[application.IdString] = e.LdnData.Where(ref controlHolder);
+                    
+                    ViewModel.LdnData[application.IdString] = 
+                        LdnGameData.GetArrayForApp(
+                            ldnGameDataArray, 
+                            ref controlHolder
+                        );
                     
                     UpdateApplicationWithLdnData(application);
                 }

src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs

@@ -42,6 +42,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 {
     public class ApplicationLibrary
     {
+        public const string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
         public Language DesiredLanguage { get; set; }
         public event EventHandler<ApplicationCountUpdatedEventArgs> ApplicationCountUpdated;
         public event Action<LdnGameDataReceivedEventArgs> LdnGameDataReceived;
@@ -825,6 +826,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 
         public async Task RefreshLdn()
         {
+
             if (ConfigurationState.Instance.Multiplayer.Mode == MultiplayerMode.LdnRyu)
             {
                 try
@@ -832,22 +834,33 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                     string ldnWebHost = ConfigurationState.Instance.Multiplayer.LdnServer;
                     if (string.IsNullOrEmpty(ldnWebHost))
                     {
-                        ldnWebHost = SharedConstants.DefaultLanPlayWebHost;
+                        ldnWebHost = DefaultLanPlayWebHost;
                     }
-                    
+                    IEnumerable<LdnGameData> ldnGameDataArray = Array.Empty<LdnGameData>();
                     using HttpClient httpClient = new();
                     string ldnGameDataArrayString = await httpClient.GetStringAsync($"https://{ldnWebHost}/api/public_games");
-                    LdnGameData[] ldnGameDataArray = JsonHelper.Deserialize(ldnGameDataArrayString, _ldnDataSerializerContext.IEnumerableLdnGameData).ToArray();
-                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs(ldnGameDataArray));
-                    return;
+                    ldnGameDataArray = JsonHelper.Deserialize(ldnGameDataArrayString, _ldnDataSerializerContext.IEnumerableLdnGameData);
+                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
+                    {
+                        LdnData = ldnGameDataArray
+                    });
                 }
                 catch (Exception ex)
                 {
                     Logger.Warning?.Print(LogClass.Application, $"Failed to fetch the public games JSON from the API. Player and game count in the game list will be unavailable.\n{ex.Message}");
+                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
+                    {
+                        LdnData = Array.Empty<LdnGameData>()
+                    });
                 }
             }
-            
-            LdnGameDataReceived?.Invoke(LdnGameDataReceivedEventArgs.Empty);
+            else
+            {
+                LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
+                {
+                    LdnData = Array.Empty<LdnGameData>()
+                });
+            }
         }
 
         // Replace the currently stored DLC state for the game with the provided DLC state.

src/Ryujinx/Utilities/AppLibrary/LdnGameData.cs

@@ -18,7 +18,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
         public IEnumerable<string> Players { get; set; }
 
         public static Array GetArrayForApp(
-            LdnGameData[] receivedData, ref ApplicationControlProperty acp)
+            IEnumerable<LdnGameData> receivedData, ref ApplicationControlProperty acp)
         {
             LibHac.Common.FixedArrays.Array8<ulong> communicationId = acp.LocalCommunicationId;
 
@@ -40,10 +40,4 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             public int GameCount => _ldnDatas.Length;
         }
     }
-
-    public static class LdnGameDataHelper
-    {
-        public static LdnGameData.Array Where(this LdnGameData[] unfilteredDatas, ref ApplicationControlProperty acp) 
-            => LdnGameData.GetArrayForApp(unfilteredDatas, ref acp);
-    }
 }

src/Ryujinx/Utilities/AppLibrary/LdnGameDataReceivedEventArgs.cs

@@ -5,14 +5,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 {
     public class LdnGameDataReceivedEventArgs : EventArgs
     {
-        public static new readonly LdnGameDataReceivedEventArgs Empty = new(null);
-        
-        public LdnGameDataReceivedEventArgs(LdnGameData[] ldnData)
-        {
-            LdnData = ldnData ?? [];
-        }
-        
-        
-        public LdnGameData[] LdnData { get; set; }
+        public IEnumerable<LdnGameData> LdnData { get; set; }
     }
 }

src/Ryujinx/Utilities/CommandLineState.cs

@@ -1,4 +1,3 @@
-using Gommon;
 using Ryujinx.Common.Logging;
 using System.Collections.Generic;
 
@@ -14,7 +13,6 @@ namespace Ryujinx.Ava.Utilities
         public static string OverrideBackendThreading { get; private set; }
         public static string OverrideHideCursor { get; private set; }
         public static string BaseDirPathArg { get; private set; }
-        public static 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; }
@@ -43,19 +41,6 @@ namespace Ryujinx.Ava.Utilities
 
                         BaseDirPathArg = 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;

src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -1,6 +1,5 @@
 using ARMeilleure;
 using Gommon;
-using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Configuration.System;
 using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common;
@@ -648,14 +647,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// </summary>
             public ReactiveObject<string> LdnServer { get; private set; }
 
-            public string GetLdnServer()
-            {
-                string ldnServer = LdnServer;
-                return string.IsNullOrEmpty(ldnServer) 
-                    ? SharedConstants.DefaultLanPlayHost 
-                    : ldnServer;
-            }
-
             public MultiplayerSection()
             {
                 LanInterfaceId = new ReactiveObject<string>();