diff options
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/Control')
4 files changed, 16 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp index 56c4cba12d..3f5d00d822 100644 --- a/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp +++ b/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp @@ -9,8 +9,14 @@ namespace ControllerEmu { +Control::Control(std::unique_ptr<ControlReference> ref, const std::string& name_, + const std::string& ui_name_) + : control_ref(std::move(ref)), name(name_), ui_name(ui_name_) +{ +} + Control::Control(std::unique_ptr<ControlReference> ref, const std::string& name_) - : control_ref(std::move(ref)), name(name_) + : Control(std::move(ref), name_, name_) { } diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Control.h b/Source/Core/InputCommon/ControllerEmu/Control/Control.h index 1f7a64ed50..b34c843c5d 100644 --- a/Source/Core/InputCommon/ControllerEmu/Control/Control.h +++ b/Source/Core/InputCommon/ControllerEmu/Control/Control.h @@ -18,8 +18,11 @@ public: std::unique_ptr<ControlReference> const control_ref; const std::string name; + const std::string ui_name; protected: + Control(std::unique_ptr<ControlReference> ref, const std::string& name, + const std::string& ui_name); Control(std::unique_ptr<ControlReference> ref, const std::string& name); }; } // namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp index 8ff04e68a1..a213916a83 100644 --- a/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp +++ b/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp @@ -10,6 +10,11 @@ namespace ControllerEmu { +Input::Input(const std::string& name_, const std::string& ui_name_) + : Control(std::make_unique<InputReference>(), name_, ui_name_) +{ +} + Input::Input(const std::string& name_) : Control(std::make_unique<InputReference>(), name_) { } diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Input.h b/Source/Core/InputCommon/ControllerEmu/Control/Input.h index 678514736e..dad90ed12e 100644 --- a/Source/Core/InputCommon/ControllerEmu/Control/Input.h +++ b/Source/Core/InputCommon/ControllerEmu/Control/Input.h @@ -12,6 +12,7 @@ namespace ControllerEmu class Input : public Control { public: + Input(const std::string& name, const std::string& ui_name); explicit Input(const std::string& name); }; } // namespace ControllerEmu |
