diff options
| author | JMC47 <JMC4789@gmail.com> | 2022-10-03 16:25:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 16:25:40 -0400 |
| commit | 052c7395fbc0789147703a4c5cc754ae28f8f8bd (patch) | |
| tree | c6e206df257937e8373aeeb012e29ea74f0d0fc7 /Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h | |
| parent | cb6d476538afe85c25d30e8679b6f15abe5d1760 (diff) | |
| parent | 51ee05cb35f401c82adf815cbb4f4c3133e7ea84 (diff) | |
Merge pull request #9624 from JosJuice/input-override
Add new "input override" system for TAS input and Android touch controls
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h index c08c072aba..fb10bab074 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h @@ -5,14 +5,18 @@ #include <algorithm> #include <cmath> +#include <functional> #include <memory> +#include <optional> #include <string> +#include <string_view> #include <type_traits> #include <vector> #include "Common/CommonTypes.h" #include "Common/IniFile.h" #include "InputCommon/ControllerEmu/Control/Control.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ControllerEmu { @@ -27,6 +31,9 @@ class NumericSetting; template <typename T> class SettingValue; +using InputOverrideFunction = std::function<std::optional<ControlState>( + const std::string_view group_name, const std::string_view control_name, ControlState state)>; + enum class GroupType { Other, |