From f078b15565c8cab08587b8f8629d878615705cfb Mon Sep 17 00:00:00 2001
From: MonsterDruide1 <5958456@gmail.com>
Date: Sun, 20 Jun 2021 00:04:34 +0200
Subject: input_common/tas: Fallback to simple update

---
 src/yuzu/main.cpp | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'src/yuzu/main.cpp')

diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 820e31fa7..6c2835a2f 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -196,7 +196,6 @@ GMainWindow::GMainWindow()
       config{std::make_unique<Config>()}, vfs{std::make_shared<FileSys::RealVfsFilesystem>()},
       provider{std::make_unique<FileSys::ManualContentProvider>()} {
     Common::Log::Initialize();
-    Settings::values.inputSubsystem = input_subsystem;
     LoadTranslation();
 
     setAcceptDrops(true);
@@ -2903,16 +2902,17 @@ void GMainWindow::UpdateWindowTitle(std::string_view title_name, std::string_vie
     }
 }
 
-static std::string GetTasStateDescription(TasInput::TasState state) {
-    switch (state) {
+QString GMainWindow::GetTasStateDescription() const {
+    auto [tas_status, current_tas_frame, total_tas_frames] = input_subsystem->GetTas()->GetStatus();
+    switch (tas_status) {
     case TasInput::TasState::Running:
-        return "Running";
+        return tr("TAS state: Running %1/%2").arg(current_tas_frame).arg(total_tas_frames);
     case TasInput::TasState::Recording:
-        return "Recording";
+        return tr("TAS state: Recording %1").arg(total_tas_frames);
     case TasInput::TasState::Stopped:
-        return "Stopped";
+        return tr("TAS state: Idle %1/%2").arg(current_tas_frame).arg(total_tas_frames);
     default:
-        return "INVALID STATE";
+        return tr("INVALID TAS STATE");
     }
 }
 
@@ -2923,12 +2923,7 @@ void GMainWindow::UpdateStatusBar() {
     }
 
     if (Settings::values.tas_enable) {
-        auto [tas_status, current_tas_frame, total_tas_frames] =
-            input_subsystem->GetTas()->GetStatus();
-        tas_label->setText(tr("%1 TAS %2/%3")
-                               .arg(tr(GetTasStateDescription(tas_status).c_str()))
-                               .arg(current_tas_frame)
-                               .arg(total_tas_frames));
+        tas_label->setText(GetTasStateDescription());
     } else {
         tas_label->clear();
     }
-- 
cgit v1.2.3