mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 05:40:01 -06:00
Removed the controller update lock as it is no longer needed.
This commit is contained in:
@ -453,11 +453,6 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
|
|||||||
|
|
||||||
g_controller_interface.UpdateInput();
|
g_controller_interface.UpdateInput();
|
||||||
|
|
||||||
// don't want game thread updating input when we are using it here
|
|
||||||
std::unique_lock<std::recursive_mutex> lk(g_controller_interface.update_lock, std::try_to_lock);
|
|
||||||
if (!lk.owns_lock())
|
|
||||||
return;
|
|
||||||
|
|
||||||
GamepadPage* const current_page = (GamepadPage*)m_pad_notebook->GetPage(m_pad_notebook->GetSelection());
|
GamepadPage* const current_page = (GamepadPage*)m_pad_notebook->GetPage(m_pad_notebook->GetSelection());
|
||||||
|
|
||||||
for (ControlGroupBox* g : current_page->control_groups)
|
for (ControlGroupBox* g : current_page->control_groups)
|
||||||
|
@ -134,8 +134,6 @@ void ControllerInterface::Shutdown()
|
|||||||
//
|
//
|
||||||
void ControllerInterface::UpdateInput()
|
void ControllerInterface::UpdateInput()
|
||||||
{
|
{
|
||||||
std::unique_lock<std::recursive_mutex> lk(update_lock, std::defer_lock);
|
|
||||||
|
|
||||||
for (ciface::Core::Device* d : m_devices)
|
for (ciface::Core::Device* d : m_devices)
|
||||||
d->UpdateInput();
|
d->UpdateInput();
|
||||||
}
|
}
|
||||||
|
@ -122,8 +122,6 @@ public:
|
|||||||
void UpdateReference(ControlReference* control, const ciface::Core::DeviceQualifier& default_device) const;
|
void UpdateReference(ControlReference* control, const ciface::Core::DeviceQualifier& default_device) const;
|
||||||
void UpdateInput();
|
void UpdateInput();
|
||||||
|
|
||||||
std::recursive_mutex update_lock;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool m_is_init;
|
bool m_is_init;
|
||||||
void* m_hwnd;
|
void* m_hwnd;
|
||||||
|
Reference in New Issue
Block a user