Common: Remove the string parameters from the HookableEvent interface.

This commit is contained in:
Jordan Woyak
2025-11-06 22:34:40 -06:00
parent 5650be6842
commit da6c65bf3b
27 changed files with 83 additions and 125 deletions
@@ -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);
});
@@ -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
@@ -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;
+4 -5
View File
@@ -172,11 +172,10 @@ void InputConfig::RegisterHotplugCallback()
{
// Update control references on all controllers
// as configured devices may have been added or removed.
m_hotplug_event_hook =
g_controller_interface.RegisterDevicesChangedCallback("InputConfig", [this] {
for (auto& controller : m_controllers)
controller->UpdateReferences(g_controller_interface);
});
m_hotplug_event_hook = g_controller_interface.RegisterDevicesChangedCallback([this] {
for (auto& controller : m_controllers)
controller->UpdateReferences(g_controller_interface);
});
}
void InputConfig::UnregisterHotplugCallback()