early-access version 2660

src/core/hid/emulated_devices.cpp

@@ -448,17 +448,17 @@ void EmulatedDevices::SetRingAnalog(const Common::Input::CallbackStatus& callbac
 }
 
 KeyboardValues EmulatedDevices::GetKeyboardValues() const {
-    std::lock_guard lock{mutex};
+    std::scoped_lock lock{mutex};
     return device_status.keyboard_values;
 }
 
 KeyboardModifierValues EmulatedDevices::GetKeyboardModdifierValues() const {
-    std::lock_guard lock{mutex};
+    std::scoped_lock lock{mutex};
     return device_status.keyboard_moddifier_values;
 }
 
 MouseButtonValues EmulatedDevices::GetMouseButtonsValues() const {
-    std::lock_guard lock{mutex};
+    std::scoped_lock lock{mutex};
     return device_status.mouse_button_values;
 }
 
@@ -467,27 +467,27 @@ RingAnalogValue EmulatedDevices::GetRingSensorValues() const {
 }
 
 KeyboardKey EmulatedDevices::GetKeyboard() const {
-    std::lock_guard lock{mutex};
+    std::scoped_lock lock{mutex};
     return device_status.keyboard_state;
 }
 
 KeyboardModifier EmulatedDevices::GetKeyboardModifier() const {
-    std::lock_guard lock{mutex};
+    std::scoped_lock lock{mutex};
     return device_status.keyboard_moddifier_state;
 }
 
 MouseButton EmulatedDevices::GetMouseButtons() const {
-    std::lock_guard lock{mutex};
+    std::scoped_lock lock{mutex};
     return device_status.mouse_button_state;
 }
 
 MousePosition EmulatedDevices::GetMousePosition() const {
-    std::lock_guard lock{mutex};
+    std::scoped_lock lock{mutex};
     return device_status.mouse_position_state;
 }
 
 AnalogStickState EmulatedDevices::GetMouseWheel() const {
-    std::lock_guard lock{mutex};
+    std::scoped_lock lock{mutex};
     return device_status.mouse_wheel_state;
 }
 
@@ -496,7 +496,7 @@ RingSensorForce EmulatedDevices::GetRingSensorForce() const {
 }
 
 void EmulatedDevices::TriggerOnChange(DeviceTriggerType type) {
-    std::lock_guard lock{callback_mutex};
+    std::scoped_lock lock{callback_mutex};
     for (const auto& poller_pair : callback_list) {
         const InterfaceUpdateCallback& poller = poller_pair.second;
         if (poller.on_change) {
@@ -506,13 +506,13 @@ void EmulatedDevices::TriggerOnChange(DeviceTriggerType type) {
 }
 
 int EmulatedDevices::SetCallback(InterfaceUpdateCallback update_callback) {
-    std::lock_guard lock{callback_mutex};
+    std::scoped_lock lock{callback_mutex};
     callback_list.insert_or_assign(last_callback_key, std::move(update_callback));
     return last_callback_key++;
 }
 
 void EmulatedDevices::DeleteCallback(int key) {
-    std::lock_guard lock{callback_mutex};
+    std::scoped_lock lock{callback_mutex};
     const auto& iterator = callback_list.find(key);
     if (iterator == callback_list.end()) {
         LOG_ERROR(Input, "Tried to delete non-existent callback {}", key);