From 746c85b56011b87afb57e37b75953435389fc810 Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Sun, 21 Nov 2021 14:12:01 -0600
Subject: input_common: Move button names to the frontend
---
src/input_common/drivers/sdl_driver.cpp | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
(limited to 'src/input_common/drivers/sdl_driver.cpp')
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp
index d5af6c09b4..90128b6cf6 100644
--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -869,26 +869,25 @@ MotionMapping SDLDriver::GetMotionMappingForDevice(const Common::ParamPackage& p
return mapping;
}
-std::string SDLDriver::GetUIName(const Common::ParamPackage& params) const {
+Common::Input::ButtonNames SDLDriver::GetUIName(const Common::ParamPackage& params) const {
if (params.Has("button")) {
// TODO(German77): Find how to substitue the values for real button names
- return fmt::format("Button {}", params.Get("button", 0));
+ return Common::Input::ButtonNames::Value;
}
if (params.Has("hat")) {
- return fmt::format("Hat {}", params.Get("direction", ""));
+ return Common::Input::ButtonNames::Value;
}
if (params.Has("axis")) {
- return fmt::format("Axis {}", params.Get("axis", ""));
+ return Common::Input::ButtonNames::Value;
}
if (params.Has("axis_x") && params.Has("axis_y") && params.Has("axis_z")) {
- return fmt::format("Axis {},{},{}", params.Get("axis_x", ""), params.Get("axis_y", ""),
- params.Get("axis_z", ""));
+ return Common::Input::ButtonNames::Value;
}
if (params.Has("motion")) {
- return "SDL motion";
+ return Common::Input::ButtonNames::Engine;
}
- return "Bad SDL";
+ return Common::Input::ButtonNames::Invalid;
}
std::string SDLDriver::GetHatButtonName(u8 direction_value) const {
--
cgit v1.2.3-70-g09d2