diff options
| author | 2022-12-17 17:16:13 -0800 | |
|---|---|---|
| committer | 2022-12-17 17:16:13 -0800 | |
| commit | 48108a8c9b28e08f86aab5c2ad41414e455f4706 (patch) | |
| tree | 2dc3ff390a17ebdee32958eac619632cef424fe4 /src/core/hid/emulated_controller.h | |
| parent | Merge pull request #7450 from FernandoS27/ndc-vulkan (diff) | |
| parent | input_common: Add virtual gamepad (diff) | |
| download | yuzu-48108a8c9b28e08f86aab5c2ad41414e455f4706.tar.gz yuzu-48108a8c9b28e08f86aab5c2ad41414e455f4706.tar.xz yuzu-48108a8c9b28e08f86aab5c2ad41414e455f4706.zip | |
Merge pull request #9456 from german77/virtual_gamepad
input_common: Add virtual gamepad
Diffstat (limited to 'src/core/hid/emulated_controller.h')
| -rw-r--r-- | src/core/hid/emulated_controller.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index fa7a34278..a398543a6 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h | |||
| @@ -385,6 +385,9 @@ private: | |||
| 385 | /// Set the params for TAS devices | 385 | /// Set the params for TAS devices |
| 386 | void LoadTASParams(); | 386 | void LoadTASParams(); |
| 387 | 387 | ||
| 388 | /// Set the params for virtual pad devices | ||
| 389 | void LoadVirtualGamepadParams(); | ||
| 390 | |||
| 388 | /** | 391 | /** |
| 389 | * @param use_temporary_value If true tmp_npad_type will be used | 392 | * @param use_temporary_value If true tmp_npad_type will be used |
| 390 | * @return true if the controller style is fullkey | 393 | * @return true if the controller style is fullkey |
| @@ -500,6 +503,12 @@ private: | |||
| 500 | ButtonDevices tas_button_devices; | 503 | ButtonDevices tas_button_devices; |
| 501 | StickDevices tas_stick_devices; | 504 | StickDevices tas_stick_devices; |
| 502 | 505 | ||
| 506 | // Virtual gamepad related variables | ||
| 507 | ButtonParams virtual_button_params; | ||
| 508 | StickParams virtual_stick_params; | ||
| 509 | ButtonDevices virtual_button_devices; | ||
| 510 | StickDevices virtual_stick_devices; | ||
| 511 | |||
| 503 | mutable std::mutex mutex; | 512 | mutable std::mutex mutex; |
| 504 | mutable std::mutex callback_mutex; | 513 | mutable std::mutex callback_mutex; |
| 505 | std::unordered_map<int, ControllerUpdateCallback> callback_list; | 514 | std::unordered_map<int, ControllerUpdateCallback> callback_list; |