diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-06-29 10:01:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-29 10:01:19 -0400 |
| commit | 4c705db73edfa3c7210eb5821b3f4e5324d642d1 (patch) | |
| tree | 470116d2d52b3a74ad0cd761304f0f65386af708 /src/input_common/drivers/joycon.h | |
| parent | 7de778ad39c761eddf8a40094dae61aa125b5c38 (diff) | |
| parent | ac755476cdaa8bace9c86183125d34dbe4c8cee9 (diff) | |
Merge pull request #10937 from german77/ring
input_common: Remove duplicated enum and fix ring detection
Diffstat (limited to 'src/input_common/drivers/joycon.h')
| -rw-r--r-- | src/input_common/drivers/joycon.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/input_common/drivers/joycon.h b/src/input_common/drivers/joycon.h index 4c323d7d6..112e970e1 100644 --- a/src/input_common/drivers/joycon.h +++ b/src/input_common/drivers/joycon.h @@ -17,7 +17,6 @@ struct Color; struct MotionData; struct TagInfo; enum class ControllerType : u8; -enum class DriverResult; enum class IrsResolution; class JoyconDriver; } // namespace InputCommon::Joycon @@ -112,7 +111,7 @@ private: /// Returns the name of the device in text format std::string JoyconName(Joycon::ControllerType type) const; - Common::Input::NfcState TranslateDriverResult(Joycon::DriverResult result) const; + Common::Input::NfcState TranslateDriverResult(Common::Input::DriverResult result) const; std::jthread scan_thread; |