diff options
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
3 files changed, 17 insertions, 27 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp index 476aaa5537..a11241d4f8 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp @@ -454,8 +454,8 @@ void RegisterDevicesChangedCallbackIfNeeded(JNIEnv* env, jclass controller_inter const jmethodID controller_interface_on_devices_changed = env->GetStaticMethodID(global_controller_interface_class, "onDevicesChanged", "()V"); - g_controller_interface.RegisterDevicesChangedCallback( - [global_controller_interface_class, controller_interface_on_devices_changed] { + static Common::EventHook event_hook = g_controller_interface.RegisterDevicesChangedCallback( + "Android", [global_controller_interface_class, controller_interface_on_devices_changed] { IDCache::GetEnvForThread()->CallStaticVoidMethod(global_controller_interface_class, controller_interface_on_devices_changed); }); diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index b8651c608d..19ac7d3690 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -413,27 +413,16 @@ bool ControllerInterface::IsMouseCenteringRequested() const // Register a callback to be called when a device is added or removed (as from the input backends' // hotplug thread), or when devices are refreshed // Returns a handle for later removing the callback. -ControllerInterface::HotplugCallbackHandle -ControllerInterface::RegisterDevicesChangedCallback(std::function<void()> callback) -{ - std::lock_guard lk(m_callbacks_mutex); - m_devices_changed_callbacks.emplace_back(std::move(callback)); - return std::prev(m_devices_changed_callbacks.end()); -} -// Unregister a device callback. -void ControllerInterface::UnregisterDevicesChangedCallback(const HotplugCallbackHandle& handle) +Common::EventHook +ControllerInterface::RegisterDevicesChangedCallback(std::string_view name, + Common::HookableEvent<>::CallbackType callback) { - std::lock_guard lk(m_callbacks_mutex); - m_devices_changed_callbacks.erase(handle); + return m_devices_changed_event.Register(std::move(callback), name); } // Invoke all callbacks that were registered -void ControllerInterface::InvokeDevicesChangedCallbacks() const +void ControllerInterface::InvokeDevicesChangedCallbacks() { - m_callbacks_mutex.lock(); - const auto devices_changed_callbacks = m_devices_changed_callbacks; - m_callbacks_mutex.unlock(); - for (const auto& callback : devices_changed_callbacks) - callback(); + m_devices_changed_event.Trigger(); } diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index e5712f0a4f..806c6b4b2a 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -5,12 +5,13 @@ #include <atomic> #include <functional> -#include <list> #include <memory> #include <mutex> +#include "Common/HookableEvent.h" #include "Common/Matrix.h" #include "Common/WindowSystemInfo.h" + #include "InputCommon/ControllerInterface/CoreDevice.h" #include "InputCommon/ControllerInterface/InputBackend.h" @@ -64,8 +65,6 @@ enum class InputChannel class ControllerInterface : public ciface::Core::DeviceContainer { public: - using HotplugCallbackHandle = std::list<std::function<void()>>::iterator; - enum class WindowChangeReason { // Application is shutting down @@ -115,9 +114,9 @@ public: bool IsMouseCenteringRequested() const; - HotplugCallbackHandle RegisterDevicesChangedCallback(std::function<void(void)> callback); - void UnregisterDevicesChangedCallback(const HotplugCallbackHandle& handle); - void InvokeDevicesChangedCallbacks() const; + [[nodiscard]] Common::EventHook + RegisterDevicesChangedCallback(std::string_view name, + Common::HookableEvent<>::CallbackType callback); static void SetCurrentInputChannel(ciface::InputChannel); static ciface::InputChannel GetCurrentInputChannel(); @@ -127,9 +126,11 @@ public: private: void ClearDevices(); - std::list<std::function<void()>> m_devices_changed_callbacks; + void InvokeDevicesChangedCallbacks(); + + Common::HookableEvent<> m_devices_changed_event{"Devices Changed"}; + mutable std::recursive_mutex m_devices_population_mutex; - mutable std::mutex m_callbacks_mutex; std::atomic<bool> m_is_init; // This is now always protected by m_devices_population_mutex, so // it doesn't really need to be a counter or atomic anymore (it could be a raw bool), |