diff options
Diffstat (limited to 'src/input_common')
| -rw-r--r-- | src/input_common/drivers/virtual_amiibo.cpp | 4 | ||||
| -rw-r--r-- | src/input_common/drivers/virtual_amiibo.h | 2 | ||||
| -rw-r--r-- | src/input_common/input_engine.h | 3 | ||||
| -rw-r--r-- | src/input_common/input_poller.cpp | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/input_common/drivers/virtual_amiibo.cpp b/src/input_common/drivers/virtual_amiibo.cpp index 8fadb1322..0cd5129da 100644 --- a/src/input_common/drivers/virtual_amiibo.cpp +++ b/src/input_common/drivers/virtual_amiibo.cpp | |||
| @@ -20,7 +20,7 @@ constexpr PadIdentifier identifier = { | |||
| 20 | 20 | ||
| 21 | VirtualAmiibo::VirtualAmiibo(std::string input_engine_) : InputEngine(std::move(input_engine_)) {} | 21 | VirtualAmiibo::VirtualAmiibo(std::string input_engine_) : InputEngine(std::move(input_engine_)) {} |
| 22 | 22 | ||
| 23 | VirtualAmiibo::~VirtualAmiibo() {} | 23 | VirtualAmiibo::~VirtualAmiibo() = default; |
| 24 | 24 | ||
| 25 | Common::Input::PollingError VirtualAmiibo::SetPollingMode( | 25 | Common::Input::PollingError VirtualAmiibo::SetPollingMode( |
| 26 | [[maybe_unused]] const PadIdentifier& identifier_, | 26 | [[maybe_unused]] const PadIdentifier& identifier_, |
| @@ -41,7 +41,7 @@ Common::Input::PollingError VirtualAmiibo::SetPollingMode( | |||
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | Common::Input::NfcState VirtualAmiibo::SupportsNfc( | 43 | Common::Input::NfcState VirtualAmiibo::SupportsNfc( |
| 44 | [[maybe_unused]] const PadIdentifier& identifier_) { | 44 | [[maybe_unused]] const PadIdentifier& identifier_) const { |
| 45 | return Common::Input::NfcState::Success; | 45 | return Common::Input::NfcState::Success; |
| 46 | } | 46 | } |
| 47 | 47 | ||
diff --git a/src/input_common/drivers/virtual_amiibo.h b/src/input_common/drivers/virtual_amiibo.h index 5790e4a1f..9eac07544 100644 --- a/src/input_common/drivers/virtual_amiibo.h +++ b/src/input_common/drivers/virtual_amiibo.h | |||
| @@ -39,7 +39,7 @@ public: | |||
| 39 | Common::Input::PollingError SetPollingMode( | 39 | Common::Input::PollingError SetPollingMode( |
| 40 | const PadIdentifier& identifier_, const Common::Input::PollingMode polling_mode_) override; | 40 | const PadIdentifier& identifier_, const Common::Input::PollingMode polling_mode_) override; |
| 41 | 41 | ||
| 42 | Common::Input::NfcState SupportsNfc(const PadIdentifier& identifier_) override; | 42 | Common::Input::NfcState SupportsNfc(const PadIdentifier& identifier_) const override; |
| 43 | 43 | ||
| 44 | Common::Input::NfcState WriteNfcData(const PadIdentifier& identifier_, | 44 | Common::Input::NfcState WriteNfcData(const PadIdentifier& identifier_, |
| 45 | const std::vector<u8>& data) override; | 45 | const std::vector<u8>& data) override; |
diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.h index 9b8470c6f..cfbdb26bd 100644 --- a/src/input_common/input_engine.h +++ b/src/input_common/input_engine.h | |||
| @@ -129,7 +129,8 @@ public: | |||
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | // Request nfc data from a controller | 131 | // Request nfc data from a controller |
| 132 | virtual Common::Input::NfcState SupportsNfc([[maybe_unused]] const PadIdentifier& identifier) { | 132 | virtual Common::Input::NfcState SupportsNfc( |
| 133 | [[maybe_unused]] const PadIdentifier& identifier) const { | ||
| 133 | return Common::Input::NfcState::NotSupported; | 134 | return Common::Input::NfcState::NotSupported; |
| 134 | } | 135 | } |
| 135 | 136 | ||
diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp index a8eb1442b..75705b67e 100644 --- a/src/input_common/input_poller.cpp +++ b/src/input_common/input_poller.cpp | |||
| @@ -768,7 +768,7 @@ public: | |||
| 768 | return input_engine->SetCameraFormat(identifier, camera_format); | 768 | return input_engine->SetCameraFormat(identifier, camera_format); |
| 769 | } | 769 | } |
| 770 | 770 | ||
| 771 | Common::Input::NfcState SupportsNfc() override { | 771 | Common::Input::NfcState SupportsNfc() const override { |
| 772 | return input_engine->SupportsNfc(identifier); | 772 | return input_engine->SupportsNfc(identifier); |
| 773 | } | 773 | } |
| 774 | 774 | ||