Merge pull request #10113 from JosJuice/tas-input-latency

DolphinQt: Reduce latency of TAS input's controller input passthrough
dolphin-emu · Sep 20, 2021 · 28e6e87 · 28e6e87
2 parents e7c0b8e + 1a5e0c2
commit 28e6e87
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/Source/Core/DolphinQt/QtUtils/QueueOnObject.h b/Source/Core/DolphinQt/QtUtils/QueueOnObject.h
@@ -17,3 +17,11 @@ static void QueueOnObject(T* obj, F&& func)
   QObject src;
   QObject::connect(&src, &QObject::destroyed, obj, std::forward<F>(func), Qt::QueuedConnection);
 }
+
+template <typename T, typename F>
+static void QueueOnObjectBlocking(T* obj, F&& func)
+{
+  QObject src;
+  QObject::connect(&src, &QObject::destroyed, obj, std::forward<F>(func),
+                   Qt::BlockingQueuedConnection);
+}
diff --git a/Source/Core/DolphinQt/TAS/TASInputWindow.cpp b/Source/Core/DolphinQt/TAS/TASInputWindow.cpp
@@ -179,12 +179,12 @@ void TASInputWindow::GetButton(TASCheckBox* checkbox, UX& buttons, UX mask)
     if (pressed)
     {
       m_checkbox_set_by_controller[checkbox] = true;
-      QueueOnObject(checkbox, [checkbox] { checkbox->setChecked(true); });
+      QueueOnObjectBlocking(checkbox, [checkbox] { checkbox->setChecked(true); });
     }
     else if (m_checkbox_set_by_controller.count(checkbox) && m_checkbox_set_by_controller[checkbox])
     {
       m_checkbox_set_by_controller[checkbox] = false;
-      QueueOnObject(checkbox, [checkbox] { checkbox->setChecked(false); });
+      QueueOnObjectBlocking(checkbox, [checkbox] { checkbox->setChecked(false); });
     }
   }
 
@@ -202,7 +202,9 @@ void TASInputWindow::GetSpinBoxU8(QSpinBox* spin, u8& controller_value)
   {
     if (!m_spinbox_most_recent_values_u8.count(spin) ||
         m_spinbox_most_recent_values_u8[spin] != controller_value)
-      QueueOnObject(spin, [spin, controller_value] { spin->setValue(controller_value); });
+    {
+      QueueOnObjectBlocking(spin, [spin, controller_value] { spin->setValue(controller_value); });
+    }
 
     m_spinbox_most_recent_values_u8[spin] = controller_value;
   }
@@ -220,7 +222,9 @@ void TASInputWindow::GetSpinBoxU16(QSpinBox* spin, u16& controller_value)
   {
     if (!m_spinbox_most_recent_values_u16.count(spin) ||
         m_spinbox_most_recent_values_u16[spin] != controller_value)
-      QueueOnObject(spin, [spin, controller_value] { spin->setValue(controller_value); });
+    {
+      QueueOnObjectBlocking(spin, [spin, controller_value] { spin->setValue(controller_value); });
+    }
 
     m_spinbox_most_recent_values_u16[spin] = controller_value;
   }