diff options
| author | 2022-11-28 09:19:01 -0500 | |
|---|---|---|
| committer | 2022-11-28 10:00:37 -0500 | |
| commit | 2ec7d0b5fda0fe6cbafcc235e3d8cc91b0dc81e0 (patch) | |
| tree | c61fdcf120b96a0487e24f16c6f48b5fb44fafb5 /src/core/hid/emulated_controller.cpp | |
| parent | common/input: Pass ParamPackage by const reference in CreateDevice (diff) | |
| download | yuzu-2ec7d0b5fda0fe6cbafcc235e3d8cc91b0dc81e0.tar.gz yuzu-2ec7d0b5fda0fe6cbafcc235e3d8cc91b0dc81e0.tar.xz yuzu-2ec7d0b5fda0fe6cbafcc235e3d8cc91b0dc81e0.zip | |
common/input: Add helpers functions for creating input and output devices
Avoids the redundancy of needing to explictly specify the common
namespace and the type.
Diffstat (limited to 'src/core/hid/emulated_controller.cpp')
| -rw-r--r-- | src/core/hid/emulated_controller.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index ec1364452..b3188f256 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp | |||
| @@ -146,27 +146,27 @@ void EmulatedController::LoadDevices() { | |||
| 146 | 146 | ||
| 147 | std::transform(button_params.begin() + Settings::NativeButton::BUTTON_HID_BEGIN, | 147 | std::transform(button_params.begin() + Settings::NativeButton::BUTTON_HID_BEGIN, |
| 148 | button_params.begin() + Settings::NativeButton::BUTTON_NS_END, | 148 | button_params.begin() + Settings::NativeButton::BUTTON_NS_END, |
| 149 | button_devices.begin(), Common::Input::CreateDevice<Common::Input::InputDevice>); | 149 | button_devices.begin(), Common::Input::CreateInputDevice); |
| 150 | std::transform(stick_params.begin() + Settings::NativeAnalog::STICK_HID_BEGIN, | 150 | std::transform(stick_params.begin() + Settings::NativeAnalog::STICK_HID_BEGIN, |
| 151 | stick_params.begin() + Settings::NativeAnalog::STICK_HID_END, | 151 | stick_params.begin() + Settings::NativeAnalog::STICK_HID_END, |
| 152 | stick_devices.begin(), Common::Input::CreateDevice<Common::Input::InputDevice>); | 152 | stick_devices.begin(), Common::Input::CreateInputDevice); |
| 153 | std::transform(motion_params.begin() + Settings::NativeMotion::MOTION_HID_BEGIN, | 153 | std::transform(motion_params.begin() + Settings::NativeMotion::MOTION_HID_BEGIN, |
| 154 | motion_params.begin() + Settings::NativeMotion::MOTION_HID_END, | 154 | motion_params.begin() + Settings::NativeMotion::MOTION_HID_END, |
| 155 | motion_devices.begin(), Common::Input::CreateDevice<Common::Input::InputDevice>); | 155 | motion_devices.begin(), Common::Input::CreateInputDevice); |
| 156 | std::transform(trigger_params.begin(), trigger_params.end(), trigger_devices.begin(), | 156 | std::transform(trigger_params.begin(), trigger_params.end(), trigger_devices.begin(), |
| 157 | Common::Input::CreateDevice<Common::Input::InputDevice>); | 157 | Common::Input::CreateInputDevice); |
| 158 | std::transform(battery_params.begin(), battery_params.end(), battery_devices.begin(), | 158 | std::transform(battery_params.begin(), battery_params.end(), battery_devices.begin(), |
| 159 | Common::Input::CreateDevice<Common::Input::InputDevice>); | 159 | Common::Input::CreateInputDevice); |
| 160 | camera_devices = Common::Input::CreateDevice<Common::Input::InputDevice>(camera_params); | 160 | camera_devices = Common::Input::CreateInputDevice(camera_params); |
| 161 | nfc_devices = Common::Input::CreateDevice<Common::Input::InputDevice>(nfc_params); | 161 | nfc_devices = Common::Input::CreateInputDevice(nfc_params); |
| 162 | std::transform(output_params.begin(), output_params.end(), output_devices.begin(), | 162 | std::transform(output_params.begin(), output_params.end(), output_devices.begin(), |
| 163 | Common::Input::CreateDevice<Common::Input::OutputDevice>); | 163 | Common::Input::CreateOutputDevice); |
| 164 | 164 | ||
| 165 | // Initialize TAS devices | 165 | // Initialize TAS devices |
| 166 | std::transform(tas_button_params.begin(), tas_button_params.end(), tas_button_devices.begin(), | 166 | std::transform(tas_button_params.begin(), tas_button_params.end(), tas_button_devices.begin(), |
| 167 | Common::Input::CreateDevice<Common::Input::InputDevice>); | 167 | Common::Input::CreateInputDevice); |
| 168 | std::transform(tas_stick_params.begin(), tas_stick_params.end(), tas_stick_devices.begin(), | 168 | std::transform(tas_stick_params.begin(), tas_stick_params.end(), tas_stick_devices.begin(), |
| 169 | Common::Input::CreateDevice<Common::Input::InputDevice>); | 169 | Common::Input::CreateInputDevice); |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | void EmulatedController::LoadTASParams() { | 172 | void EmulatedController::LoadTASParams() { |