summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/Control
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/Control')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Control.cpp8
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Control.h5
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Input.cpp7
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Input.h4
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Output.cpp3
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Output.h2
6 files changed, 16 insertions, 13 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp
index 3f5d00d822..7ea3ec27d5 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp
@@ -9,14 +9,14 @@
namespace ControllerEmu
{
-Control::Control(std::unique_ptr<ControlReference> ref, const std::string& name_,
+Control::Control(std::unique_ptr<ControlReference> ref, bool translate_, const std::string& name_,
const std::string& ui_name_)
- : control_ref(std::move(ref)), name(name_), ui_name(ui_name_)
+ : control_ref(std::move(ref)), translate(translate_), name(name_), ui_name(ui_name_)
{
}
-Control::Control(std::unique_ptr<ControlReference> ref, const std::string& name_)
- : Control(std::move(ref), name_, name_)
+Control::Control(std::unique_ptr<ControlReference> ref, bool translate_, const std::string& name_)
+ : Control(std::move(ref), translate_, name_, name_)
{
}
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Control.h b/Source/Core/InputCommon/ControllerEmu/Control/Control.h
index b34c843c5d..f5c2e394ea 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Control.h
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Control.h
@@ -17,12 +17,13 @@ public:
virtual ~Control();
std::unique_ptr<ControlReference> const control_ref;
+ const bool translate;
const std::string name;
const std::string ui_name;
protected:
- Control(std::unique_ptr<ControlReference> ref, const std::string& name,
+ Control(std::unique_ptr<ControlReference> ref, bool translate, const std::string& name,
const std::string& ui_name);
- Control(std::unique_ptr<ControlReference> ref, const std::string& name);
+ Control(std::unique_ptr<ControlReference> ref, bool translate, 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 a213916a83..ca872b5cbd 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp
@@ -10,12 +10,13 @@
namespace ControllerEmu
{
-Input::Input(const std::string& name_, const std::string& ui_name_)
- : Control(std::make_unique<InputReference>(), name_, ui_name_)
+Input::Input(bool translate_, const std::string& name_, const std::string& ui_name_)
+ : Control(std::make_unique<InputReference>(), translate_, name_, ui_name_)
{
}
-Input::Input(const std::string& name_) : Control(std::make_unique<InputReference>(), name_)
+Input::Input(bool translate_, const std::string& name_)
+ : Control(std::make_unique<InputReference>(), translate_, name_)
{
}
} // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Input.h b/Source/Core/InputCommon/ControllerEmu/Control/Input.h
index dad90ed12e..1782249026 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Input.h
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Input.h
@@ -12,7 +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);
+ Input(bool translate, const std::string& name, const std::string& ui_name);
+ Input(bool translate, const std::string& name);
};
} // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp
index a031893410..9089b15b7f 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp
@@ -10,7 +10,8 @@
namespace ControllerEmu
{
-Output::Output(const std::string& name_) : Control(std::make_unique<OutputReference>(), name_)
+Output::Output(bool translate, const std::string& name_)
+ : Control(std::make_unique<OutputReference>(), translate, name_)
{
}
} // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Output.h b/Source/Core/InputCommon/ControllerEmu/Control/Output.h
index 415c67f7d9..74aa85e165 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Output.h
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Output.h
@@ -12,6 +12,6 @@ namespace ControllerEmu
class Output : public Control
{
public:
- explicit Output(const std::string& name);
+ Output(bool translate, const std::string& name);
};
} // namespace ControllerEmu