diff options
| author | Matthew Parlane <parlane@gmail.com> | 2015-04-21 11:13:30 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2015-04-21 11:13:30 +1200 |
| commit | a86f2fe2e799e7ea92149d86cf72aa9a46f69421 (patch) | |
| tree | fbe02a554550fb67faa0bcb67bc17e6e69117510 /Source/Core/InputCommon | |
| parent | 82bbada3524f6007b0ad82cf911962c028a728b3 (diff) | |
| parent | c76008b4b9eccf0c8fc04a0dada0313fc6d8c3f6 (diff) | |
Merge pull request #2199 from skidau/remove-controls-lock
Cleaned up the controller locking mechanism
Diffstat (limited to 'Source/Core/InputCommon')
3 files changed, 0 insertions, 6 deletions
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<std::recursive_mutex> 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; diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h index a234cdf167..c339cbb243 100644 --- a/Source/Core/InputCommon/InputConfig.h +++ b/Source/Core/InputCommon/InputConfig.h @@ -26,8 +26,6 @@ public: std::vector<ControllerEmu*> controllers; - std::recursive_mutex controls_lock; // for changing any control references - const char* const ini_name; const char* const gui_name; const char* const profile_name; |