From 92ca1cb0cbab228e5ef22645cd4f9d06b1da4766 Mon Sep 17 00:00:00 2001 From: Ac_K Date: Sun, 8 May 2022 00:28:54 +0200 Subject: hid: Various fixes and cleanup (#3326) * hid: Various fix and cleanup * Add IsValidNpadIdType * remove () --- Ryujinx.Input/HLE/NpadController.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Ryujinx.Input') diff --git a/Ryujinx.Input/HLE/NpadController.cs b/Ryujinx.Input/HLE/NpadController.cs index 1e0789b7..6706ad0b 100644 --- a/Ryujinx.Input/HLE/NpadController.cs +++ b/Ryujinx.Input/HLE/NpadController.cs @@ -543,14 +543,14 @@ namespace Ryujinx.Input.HLE Dispose(true); } - public void UpdateRumble(ConcurrentQueue<(HidVibrationValue, HidVibrationValue)> queue) + public void UpdateRumble(ConcurrentQueue<(VibrationValue, VibrationValue)> queue) { - if (queue.TryDequeue(out (HidVibrationValue, HidVibrationValue) dualVibrationValue)) + if (queue.TryDequeue(out (VibrationValue, VibrationValue) dualVibrationValue)) { if (_config is StandardControllerInputConfig controllerConfig && controllerConfig.Rumble.EnableRumble) { - HidVibrationValue leftVibrationValue = dualVibrationValue.Item1; - HidVibrationValue rightVibrationValue = dualVibrationValue.Item2; + VibrationValue leftVibrationValue = dualVibrationValue.Item1; + VibrationValue rightVibrationValue = dualVibrationValue.Item2; float low = Math.Min(1f, (float)((rightVibrationValue.AmplitudeLow * 0.85 + rightVibrationValue.AmplitudeHigh * 0.15) * controllerConfig.Rumble.StrongRumble)); float high = Math.Min(1f, (float)((leftVibrationValue.AmplitudeLow * 0.15 + leftVibrationValue.AmplitudeHigh * 0.85) * controllerConfig.Rumble.WeakRumble)); -- cgit v1.2.3