diff options
| author | 2021-11-21 14:12:01 -0600 | |
|---|---|---|
| committer | 2021-11-24 20:30:28 -0600 | |
| commit | 746c85b56011b87afb57e37b75953435389fc810 (patch) | |
| tree | 32d31216be1450b5fbe9897e15829ff9bc1f1e7c /src/input_common/drivers/gc_adapter.cpp | |
| parent | input_common: Fix SDL controller with inverted axis (diff) | |
| download | yuzu-746c85b56011b87afb57e37b75953435389fc810.tar.gz yuzu-746c85b56011b87afb57e37b75953435389fc810.tar.xz yuzu-746c85b56011b87afb57e37b75953435389fc810.zip | |
input_common: Move button names to the frontend
Diffstat (limited to 'src/input_common/drivers/gc_adapter.cpp')
| -rw-r--r-- | src/input_common/drivers/gc_adapter.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp index a1b9b6d98..8b6574223 100644 --- a/src/input_common/drivers/gc_adapter.cpp +++ b/src/input_common/drivers/gc_adapter.cpp | |||
| @@ -481,47 +481,47 @@ AnalogMapping GCAdapter::GetAnalogMappingForDevice(const Common::ParamPackage& p | |||
| 481 | return mapping; | 481 | return mapping; |
| 482 | } | 482 | } |
| 483 | 483 | ||
| 484 | std::string GCAdapter::GetUIButtonName(const Common::ParamPackage& params) const { | 484 | Common::Input::ButtonNames GCAdapter::GetUIButtonName(const Common::ParamPackage& params) const { |
| 485 | PadButton button = static_cast<PadButton>(params.Get("button", 0)); | 485 | PadButton button = static_cast<PadButton>(params.Get("button", 0)); |
| 486 | switch (button) { | 486 | switch (button) { |
| 487 | case PadButton::ButtonLeft: | 487 | case PadButton::ButtonLeft: |
| 488 | return "left"; | 488 | return Common::Input::ButtonNames::ButtonLeft; |
| 489 | case PadButton::ButtonRight: | 489 | case PadButton::ButtonRight: |
| 490 | return "right"; | 490 | return Common::Input::ButtonNames::ButtonRight; |
| 491 | case PadButton::ButtonDown: | 491 | case PadButton::ButtonDown: |
| 492 | return "down"; | 492 | return Common::Input::ButtonNames::ButtonDown; |
| 493 | case PadButton::ButtonUp: | 493 | case PadButton::ButtonUp: |
| 494 | return "up"; | 494 | return Common::Input::ButtonNames::ButtonUp; |
| 495 | case PadButton::TriggerZ: | 495 | case PadButton::TriggerZ: |
| 496 | return "Z"; | 496 | return Common::Input::ButtonNames::TriggerZ; |
| 497 | case PadButton::TriggerR: | 497 | case PadButton::TriggerR: |
| 498 | return "R"; | 498 | return Common::Input::ButtonNames::TriggerR; |
| 499 | case PadButton::TriggerL: | 499 | case PadButton::TriggerL: |
| 500 | return "L"; | 500 | return Common::Input::ButtonNames::TriggerL; |
| 501 | case PadButton::ButtonA: | 501 | case PadButton::ButtonA: |
| 502 | return "A"; | 502 | return Common::Input::ButtonNames::ButtonA; |
| 503 | case PadButton::ButtonB: | 503 | case PadButton::ButtonB: |
| 504 | return "B"; | 504 | return Common::Input::ButtonNames::ButtonB; |
| 505 | case PadButton::ButtonX: | 505 | case PadButton::ButtonX: |
| 506 | return "X"; | 506 | return Common::Input::ButtonNames::ButtonX; |
| 507 | case PadButton::ButtonY: | 507 | case PadButton::ButtonY: |
| 508 | return "Y"; | 508 | return Common::Input::ButtonNames::ButtonY; |
| 509 | case PadButton::ButtonStart: | 509 | case PadButton::ButtonStart: |
| 510 | return "start"; | 510 | return Common::Input::ButtonNames::ButtonStart; |
| 511 | default: | 511 | default: |
| 512 | return "Unknown GC"; | 512 | return Common::Input::ButtonNames::Undefined; |
| 513 | } | 513 | } |
| 514 | } | 514 | } |
| 515 | 515 | ||
| 516 | std::string GCAdapter::GetUIName(const Common::ParamPackage& params) const { | 516 | Common::Input::ButtonNames GCAdapter::GetUIName(const Common::ParamPackage& params) const { |
| 517 | if (params.Has("button")) { | 517 | if (params.Has("button")) { |
| 518 | return fmt::format("Button {}", GetUIButtonName(params)); | 518 | return GetUIButtonName(params); |
| 519 | } | 519 | } |
| 520 | if (params.Has("axis")) { | 520 | if (params.Has("axis")) { |
| 521 | return fmt::format("Axis {}", params.Get("axis", 0)); | 521 | return Common::Input::ButtonNames::Value; |
| 522 | } | 522 | } |
| 523 | 523 | ||
| 524 | return "Bad GC Adapter"; | 524 | return Common::Input::ButtonNames::Invalid; |
| 525 | } | 525 | } |
| 526 | 526 | ||
| 527 | } // namespace InputCommon | 527 | } // namespace InputCommon |