summaryrefslogtreecommitdiffstats
path: root/src/input_common/input_engine.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-02-24 20:42:51 +0100
committerGitHub <noreply@github.com>2022-02-24 20:42:51 +0100
commit1079215871cc15452e58aea59630871ea183feeb (patch)
treeac74f8005fc0f98ebdc3206037a83dc55db5ce1b /src/input_common/input_engine.cpp
parentMerge pull request #7933 from german77/am_update (diff)
parentinput_common: Remove battery duplicated struct and update every button press (diff)
downloadyuzu-1079215871cc15452e58aea59630871ea183feeb.tar
yuzu-1079215871cc15452e58aea59630871ea183feeb.tar.gz
yuzu-1079215871cc15452e58aea59630871ea183feeb.tar.bz2
yuzu-1079215871cc15452e58aea59630871ea183feeb.tar.lz
yuzu-1079215871cc15452e58aea59630871ea183feeb.tar.xz
yuzu-1079215871cc15452e58aea59630871ea183feeb.tar.zst
yuzu-1079215871cc15452e58aea59630871ea183feeb.zip
Diffstat (limited to 'src/input_common/input_engine.cpp')
-rw-r--r--src/input_common/input_engine.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/input_common/input_engine.cpp b/src/input_common/input_engine.cpp
index 65ae1b848..7adf7e3d7 100644
--- a/src/input_common/input_engine.cpp
+++ b/src/input_common/input_engine.cpp
@@ -70,7 +70,7 @@ void InputEngine::SetAxis(const PadIdentifier& identifier, int axis, f32 value)
TriggerOnAxisChange(identifier, axis, value);
}
-void InputEngine::SetBattery(const PadIdentifier& identifier, BatteryLevel value) {
+void InputEngine::SetBattery(const PadIdentifier& identifier, Common::Input::BatteryLevel value) {
{
std::lock_guard lock{mutex};
ControllerData& controller = controller_list.at(identifier);
@@ -143,13 +143,13 @@ f32 InputEngine::GetAxis(const PadIdentifier& identifier, int axis) const {
return axis_iter->second;
}
-BatteryLevel InputEngine::GetBattery(const PadIdentifier& identifier) const {
+Common::Input::BatteryLevel InputEngine::GetBattery(const PadIdentifier& identifier) const {
std::lock_guard lock{mutex};
const auto controller_iter = controller_list.find(identifier);
if (controller_iter == controller_list.cend()) {
LOG_ERROR(Input, "Invalid identifier guid={}, pad={}, port={}", identifier.guid.RawString(),
identifier.pad, identifier.port);
- return BatteryLevel::Charging;
+ return Common::Input::BatteryLevel::Charging;
}
const ControllerData& controller = controller_iter->second;
return controller.battery;
@@ -270,7 +270,7 @@ void InputEngine::TriggerOnAxisChange(const PadIdentifier& identifier, int axis,
}
void InputEngine::TriggerOnBatteryChange(const PadIdentifier& identifier,
- [[maybe_unused]] BatteryLevel value) {
+ [[maybe_unused]] Common::Input::BatteryLevel value) {
std::lock_guard lock{mutex_callback};
for (const auto& poller_pair : callback_list) {
const InputIdentifier& poller = poller_pair.second;