summaryrefslogtreecommitdiff
path: root/src/input_common/input_engine.cpp
diff options
context:
space:
mode:
authorGravatar Morph2022-02-05 00:40:28 -0500
committerGravatar Morph2022-02-05 13:18:41 -0500
commitcb30fe50cd074fe05dd1d6e4b0d58116d3d98489 (patch)
tree58450d743d317369266bbbea44734725d8b83ea6 /src/input_common/input_engine.cpp
parentcommon: Implement NewUUID (diff)
downloadyuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.tar.gz
yuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.tar.xz
yuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.zip
input/hid: Migrate to the new UUID implementation
Diffstat (limited to 'src/input_common/input_engine.cpp')
-rw-r--r--src/input_common/input_engine.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/input_common/input_engine.cpp b/src/input_common/input_engine.cpp
index 0508b408d..65ae1b848 100644
--- a/src/input_common/input_engine.cpp
+++ b/src/input_common/input_engine.cpp
@@ -96,7 +96,7 @@ bool InputEngine::GetButton(const PadIdentifier& identifier, int button) const {
96 std::lock_guard lock{mutex}; 96 std::lock_guard lock{mutex};
97 const auto controller_iter = controller_list.find(identifier); 97 const auto controller_iter = controller_list.find(identifier);
98 if (controller_iter == controller_list.cend()) { 98 if (controller_iter == controller_list.cend()) {
99 LOG_ERROR(Input, "Invalid identifier guid={}, pad={}, port={}", identifier.guid.Format(), 99 LOG_ERROR(Input, "Invalid identifier guid={}, pad={}, port={}", identifier.guid.RawString(),
100 identifier.pad, identifier.port); 100 identifier.pad, identifier.port);
101 return false; 101 return false;
102 } 102 }
@@ -113,7 +113,7 @@ bool InputEngine::GetHatButton(const PadIdentifier& identifier, int button, u8 d
113 std::lock_guard lock{mutex}; 113 std::lock_guard lock{mutex};
114 const auto controller_iter = controller_list.find(identifier); 114 const auto controller_iter = controller_list.find(identifier);
115 if (controller_iter == controller_list.cend()) { 115 if (controller_iter == controller_list.cend()) {
116 LOG_ERROR(Input, "Invalid identifier guid={}, pad={}, port={}", identifier.guid.Format(), 116 LOG_ERROR(Input, "Invalid identifier guid={}, pad={}, port={}", identifier.guid.RawString(),
117 identifier.pad, identifier.port); 117 identifier.pad, identifier.port);
118 return false; 118 return false;
119 } 119 }
@@ -130,7 +130,7 @@ f32 InputEngine::GetAxis(const PadIdentifier& identifier, int axis) const {
130 std::lock_guard lock{mutex}; 130 std::lock_guard lock{mutex};
131 const auto controller_iter = controller_list.find(identifier); 131 const auto controller_iter = controller_list.find(identifier);
132 if (controller_iter == controller_list.cend()) { 132 if (controller_iter == controller_list.cend()) {
133 LOG_ERROR(Input, "Invalid identifier guid={}, pad={}, port={}", identifier.guid.Format(), 133 LOG_ERROR(Input, "Invalid identifier guid={}, pad={}, port={}", identifier.guid.RawString(),
134 identifier.pad, identifier.port); 134 identifier.pad, identifier.port);
135 return 0.0f; 135 return 0.0f;
136 } 136 }
@@ -147,7 +147,7 @@ BatteryLevel InputEngine::GetBattery(const PadIdentifier& identifier) const {
147 std::lock_guard lock{mutex}; 147 std::lock_guard lock{mutex};
148 const auto controller_iter = controller_list.find(identifier); 148 const auto controller_iter = controller_list.find(identifier);
149 if (controller_iter == controller_list.cend()) { 149 if (controller_iter == controller_list.cend()) {
150 LOG_ERROR(Input, "Invalid identifier guid={}, pad={}, port={}", identifier.guid.Format(), 150 LOG_ERROR(Input, "Invalid identifier guid={}, pad={}, port={}", identifier.guid.RawString(),
151 identifier.pad, identifier.port); 151 identifier.pad, identifier.port);
152 return BatteryLevel::Charging; 152 return BatteryLevel::Charging;
153 } 153 }
@@ -159,7 +159,7 @@ BasicMotion InputEngine::GetMotion(const PadIdentifier& identifier, int motion)
159 std::lock_guard lock{mutex}; 159 std::lock_guard lock{mutex};
160 const auto controller_iter = controller_list.find(identifier); 160 const auto controller_iter = controller_list.find(identifier);
161 if (controller_iter == controller_list.cend()) { 161 if (controller_iter == controller_list.cend()) {
162 LOG_ERROR(Input, "Invalid identifier guid={}, pad={}, port={}", identifier.guid.Format(), 162 LOG_ERROR(Input, "Invalid identifier guid={}, pad={}, port={}", identifier.guid.RawString(),
163 identifier.pad, identifier.port); 163 identifier.pad, identifier.port);
164 return {}; 164 return {};
165 } 165 }