diff options
Diffstat (limited to 'src/core/hid/emulated_controller.cpp')
| -rw-r--r-- | src/core/hid/emulated_controller.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index 44e9f22b9..2bee173b3 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp | |||
| @@ -204,7 +204,7 @@ void EmulatedController::ReloadInput() { | |||
| 204 | if (!button_devices[index]) { | 204 | if (!button_devices[index]) { |
| 205 | continue; | 205 | continue; |
| 206 | } | 206 | } |
| 207 | const auto uuid = Common::NewUUID{button_params[index].Get("guid", "")}; | 207 | const auto uuid = Common::UUID{button_params[index].Get("guid", "")}; |
| 208 | button_devices[index]->SetCallback({ | 208 | button_devices[index]->SetCallback({ |
| 209 | .on_change = | 209 | .on_change = |
| 210 | [this, index, uuid](const Common::Input::CallbackStatus& callback) { | 210 | [this, index, uuid](const Common::Input::CallbackStatus& callback) { |
| @@ -218,7 +218,7 @@ void EmulatedController::ReloadInput() { | |||
| 218 | if (!stick_devices[index]) { | 218 | if (!stick_devices[index]) { |
| 219 | continue; | 219 | continue; |
| 220 | } | 220 | } |
| 221 | const auto uuid = Common::NewUUID{stick_params[index].Get("guid", "")}; | 221 | const auto uuid = Common::UUID{stick_params[index].Get("guid", "")}; |
| 222 | stick_devices[index]->SetCallback({ | 222 | stick_devices[index]->SetCallback({ |
| 223 | .on_change = | 223 | .on_change = |
| 224 | [this, index, uuid](const Common::Input::CallbackStatus& callback) { | 224 | [this, index, uuid](const Common::Input::CallbackStatus& callback) { |
| @@ -232,7 +232,7 @@ void EmulatedController::ReloadInput() { | |||
| 232 | if (!trigger_devices[index]) { | 232 | if (!trigger_devices[index]) { |
| 233 | continue; | 233 | continue; |
| 234 | } | 234 | } |
| 235 | const auto uuid = Common::NewUUID{trigger_params[index].Get("guid", "")}; | 235 | const auto uuid = Common::UUID{trigger_params[index].Get("guid", "")}; |
| 236 | trigger_devices[index]->SetCallback({ | 236 | trigger_devices[index]->SetCallback({ |
| 237 | .on_change = | 237 | .on_change = |
| 238 | [this, index, uuid](const Common::Input::CallbackStatus& callback) { | 238 | [this, index, uuid](const Common::Input::CallbackStatus& callback) { |
| @@ -269,7 +269,7 @@ void EmulatedController::ReloadInput() { | |||
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | // Use a common UUID for TAS | 271 | // Use a common UUID for TAS |
| 272 | static constexpr Common::NewUUID TAS_UUID = Common::NewUUID{ | 272 | static constexpr Common::UUID TAS_UUID = Common::UUID{ |
| 273 | {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xA5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}}; | 273 | {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xA5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}}; |
| 274 | 274 | ||
| 275 | // Register TAS devices. No need to force update | 275 | // Register TAS devices. No need to force update |
| @@ -490,7 +490,7 @@ void EmulatedController::SetMotionParam(std::size_t index, Common::ParamPackage | |||
| 490 | } | 490 | } |
| 491 | 491 | ||
| 492 | void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback, std::size_t index, | 492 | void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback, std::size_t index, |
| 493 | Common::NewUUID uuid) { | 493 | Common::UUID uuid) { |
| 494 | if (index >= controller.button_values.size()) { | 494 | if (index >= controller.button_values.size()) { |
| 495 | return; | 495 | return; |
| 496 | } | 496 | } |
| @@ -639,7 +639,7 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback | |||
| 639 | } | 639 | } |
| 640 | 640 | ||
| 641 | void EmulatedController::SetStick(const Common::Input::CallbackStatus& callback, std::size_t index, | 641 | void EmulatedController::SetStick(const Common::Input::CallbackStatus& callback, std::size_t index, |
| 642 | Common::NewUUID uuid) { | 642 | Common::UUID uuid) { |
| 643 | if (index >= controller.stick_values.size()) { | 643 | if (index >= controller.stick_values.size()) { |
| 644 | return; | 644 | return; |
| 645 | } | 645 | } |
| @@ -689,7 +689,7 @@ void EmulatedController::SetStick(const Common::Input::CallbackStatus& callback, | |||
| 689 | } | 689 | } |
| 690 | 690 | ||
| 691 | void EmulatedController::SetTrigger(const Common::Input::CallbackStatus& callback, | 691 | void EmulatedController::SetTrigger(const Common::Input::CallbackStatus& callback, |
| 692 | std::size_t index, Common::NewUUID uuid) { | 692 | std::size_t index, Common::UUID uuid) { |
| 693 | if (index >= controller.trigger_values.size()) { | 693 | if (index >= controller.trigger_values.size()) { |
| 694 | return; | 694 | return; |
| 695 | } | 695 | } |