diff options
Diffstat (limited to 'src/core/hid/input_interpreter.cpp')
| -rw-r--r-- | src/core/hid/input_interpreter.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/hid/input_interpreter.cpp b/src/core/hid/input_interpreter.cpp index 76d6b8ab0..a6bdd28f2 100644 --- a/src/core/hid/input_interpreter.cpp +++ b/src/core/hid/input_interpreter.cpp | |||
| @@ -5,21 +5,22 @@ | |||
| 5 | #include "core/hid/hid_types.h" | 5 | #include "core/hid/hid_types.h" |
| 6 | #include "core/hid/input_interpreter.h" | 6 | #include "core/hid/input_interpreter.h" |
| 7 | #include "core/hle/service/hid/controllers/npad.h" | 7 | #include "core/hle/service/hid/controllers/npad.h" |
| 8 | #include "core/hle/service/hid/hid.h" | 8 | #include "core/hle/service/hid/hid_server.h" |
| 9 | #include "core/hle/service/hid/resource_manager.h" | ||
| 9 | #include "core/hle/service/sm/sm.h" | 10 | #include "core/hle/service/sm/sm.h" |
| 10 | 11 | ||
| 11 | InputInterpreter::InputInterpreter(Core::System& system) | 12 | InputInterpreter::InputInterpreter(Core::System& system) |
| 12 | : npad{system.ServiceManager() | 13 | : npad{system.ServiceManager() |
| 13 | .GetService<Service::HID::Hid>("hid") | 14 | .GetService<Service::HID::IHidServer>("hid") |
| 14 | ->GetAppletResource() | 15 | ->GetResourceManager() |
| 15 | ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad)} { | 16 | ->GetNpad()} { |
| 16 | ResetButtonStates(); | 17 | ResetButtonStates(); |
| 17 | } | 18 | } |
| 18 | 19 | ||
| 19 | InputInterpreter::~InputInterpreter() = default; | 20 | InputInterpreter::~InputInterpreter() = default; |
| 20 | 21 | ||
| 21 | void InputInterpreter::PollInput() { | 22 | void InputInterpreter::PollInput() { |
| 22 | const auto button_state = npad.GetAndResetPressState(); | 23 | const auto button_state = npad->GetAndResetPressState(); |
| 23 | 24 | ||
| 24 | previous_index = current_index; | 25 | previous_index = current_index; |
| 25 | current_index = (current_index + 1) % button_states.size(); | 26 | current_index = (current_index + 1) % button_states.size(); |