diff options
author | David Marcec <dmarcecguzman@gmail.com> | 2019-09-22 15:42:41 +0200 |
---|---|---|
committer | David Marcec <dmarcecguzman@gmail.com> | 2019-09-22 15:42:41 +0200 |
commit | 654427d4d0c5da168206c164c806c334d46498a7 (patch) | |
tree | ed9013df3562c191d8e798b5ba945b1b0e24a100 /src/core/hle/service/hid/controllers/npad.h | |
parent | Merge pull request #2884 from ogniK5377/deglobal-sys-services (diff) | |
download | yuzu-654427d4d0c5da168206c164c806c334d46498a7.tar yuzu-654427d4d0c5da168206c164c806c334d46498a7.tar.gz yuzu-654427d4d0c5da168206c164c806c334d46498a7.tar.bz2 yuzu-654427d4d0c5da168206c164c806c334d46498a7.tar.lz yuzu-654427d4d0c5da168206c164c806c334d46498a7.tar.xz yuzu-654427d4d0c5da168206c164c806c334d46498a7.tar.zst yuzu-654427d4d0c5da168206c164c806c334d46498a7.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index f72a9900c..1bc3d55d6 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -109,7 +109,7 @@ public: void VibrateController(const std::vector<u32>& controller_ids, const std::vector<Vibration>& vibrations); - Kernel::SharedPtr<Kernel::ReadableEvent> GetStyleSetChangedEvent() const; + Kernel::SharedPtr<Kernel::ReadableEvent> GetStyleSetChangedEvent(u32 npad_id) const; Vibration GetLastVibration() const; void AddNewController(NPadControllerType controller); @@ -315,7 +315,8 @@ private: sticks; std::vector<u32> supported_npad_id_types{}; NpadHoldType hold_type{NpadHoldType::Vertical}; - Kernel::EventPair styleset_changed_event; + // Each controller should have their own styleset changed event + std::array<Kernel::EventPair, 10> styleset_changed_events; Vibration last_processed_vibration{}; std::array<ControllerHolder, 10> connected_controllers{}; bool can_controllers_vibrate{true}; |