diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-10-09 23:46:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-09 23:46:45 +0200 |
| commit | c3cae9d99263afd46a1d3205b29cfa62bebd18b3 (patch) | |
| tree | ec1f256daf46822a808a5abbab415bb6137ecd75 /src/input_common/input_poller.cpp | |
| parent | Merge pull request #8766 from Kelebek1/regs (diff) | |
| parent | input_common: have an unique vector in callback status (diff) | |
| download | yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.tar yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.tar.gz yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.tar.bz2 yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.tar.lz yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.tar.xz yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.tar.zst yuzu-c3cae9d99263afd46a1d3205b29cfa62bebd18b3.zip | |
Diffstat (limited to 'src/input_common/input_poller.cpp')
| -rw-r--r-- | src/input_common/input_poller.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp index 75705b67e..ca33fb4eb 100644 --- a/src/input_common/input_poller.cpp +++ b/src/input_common/input_poller.cpp @@ -691,9 +691,12 @@ public: } void OnChange() { + const auto camera_status = GetStatus(); + const Common::Input::CallbackStatus status{ .type = Common::Input::InputType::IrSensor, - .camera_status = GetStatus(), + .camera_status = camera_status.format, + .raw_data = camera_status.data, }; TriggerOnChange(status); @@ -732,9 +735,12 @@ public: } void OnChange() { + const auto nfc_status = GetStatus(); + const Common::Input::CallbackStatus status{ .type = Common::Input::InputType::Nfc, - .nfc_status = GetStatus(), + .nfc_status = nfc_status.state, + .raw_data = nfc_status.data, }; TriggerOnChange(status); |