Merge f3e1d9cd50 into 3541e282ea

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" />
+    <PackageVersion Include="Gommon" Version="2.7.0.2" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="Sep" Version="0.6.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />

src/Ryujinx.Common/Utilities/Rainbow.cs

@@ -1,62 +1,40 @@
-using Gommon;
-using System;
+using System;
 using System.Drawing;
-using System.Threading.Tasks;
 
 namespace Ryujinx.Common.Utilities
 {
-    public static class Rainbow
+    public class Rainbow
     {
-        public static bool CyclingEnabled { get; set; }
-
-        public static void Enable()
-        {
-            if (!CyclingEnabled)
-            {
-                CyclingEnabled = true;
-                Executor.ExecuteBackgroundAsync(async () =>
-                {
-                    while (CyclingEnabled)
-                    {
-                        await Task.Delay(15);
-                        Tick();
-                    }
-                });
-            }
-        }
-
-        public static void Disable()
-        {
-            CyclingEnabled = false;
-        }
-        
-        
         public static float Speed { get; set; } = 1;
         
         public static Color Color { get; private set; } = Color.Blue;
 
+        private static float _lastHue;
+
         public static void Tick()
         {
-            Color = HsbToRgb((Color.GetHue() + Speed) / 360);
+            float currentHue = Color.GetHue();
+            float nextHue = currentHue;
+
+            if (currentHue >= 360)
+                nextHue = 0;
+            else
+                nextHue += Speed;
             
-            UpdatedHandler.Call(Color.ToArgb());
+            Color = HsbToRgb(
+                nextHue / 360,
+                1, 
+                1
+                );
+
+            _lastHue = currentHue;
+            
+            RainbowColorUpdated?.Invoke(Color.ToArgb());
         }
 
-        public static void Reset()
-        {
-            Color = Color.Blue;
-            UpdatedHandler.Clear();
-        }
+        public static event Action<int> RainbowColorUpdated;
 
-        public static event Action<int> Updated
-        {
-            add => UpdatedHandler.Add(value);
-            remove => UpdatedHandler.Remove(value);
-        }
-
-        internal static Event<int> UpdatedHandler = new();
-
-        private static Color HsbToRgb(float hue, float saturation = 1, float brightness = 1)
+        private static Color HsbToRgb(float hue, float saturation, float brightness)
         {
             int r = 0, g = 0, b = 0;
             if (saturation == 0)

src/Ryujinx.Input.SDL2/SDL2Gamepad.cs

@@ -148,8 +148,6 @@ namespace Ryujinx.Input.SDL2
         {
             if (disposing && _gamepadHandle != nint.Zero)
             {
-                Rainbow.Updated -= RainbowColorChanged;
-                
                 SDL_GameControllerClose(_gamepadHandle);
 
                 _gamepadHandle = nint.Zero;
@@ -234,8 +232,6 @@ namespace Ryujinx.Input.SDL2
             
             SetLed((uint)packedRgb);
         }
-
-        private bool _rainbowColorEnabled;
         
         public void SetConfiguration(InputConfig configuration)
         {
@@ -247,20 +243,13 @@ namespace Ryujinx.Input.SDL2
                 {
                     if (_configuration.Led.TurnOffLed)
                         (this as IGamepad).ClearLed();
-                    else switch (_configuration.Led.UseRainbow)
-                    {
-                        case true when !_rainbowColorEnabled:
-                            Rainbow.Updated += RainbowColorChanged;
-                            _rainbowColorEnabled = true;
-                            break;
-                        case false when _rainbowColorEnabled:
-                            Rainbow.Updated -= RainbowColorChanged;
-                            _rainbowColorEnabled = false;
-                            break;
-                    }
-                    
-                    if (!_configuration.Led.TurnOffLed && !_rainbowColorEnabled)
+                    else if (_configuration.Led.UseRainbow)
+                        Rainbow.RainbowColorUpdated += RainbowColorChanged;
+                    else
                         SetLed(_configuration.Led.LedColor);
+                    
+                    if (!_configuration.Led.UseRainbow)
+                        Rainbow.RainbowColorUpdated -= RainbowColorChanged;
                 }
                 
                 _buttonsUserMapping.Clear();

src/Ryujinx.SDL2.Common/SDL2Driver.cs

@@ -168,6 +168,8 @@ namespace Ryujinx.SDL2.Common
                         HandleSDLEvent(ref evnt);
                     }
                 });
+                
+                Rainbow.Tick();
 
                 waitHandle.Wait(WaitTimeMs);
             }

src/Ryujinx/AppHost.cs

@@ -501,8 +501,6 @@ namespace Ryujinx.Ava
             _renderingThread.Start();
 
             _viewModel.Volume = ConfigurationState.Instance.System.AudioVolume.Value;
-            
-            Rainbow.Enable();
 
             MainLoop();
 
@@ -592,11 +590,7 @@ namespace Ryujinx.Ava
             foreach (IGamepad gamepad in RyujinxApp.MainWindow.InputManager.GamepadDriver.GetGamepads())
             {
                 gamepad?.ClearLed();
-                gamepad?.Dispose();
             }
-            
-            Rainbow.Disable();
-            Rainbow.Reset();
 
             _isStopped = true;
             Stop();

src/Ryujinx/Updater.cs

@@ -118,8 +118,6 @@ namespace Ryujinx.Ava
                                     OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion));
                                 }
                             }
-                            
-                            Logger.Info?.Print(LogClass.Application, "Up to date.");
 
                             _running = false;
 
@@ -190,8 +188,6 @@ namespace Ryujinx.Ava
                         OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion));
                     }
                 }
-                
-                Logger.Info?.Print(LogClass.Application, "Up to date.");
 
                 _running = false;