From 7d207f7248ac89d3a92bd1af40f0f7d7de4b5386 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Sat, 24 Jul 2021 08:09:10 -0700 Subject: [PATCH] WiimoteReal: Remove unused IsReady and IsScannerReady functions The only call of `IsScannerReady` was removed by 81be0001a907aae50259a3d7230829908af34d38, and most of the `IsReady` functions were only called by `IsScannerReady`. The one exception was in `WiimoteScannerLinux`, which is now a private function instead of inheriting from the one in `WiimoteScannerBackend`. --- Source/Core/Core/HW/WiimoteReal/IOAndroid.h | 1 - Source/Core/Core/HW/WiimoteReal/IODummy.h | 1 - Source/Core/Core/HW/WiimoteReal/IOLinux.h | 3 +-- Source/Core/Core/HW/WiimoteReal/IOWin.cpp | 10 ---------- Source/Core/Core/HW/WiimoteReal/IOWin.h | 1 - Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp | 5 ----- Source/Core/Core/HW/WiimoteReal/IOhidapi.h | 1 - Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 11 ----------- Source/Core/Core/HW/WiimoteReal/WiimoteReal.h | 6 ------ 9 files changed, 1 insertion(+), 38 deletions(-) diff --git a/Source/Core/Core/HW/WiimoteReal/IOAndroid.h b/Source/Core/Core/HW/WiimoteReal/IOAndroid.h index fc257a8ad6..4a79b90ca4 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOAndroid.h +++ b/Source/Core/Core/HW/WiimoteReal/IOAndroid.h @@ -48,7 +48,6 @@ class WiimoteScannerAndroid final : public WiimoteScannerBackend public: WiimoteScannerAndroid() = default; ~WiimoteScannerAndroid() override = default; - bool IsReady() const override { return true; } FindResults FindAttachedWiimotes() override; diff --git a/Source/Core/Core/HW/WiimoteReal/IODummy.h b/Source/Core/Core/HW/WiimoteReal/IODummy.h index 2fe6e9a71f..ff6f0b2c46 100644 --- a/Source/Core/Core/HW/WiimoteReal/IODummy.h +++ b/Source/Core/Core/HW/WiimoteReal/IODummy.h @@ -12,7 +12,6 @@ class WiimoteScannerDummy final : public WiimoteScannerBackend public: WiimoteScannerDummy() = default; ~WiimoteScannerDummy() override = default; - bool IsReady() const override { return false; } void Update() override {} void RequestStopSearching() override {} }; diff --git a/Source/Core/Core/HW/WiimoteReal/IOLinux.h b/Source/Core/Core/HW/WiimoteReal/IOLinux.h index 7f88ac89b8..28b2eb2364 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOLinux.h +++ b/Source/Core/Core/HW/WiimoteReal/IOLinux.h @@ -41,8 +41,6 @@ public: WiimoteScannerLinux(); ~WiimoteScannerLinux() override; - bool IsReady() const override; - // FYI: This backend only supports connecting remotes just found via Bluetooth inquiry. FindResults FindNewWiimotes() override; @@ -52,6 +50,7 @@ public: private: bool Open(); void Close(); + bool IsReady() const; int m_device_id{-1}; int m_device_sock{-1}; diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp index 00bf2376a8..b65bab19b5 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp @@ -754,14 +754,4 @@ auto WiimoteScannerWindows::FindAttachedWiimotes() -> FindResults return FindWiimoteHIDDevices(); } -bool WiimoteScannerWindows::IsReady() const -{ - bool found_radio = false; - EnumerateRadios([&](auto) { - found_radio = true; - return EnumerationControl::Stop; - }); - return found_radio; -} - } // namespace WiimoteReal diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.h b/Source/Core/Core/HW/WiimoteReal/IOWin.h index aa7b426288..7bc72aab6e 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOWin.h +++ b/Source/Core/Core/HW/WiimoteReal/IOWin.h @@ -62,7 +62,6 @@ public: }; WiimoteScannerWindows(); - bool IsReady() const override; FindResults FindNewWiimotes() override; FindResults FindAttachedWiimotes() override; diff --git a/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp b/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp index 9f4bb4c251..36c9a2377d 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp @@ -103,11 +103,6 @@ WiimoteScannerHidapi::~WiimoteScannerHidapi() ERROR_LOG_FMT(WIIMOTE, "Failed to clean up hidapi."); } -bool WiimoteScannerHidapi::IsReady() const -{ - return true; -} - auto WiimoteScannerHidapi::FindAttachedWiimotes() -> FindResults { FindResults results; diff --git a/Source/Core/Core/HW/WiimoteReal/IOhidapi.h b/Source/Core/Core/HW/WiimoteReal/IOhidapi.h index 16cb6c858d..f4fe46a18e 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOhidapi.h +++ b/Source/Core/Core/HW/WiimoteReal/IOhidapi.h @@ -35,7 +35,6 @@ class WiimoteScannerHidapi final : public WiimoteScannerBackend public: WiimoteScannerHidapi(); ~WiimoteScannerHidapi() override; - bool IsReady() const override; FindResults FindAttachedWiimotes() override; diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index 639e467bd6..79129b3a92 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -127,11 +127,6 @@ void ProcessWiimotePool() } } -bool IsScannerReady() -{ - return s_wiimote_scanner.IsReady(); -} - void AddWiimoteToPool(std::unique_ptr wiimote) { // Our real wiimote class requires an index. @@ -592,12 +587,6 @@ void WiimoteScanner::SetScanMode(WiimoteScanMode scan_mode) m_scan_mode_changed_or_population_event.Set(); } -bool WiimoteScanner::IsReady() const -{ - std::lock_guard lg(m_backends_mutex); - return std::ranges::any_of(m_backends, &WiimoteScannerBackend::IsReady); -} - static void CheckForDisconnectedWiimotes() { std::lock_guard lk(g_wiimotes_mutex); diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h index 940eedeab1..1512d134ec 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h @@ -181,9 +181,6 @@ class WiimoteScannerBackend public: virtual ~WiimoteScannerBackend() = default; - // Note: Invoked from UI thread. - virtual bool IsReady() const = 0; - // function called when not looking for more Wiimotes virtual void Update() = 0; // requests the backend to stop scanning if FindWiimotes is blocking @@ -220,8 +217,6 @@ public: void SetScanMode(WiimoteScanMode scan_mode); void PopulateDevices(); - bool IsReady() const; - private: void ThreadFunc(); void PoolThreadFunc(); @@ -259,5 +254,4 @@ void InitAdapterClass(); void HandleWiimotesInControllerInterfaceSettingChange(); void PopulateDevices(); void ProcessWiimotePool(); -bool IsScannerReady(); } // namespace WiimoteReal