lux/yuzu
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/yuzu.git synced 2024-12-27 05:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9043 from german77/vector_data

Browse source 
input_common: have an unique vector in callback status
This commit is contained in:
liamwhite 2022-10-09 17:46:45 -04:00 committed by GitHub
parent 55e6d0dae0 224a19758e
commit c3cae9d992
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/input.h
View file

@ -277,8 +277,9 @@ struct CallbackStatus {
BodyColorStatus color_status{};
BatteryStatus battery_status{};
VibrationStatus vibration_status{};
CameraStatus camera_status{};
NfcStatus nfc_status{};
CameraFormat camera_status{CameraFormat::None};
NfcState nfc_status{NfcState::Unknown};
std::vector<u8> raw_data{};
};
// Triggered once every input change

10
src/core/hid/input_converter.cpp
View file

@ -277,7 +277,10 @@ Common::Input::CameraStatus TransformToCamera(const Common::Input::CallbackStatu
Common::Input::CameraStatus camera{};
switch (callback.type) {
case Common::Input::InputType::IrSensor:
camera = callback.camera_status;
camera = {
.format = callback.camera_status,
.data = callback.raw_data,
};
break;
default:
LOG_ERROR(Input, "Conversion from type {} to camera not implemented", callback.type);
@ -291,7 +294,10 @@ Common::Input::NfcStatus TransformToNfc(const Common::Input::CallbackStatus& cal
Common::Input::NfcStatus nfc{};
switch (callback.type) {
case Common::Input::InputType::Nfc:
return callback.nfc_status;
nfc = {
.state = callback.nfc_status,
.data = callback.raw_data,
};
break;
default:
LOG_ERROR(Input, "Conversion from type {} to NFC not implemented", callback.type);

10
src/input_common/input_poller.cpp
View file

@ -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);