From e6c4bf52f0eb2c9c78e983ffbc667891463d3253 Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Sun, 27 Jun 2021 14:02:38 -0500
Subject: input_common/tas: Add swap controller

---
 src/yuzu/configuration/config.cpp                  |  5 ++++
 .../configure_input_player_widget.cpp              | 34 ++++++++++++----------
 src/yuzu/configuration/configure_tas.ui            |  3 --
 src/yuzu/main.cpp                                  |  2 +-
 4 files changed, 24 insertions(+), 20 deletions(-)

(limited to 'src/yuzu')

diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 99e318a8f..a0dfa06df 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -1205,6 +1205,11 @@ void Config::SaveControlValues() {
     WriteBasicSetting(Settings::values.emulate_analog_keyboard);
     WriteBasicSetting(Settings::values.mouse_panning_sensitivity);
 
+    WriteSetting(QStringLiteral("enable_tas"), Settings::values.tas_enable, false);
+    WriteSetting(QStringLiteral("loop_tas"), Settings::values.tas_loop, false);
+    WriteSetting(QStringLiteral("swap_tas_controllers"), Settings::values.tas_swap_controllers,
+                 true);
+    WriteSetting(QStringLiteral("tas_pause_on_load"), Settings::values.pause_tas_on_load, true);
     qt_config->endGroup();
 }
 
diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp
index b905fc73d..ba3720c03 100644
--- a/src/yuzu/configuration/configure_input_player_widget.cpp
+++ b/src/yuzu/configuration/configure_input_player_widget.cpp
@@ -175,10 +175,7 @@ void PlayerControlPreview::ResetInputs() {
 }
 
 void PlayerControlPreview::UpdateInput() {
-    if (controller_callback.update != nullptr) {
-        controller_callback.update(std::move(true));
-    }
-    if (!is_enabled && !mapping_active) {
+    if (!is_enabled && !mapping_active && !Settings::values.tas_enable) {
         return;
     }
     bool input_changed = false;
@@ -223,20 +220,25 @@ void PlayerControlPreview::UpdateInput() {
         }
     }
 
-    ControllerInput input{};
     if (input_changed) {
         update();
-        input.changed = true;
-    }
-    input.axis_values[Settings::NativeAnalog::LStick] = {
-        axis_values[Settings::NativeAnalog::LStick].value.x(),
-        axis_values[Settings::NativeAnalog::LStick].value.y()};
-    input.axis_values[Settings::NativeAnalog::RStick] = {
-        axis_values[Settings::NativeAnalog::RStick].value.x(),
-        axis_values[Settings::NativeAnalog::RStick].value.y()};
-    input.button_values = button_values;
-    if (controller_callback.input != nullptr) {
-        controller_callback.input(std::move(input));
+        ControllerInput input{
+            .axis_values =
+                {std::pair<float, float>{axis_values[Settings::NativeAnalog::LStick].value.x(),
+                                         axis_values[Settings::NativeAnalog::LStick].value.y()},
+                 std::pair<float, float>{axis_values[Settings::NativeAnalog::RStick].value.x(),
+                                         axis_values[Settings::NativeAnalog::RStick].value.y()}},
+            .button_values = button_values,
+            .changed = true,
+        };
+
+        if (controller_callback.input != nullptr) {
+            controller_callback.input(std::move(input));
+        }
+    }
+
+    if (controller_callback.update != nullptr) {
+        controller_callback.update(std::move(true));
     }
 
     if (mapping_active) {
diff --git a/src/yuzu/configuration/configure_tas.ui b/src/yuzu/configuration/configure_tas.ui
index 906e073ff..445904d8f 100644
--- a/src/yuzu/configuration/configure_tas.ui
+++ b/src/yuzu/configuration/configure_tas.ui
@@ -31,9 +31,6 @@
                 </item>
                 <item row="1" column="0" colspan="4">
                   <widget class="QCheckBox" name="tas_control_swap">
-                    <property name="enabled">
-                      <bool>false</bool>
-                    </property>
                     <property name="text">
                       <string>Automatic controller profile swapping</string>
                     </property>
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 560de89af..7d12fcca7 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -2921,7 +2921,7 @@ QString GMainWindow::GetTasStateDescription() const {
     case TasInput::TasState::Stopped:
         return tr("TAS state: Idle %1/%2").arg(current_tas_frame).arg(total_tas_frames);
     default:
-        return tr("INVALID TAS STATE");
+        return tr("TAS State: Invalid");
     }
 }
 
-- 
cgit v1.2.3