From 72d08f6c8022dd1181270029980e64d9b70e9ce3 Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Fri, 7 Apr 2023 15:40:14 -0400 Subject: InputCommon: Remove OSX (IOKit) input backend --- .../ControllerInterface/ControllerInterface.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 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 5b7e27ffe1..004454dd29 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -16,7 +16,6 @@ #include "InputCommon/ControllerInterface/Xlib/XInput2.h" #endif #ifdef CIFACE_USE_OSX -#include "InputCommon/ControllerInterface/OSX/OSX.h" #include "InputCommon/ControllerInterface/Quartz/Quartz.h" #endif #ifdef CIFACE_USE_SDL @@ -61,7 +60,7 @@ void ControllerInterface::Initialize(const WindowSystemInfo& wsi) // nothing needed #endif #ifdef CIFACE_USE_OSX -// nothing needed for OSX and Quartz +// nothing needed for Quartz #endif #ifdef CIFACE_USE_SDL m_input_backends.emplace_back(ciface::SDL::CreateInputBackend(this)); @@ -114,18 +113,6 @@ void ControllerInterface::RefreshDevices(RefreshReason reason) if (!m_is_init) return; -#ifdef CIFACE_USE_OSX - if (m_wsi.type == WindowSystemType::MacOS) - { - std::lock_guard lk_pre_population(m_pre_population_mutex); - // This is needed to stop its threads before locking our mutexes, to avoid deadlocks - // (in case it tried to add a device after we had locked m_devices_population_mutex). - // There doesn't seem to be an easy to way to repopulate OSX devices without restarting its - // hotplug thread. This should not remove its devices, and if it did, calls should be ignored. - ciface::OSX::DeInit(); - } -#endif - // We lock m_devices_population_mutex here to make everything simpler. // Multiple devices classes have their own "hotplug" thread, and can add/remove devices at any // time, while actual writes to "m_devices" are safe, the order in which they happen is not. That @@ -174,10 +161,6 @@ void ControllerInterface::RefreshDevices(RefreshReason reason) #ifdef CIFACE_USE_OSX if (m_wsi.type == WindowSystemType::MacOS) { - { - std::lock_guard lk_pre_population(m_pre_population_mutex); - ciface::OSX::Init(); - } ciface::Quartz::PopulateDevices(m_wsi.render_window); } #endif @@ -233,7 +216,6 @@ void ControllerInterface::Shutdown() // nothing needed #endif #ifdef CIFACE_USE_OSX - ciface::OSX::DeInit(); ciface::Quartz::DeInit(); #endif #ifdef CIFACE_USE_ANDROID -- cgit v1.2.3