diff options
| author | Narr the Reg <juangerman-13@hotmail.com> | 2022-12-23 03:47:51 +0100 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2023-01-20 01:05:22 +0100 |
| commit | 1c08d532e059fab603facb43f758f37fe148c1fc (patch) | |
| tree | 7451b6e38166cb3c422b22678ae0b989cd447de3 /src/core/hid/emulated_controller.h | |
| parent | input_common: Implement joycon nfc (diff) | |
| download | yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.tar yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.tar.gz yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.tar.bz2 yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.tar.lz yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.tar.xz yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.tar.zst yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.zip | |
Diffstat (limited to 'src/core/hid/emulated_controller.h')
| -rw-r--r-- | src/core/hid/emulated_controller.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index d044cc36b..c517aa5d7 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h @@ -40,8 +40,10 @@ using ColorDevices = using BatteryDevices = std::array<std::unique_ptr<Common::Input::InputDevice>, max_emulated_controllers>; using CameraDevices = std::unique_ptr<Common::Input::InputDevice>; -using RingAnalogDevice = std::unique_ptr<Common::Input::InputDevice>; -using NfcDevices = std::unique_ptr<Common::Input::InputDevice>; +using RingAnalogDevices = + std::array<std::unique_ptr<Common::Input::InputDevice>, max_emulated_controllers>; +using NfcDevices = + std::array<std::unique_ptr<Common::Input::InputDevice>, max_emulated_controllers>; using OutputDevices = std::array<std::unique_ptr<Common::Input::OutputDevice>, output_devices_size>; using ButtonParams = std::array<Common::ParamPackage, Settings::NativeButton::NumButtons>; @@ -51,8 +53,8 @@ using TriggerParams = std::array<Common::ParamPackage, Settings::NativeTrigger:: using ColorParams = std::array<Common::ParamPackage, max_emulated_controllers>; using BatteryParams = std::array<Common::ParamPackage, max_emulated_controllers>; using CameraParams = Common::ParamPackage; -using RingAnalogParams = Common::ParamPackage; -using NfcParams = Common::ParamPackage; +using RingAnalogParams = std::array<Common::ParamPackage, max_emulated_controllers>; +using NfcParams = std::array<Common::ParamPackage, max_emulated_controllers>; using OutputParams = std::array<Common::ParamPackage, output_devices_size>; using ButtonValues = std::array<Common::Input::ButtonStatus, Settings::NativeButton::NumButtons>; @@ -538,7 +540,7 @@ private: BatteryDevices battery_devices; ColorDevices color_devices; CameraDevices camera_devices; - RingAnalogDevice ring_analog_device; + RingAnalogDevices ring_analog_devices; NfcDevices nfc_devices; OutputDevices output_devices; |