summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2018-12-22 10:58:34 -0600
committerJordan Woyak <jordan.woyak@gmail.com>2018-12-22 10:58:34 -0600
commita8d0afe219adbbd8394e85c6f9c31c0add12c299 (patch)
treeaa3b6ef8fd61eab5c1011fb392573b3bd4fee857 /Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
parent3a145aeae4496a9d6fdb68208777711ac9b9ff18 (diff)
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.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp')
-rw-r--r--Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp8
1 files changed, 7 insertions, 1 deletions
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)
{