summaryrefslogtreecommitdiff
path: root/src/core/hid/emulated_devices.cpp
diff options
context:
space:
mode:
authorGravatar Narr the Reg2022-04-07 13:52:51 -0500
committerGravatar Narr the Reg2022-04-07 13:52:51 -0500
commit9c85cb354a6c00f82278e6c39d4b474c49dd4c5a (patch)
tree4dfac6429ce3019c7c7a8d4f477f6ac8ec873915 /src/core/hid/emulated_devices.cpp
parentcore: hid: Reduce the amount of dataraces (diff)
downloadyuzu-9c85cb354a6c00f82278e6c39d4b474c49dd4c5a.tar.gz
yuzu-9c85cb354a6c00f82278e6c39d4b474c49dd4c5a.tar.xz
yuzu-9c85cb354a6c00f82278e6c39d4b474c49dd4c5a.zip
core: hid: Replace lock_guard with scoped_lock
Diffstat (limited to 'src/core/hid/emulated_devices.cpp')
-rw-r--r--src/core/hid/emulated_devices.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/core/hid/emulated_devices.cpp b/src/core/hid/emulated_devices.cpp
index f899f8ac0..cc0dcd931 100644
--- a/src/core/hid/emulated_devices.cpp
+++ b/src/core/hid/emulated_devices.cpp
@@ -411,47 +411,47 @@ void EmulatedDevices::SetMouseStick(const Common::Input::CallbackStatus& callbac
411} 411}
412 412
413KeyboardValues EmulatedDevices::GetKeyboardValues() const { 413KeyboardValues EmulatedDevices::GetKeyboardValues() const {
414 std::lock_guard lock{mutex}; 414 std::scoped_lock lock{mutex};
415 return device_status.keyboard_values; 415 return device_status.keyboard_values;
416} 416}
417 417
418KeyboardModifierValues EmulatedDevices::GetKeyboardModdifierValues() const { 418KeyboardModifierValues EmulatedDevices::GetKeyboardModdifierValues() const {
419 std::lock_guard lock{mutex}; 419 std::scoped_lock lock{mutex};
420 return device_status.keyboard_moddifier_values; 420 return device_status.keyboard_moddifier_values;
421} 421}
422 422
423MouseButtonValues EmulatedDevices::GetMouseButtonsValues() const { 423MouseButtonValues EmulatedDevices::GetMouseButtonsValues() const {
424 std::lock_guard lock{mutex}; 424 std::scoped_lock lock{mutex};
425 return device_status.mouse_button_values; 425 return device_status.mouse_button_values;
426} 426}
427 427
428KeyboardKey EmulatedDevices::GetKeyboard() const { 428KeyboardKey EmulatedDevices::GetKeyboard() const {
429 std::lock_guard lock{mutex}; 429 std::scoped_lock lock{mutex};
430 return device_status.keyboard_state; 430 return device_status.keyboard_state;
431} 431}
432 432
433KeyboardModifier EmulatedDevices::GetKeyboardModifier() const { 433KeyboardModifier EmulatedDevices::GetKeyboardModifier() const {
434 std::lock_guard lock{mutex}; 434 std::scoped_lock lock{mutex};
435 return device_status.keyboard_moddifier_state; 435 return device_status.keyboard_moddifier_state;
436} 436}
437 437
438MouseButton EmulatedDevices::GetMouseButtons() const { 438MouseButton EmulatedDevices::GetMouseButtons() const {
439 std::lock_guard lock{mutex}; 439 std::scoped_lock lock{mutex};
440 return device_status.mouse_button_state; 440 return device_status.mouse_button_state;
441} 441}
442 442
443MousePosition EmulatedDevices::GetMousePosition() const { 443MousePosition EmulatedDevices::GetMousePosition() const {
444 std::lock_guard lock{mutex}; 444 std::scoped_lock lock{mutex};
445 return device_status.mouse_position_state; 445 return device_status.mouse_position_state;
446} 446}
447 447
448AnalogStickState EmulatedDevices::GetMouseWheel() const { 448AnalogStickState EmulatedDevices::GetMouseWheel() const {
449 std::lock_guard lock{mutex}; 449 std::scoped_lock lock{mutex};
450 return device_status.mouse_wheel_state; 450 return device_status.mouse_wheel_state;
451} 451}
452 452
453void EmulatedDevices::TriggerOnChange(DeviceTriggerType type) { 453void EmulatedDevices::TriggerOnChange(DeviceTriggerType type) {
454 std::lock_guard lock{callback_mutex}; 454 std::scoped_lock lock{callback_mutex};
455 for (const auto& poller_pair : callback_list) { 455 for (const auto& poller_pair : callback_list) {
456 const InterfaceUpdateCallback& poller = poller_pair.second; 456 const InterfaceUpdateCallback& poller = poller_pair.second;
457 if (poller.on_change) { 457 if (poller.on_change) {
@@ -461,13 +461,13 @@ void EmulatedDevices::TriggerOnChange(DeviceTriggerType type) {
461} 461}
462 462
463int EmulatedDevices::SetCallback(InterfaceUpdateCallback update_callback) { 463int EmulatedDevices::SetCallback(InterfaceUpdateCallback update_callback) {
464 std::lock_guard lock{callback_mutex}; 464 std::scoped_lock lock{callback_mutex};
465 callback_list.insert_or_assign(last_callback_key, std::move(update_callback)); 465 callback_list.insert_or_assign(last_callback_key, std::move(update_callback));
466 return last_callback_key++; 466 return last_callback_key++;
467} 467}
468 468
469void EmulatedDevices::DeleteCallback(int key) { 469void EmulatedDevices::DeleteCallback(int key) {
470 std::lock_guard lock{callback_mutex}; 470 std::scoped_lock lock{callback_mutex};
471 const auto& iterator = callback_list.find(key); 471 const auto& iterator = callback_list.find(key);
472 if (iterator == callback_list.end()) { 472 if (iterator == callback_list.end()) {
473 LOG_ERROR(Input, "Tried to delete non-existent callback {}", key); 473 LOG_ERROR(Input, "Tried to delete non-existent callback {}", key);