From a8d0afe219adbbd8394e85c6f9c31c0add12c299 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 22 Dec 2018 10:58:34 -0600 Subject: [PATCH] Reduce input mapping detection time to 3 seconds because 5 seconds was ridciculously long and output (rumble) testing time to 2 seconds because 5 seconds was annoyingly long. --- Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp index 9bbf1b17a1..adccc12ea5 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp @@ -12,6 +12,10 @@ namespace MappingCommon { + +constexpr int INPUT_DETECT_TIME = 3000; +constexpr int OUTPUT_DETECT_TIME = 2000; + QString GetExpressionForControl(const QString& control_name, const ciface::Core::DeviceQualifier& control_device, const ciface::Core::DeviceQualifier& default_device, Quote quote) @@ -41,7 +45,9 @@ QString GetExpressionForControl(const QString& control_name, QString DetectExpression(ControlReference* reference, ciface::Core::Device* device, const ciface::Core::DeviceQualifier& default_device, Quote quote) { - ciface::Core::Device::Control* const ctrl = reference->Detect(5000, device); + const int ms = reference->IsInput() ? INPUT_DETECT_TIME : OUTPUT_DETECT_TIME; + + ciface::Core::Device::Control* const ctrl = reference->Detect(ms, device); if (ctrl) {