From 156ffef98c2f3b19201134b79b3db56c1478d81b Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Thu, 24 Jun 2021 17:59:58 -0400 Subject: [PATCH] WiimoteScannerDarwin: Fix lint --- Source/Core/Core/HW/WiimoteReal/IOLinux.h | 4 ++-- Source/Core/Core/HW/WiimoteReal/IOdarwin.h | 1 + Source/Core/Core/HW/WiimoteReal/IOdarwin.mm | 14 +++++++------- Source/Core/Core/HW/WiimoteReal/IOhidapi.h | 4 ++-- Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/HW/WiimoteReal/IOLinux.h b/Source/Core/Core/HW/WiimoteReal/IOLinux.h index ba7b3d3224..0269991740 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOLinux.h +++ b/Source/Core/Core/HW/WiimoteReal/IOLinux.h @@ -46,8 +46,8 @@ public: ~WiimoteScannerLinux() override; bool IsReady() const override; void FindWiimotes(std::vector&, Wiimote*&) override; - void Update() override {} // not needed on Linux - void RequestStopSearching() override {} // not needed on Linux + void Update() override {} // not needed on Linux + void RequestStopSearching() override {} // not needed on Linux private: int m_device_id; int m_device_sock; diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.h b/Source/Core/Core/HW/WiimoteReal/IOdarwin.h index 0521dbcc89..fd474b6048 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOdarwin.h +++ b/Source/Core/Core/HW/WiimoteReal/IOdarwin.h @@ -25,6 +25,7 @@ public: void FindWiimotes(std::vector&, Wiimote*&) override; void Update() override {} // not needed void RequestStopSearching() override { m_stop_scanning = true; } + private: IOBluetoothHostController* m_host_controller; bool m_stop_scanning = false; diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm index d650ea0105..34d10b083d 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm @@ -27,13 +27,13 @@ WiimoteScannerDarwin::WiimoteScannerDarwin() if (![m_host_controller addressAsString]) { WARN_LOG_FMT(WIIMOTE, "No Bluetooth host controller"); - + [m_host_controller release]; m_host_controller = nil; - + return; } - + [m_host_controller retain]; } @@ -41,7 +41,7 @@ WiimoteScannerDarwin::~WiimoteScannerDarwin() { [m_host_controller release]; m_host_controller = nil; - + m_stop_scanning = true; } @@ -52,7 +52,7 @@ void WiimoteScannerDarwin::FindWiimotes(std::vector& found_wiimotes, { return; } - + IOBluetoothDeviceInquiry* bti; found_board = nullptr; @@ -66,7 +66,7 @@ void WiimoteScannerDarwin::FindWiimotes(std::vector& found_wiimotes, { ERROR_LOG_FMT(WIIMOTE, "Unable to do Bluetooth discovery"); [sbt release]; - + return; } @@ -98,7 +98,7 @@ void WiimoteScannerDarwin::FindWiimotes(std::vector& found_wiimotes, found_wiimotes.push_back(wm); } } - + [bti release]; [sbt release]; } diff --git a/Source/Core/Core/HW/WiimoteReal/IOhidapi.h b/Source/Core/Core/HW/WiimoteReal/IOhidapi.h index 1214e852e2..2cc4505533 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOhidapi.h +++ b/Source/Core/Core/HW/WiimoteReal/IOhidapi.h @@ -38,8 +38,8 @@ public: ~WiimoteScannerHidapi(); bool IsReady() const override; void FindWiimotes(std::vector&, Wiimote*&) override; - void Update() override {} // not needed for hidapi - void RequestStopSearching() override {} // not needed for hidapi + void Update() override {} // not needed for hidapi + void RequestStopSearching() override {} // not needed for hidapi }; } // namespace WiimoteReal diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index f95af96833..397cc0774e 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -545,12 +545,12 @@ void WiimoteScanner::StopThread() if (m_scan_thread_running.TestAndClear()) { SetScanMode(WiimoteScanMode::DO_NOT_SCAN); - + for (const auto& backend : m_backends) { backend->RequestStopSearching(); } - + m_scan_thread.join(); } }