From 6e7e808b6614f98674dba7290bea2ea044c4d5d2 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 29 Jan 2025 02:02:46 -0600 Subject: DolphinQt/Mapping: Add setting to enable waiting for alternate mappings using the OR-operator. --- Source/Core/InputCommon/ControllerInterface/MappingCommon.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/MappingCommon.h') diff --git a/Source/Core/InputCommon/ControllerInterface/MappingCommon.h b/Source/Core/InputCommon/ControllerInterface/MappingCommon.h index 1822125557..f58813a50c 100644 --- a/Source/Core/InputCommon/ControllerInterface/MappingCommon.h +++ b/Source/Core/InputCommon/ControllerInterface/MappingCommon.h @@ -17,13 +17,16 @@ enum class Quote }; std::string GetExpressionForControl(const std::string& control_name, - const ciface::Core::DeviceQualifier& control_device, - const ciface::Core::DeviceQualifier& default_device, + const Core::DeviceQualifier& control_device, + const Core::DeviceQualifier& default_device, Quote quote = Quote::On); -std::string BuildExpression(const std::vector&, - const ciface::Core::DeviceQualifier& default_device, Quote quote); +std::string BuildExpression(const Core::InputDetector::Results&, + const Core::DeviceQualifier& default_device, Quote quote); -void RemoveSpuriousTriggerCombinations(std::vector*); +void RemoveSpuriousTriggerCombinations(Core::InputDetector::Results*); +void RemoveDetectionsAfterTimePoint(Core::InputDetector::Results*, + Core::DeviceContainer::Clock::time_point after); +bool ContainsCompleteDetection(const Core::InputDetector::Results&); } // namespace ciface::MappingCommon -- cgit v1.2.3