diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2025-11-06 22:08:27 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2025-11-06 22:34:40 -0600 |
| commit | da6c65bf3b83fa1cfe5da5dc5e43ec49b2786b52 (patch) | |
| tree | 1538fff3c783052707c8513738ba5cdc636ece48 /Source/Core/InputCommon/ControllerInterface | |
| parent | 5650be68425960131225bcd3ea5a8dfc85074148 (diff) | |
Common: Remove the string parameters from the HookableEvent interface.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
3 files changed, 5 insertions, 7 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp index a11241d4f8..48eebbb7f6 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp @@ -455,7 +455,7 @@ void RegisterDevicesChangedCallbackIfNeeded(JNIEnv* env, jclass controller_inter env->GetStaticMethodID(global_controller_interface_class, "onDevicesChanged", "()V"); static Common::EventHook event_hook = g_controller_interface.RegisterDevicesChangedCallback( - "Android", [global_controller_interface_class, controller_interface_on_devices_changed] { + [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 19ac7d3690..7393de9950 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -415,10 +415,9 @@ bool ControllerInterface::IsMouseCenteringRequested() const // Returns a handle for later removing the callback. Common::EventHook -ControllerInterface::RegisterDevicesChangedCallback(std::string_view name, - Common::HookableEvent<>::CallbackType callback) +ControllerInterface::RegisterDevicesChangedCallback(Common::HookableEvent<>::CallbackType callback) { - return m_devices_changed_event.Register(std::move(callback), name); + return m_devices_changed_event.Register(std::move(callback)); } // Invoke all callbacks that were registered diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 806c6b4b2a..05a3a99a05 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -115,8 +115,7 @@ public: bool IsMouseCenteringRequested() const; [[nodiscard]] Common::EventHook - RegisterDevicesChangedCallback(std::string_view name, - Common::HookableEvent<>::CallbackType callback); + RegisterDevicesChangedCallback(Common::HookableEvent<>::CallbackType callback); static void SetCurrentInputChannel(ciface::InputChannel); static ciface::InputChannel GetCurrentInputChannel(); @@ -128,7 +127,7 @@ private: void InvokeDevicesChangedCallbacks(); - Common::HookableEvent<> m_devices_changed_event{"Devices Changed"}; + Common::HookableEvent<> m_devices_changed_event; mutable std::recursive_mutex m_devices_population_mutex; std::atomic<bool> m_is_init; |
