From b5d4e8d37ec240632c7be40d6f670da10d9de2a4 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 13 Nov 2014 00:10:02 -0800 Subject: ControllerInterface: Remove unused "force" parameter I'm not sure when this nonsense of forcing locking the mutex when it's already taken should have ever taken effect, but let's be thankful it isn't now. That was a badly worded sentence. --- .../InputCommon/ControllerInterface/ControllerInterface.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp') diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index e75df76a36..ddfde30118 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -135,13 +135,11 @@ void ControllerInterface::Shutdown() // // Update input for all devices, return true if all devices returned successful // -bool ControllerInterface::UpdateInput(const bool force) +bool ControllerInterface::UpdateInput() { std::unique_lock lk(update_lock, std::defer_lock); - if (force) - lk.lock(); - else if (!lk.try_lock()) + if (!lk.try_lock()) return false; size_t ok_count = 0; @@ -163,13 +161,11 @@ bool ControllerInterface::UpdateInput(const bool force) // // Update output for all devices, return true if all devices returned successful // -bool ControllerInterface::UpdateOutput(const bool force) +bool ControllerInterface::UpdateOutput() { std::unique_lock lk(update_lock, std::defer_lock); - if (force) - lk.lock(); - else if (!lk.try_lock()) + if (!lk.try_lock()) return false; size_t ok_count = 0; -- cgit v1.2.3