diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-05-19 19:31:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-19 19:31:40 +0200 |
| commit | 50fe493990edfaefd7ee7372ed9d9fa954c0f2ab (patch) | |
| tree | eb683650e058db6c7e5560c7788048d55804f26e /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | 279fcafdc32354063ecc9ec3ad0512f6eb6b75fc (diff) | |
| parent | 72d08f6c8022dd1181270029980e64d9b70e9ce3 (diff) | |
Merge pull request #11739 from OatmealDome/iokit-be-gone
InputCommon: Remove OSX (IOKit) input backend
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index dfe60c1eae..7ba11fc5b7 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 @@ -64,7 +63,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)); @@ -120,18 +119,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 @@ -180,10 +167,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 @@ -239,7 +222,6 @@ void ControllerInterface::Shutdown() // nothing needed #endif #ifdef CIFACE_USE_OSX - ciface::OSX::DeInit(); ciface::Quartz::DeInit(); #endif #ifdef CIFACE_USE_ANDROID |