From c76008b4b9eccf0c8fc04a0dada0313fc6d8c3f6 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 12 Mar 2015 23:41:30 +1100 Subject: Removed the controller update lock as it is no longer needed. --- Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 2 -- Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | 2 -- 2 files changed, 4 deletions(-) (limited to 'Source/Core/InputCommon') diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 1330cb1e0a..00a9579daf 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -134,8 +134,6 @@ void ControllerInterface::Shutdown() // void ControllerInterface::UpdateInput() { - std::unique_lock lk(update_lock, std::defer_lock); - for (ciface::Core::Device* d : m_devices) d->UpdateInput(); } diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 9ab8427ad2..e69907337f 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -122,8 +122,6 @@ public: void UpdateReference(ControlReference* control, const ciface::Core::DeviceQualifier& default_device) const; void UpdateInput(); - std::recursive_mutex update_lock; - private: bool m_is_init; void* m_hwnd; -- cgit v1.2.3