Selaa lähdekoodia

yuzu: Fix TAS from rebase

german77 4 vuotta sitten
vanhempi
commit
e64ee99f00
3 muutettua tiedostoa jossa 11 lisäystä ja 9 poistoa
  1. 2 1
      src/yuzu/bootmanager.cpp
  2. 5 5
      src/yuzu/bootmanager.h
  3. 4 3
      src/yuzu/main.cpp

+ 2 - 1
src/yuzu/bootmanager.cpp

@@ -320,7 +320,8 @@ GRenderWindow::~GRenderWindow() {
 
 void GRenderWindow::OnFrameDisplayed() {
     input_subsystem->GetTas()->UpdateThread();
-    const TasInput::TasState new_tas_state = std::get<0>(input_subsystem->GetTas()->GetStatus());
+    const InputCommon::TasInput::TasState new_tas_state =
+        std::get<0>(input_subsystem->GetTas()->GetStatus());
 
     if (!first_frame) {
         last_tas_state = new_tas_state;

+ 5 - 5
src/yuzu/bootmanager.h

@@ -33,15 +33,15 @@ class InputSubsystem;
 enum class MouseButton;
 } // namespace InputCommon
 
+namespace InputCommon::TasInput {
+enum class TasState;
+} // namespace InputCommon::TasInput
+
 namespace VideoCore {
 enum class LoadCallbackStage;
 class RendererBase;
 } // namespace VideoCore
 
-namespace TasInput {
-enum class TasState;
-}
-
 class EmuThread final : public QThread {
     Q_OBJECT
 
@@ -245,7 +245,7 @@ private:
     QWidget* child_widget = nullptr;
 
     bool first_frame = false;
-    TasInput::TasState last_tas_state;
+    InputCommon::TasInput::TasState last_tas_state;
 
     std::array<std::size_t, 16> touch_ids{};
 

+ 4 - 3
src/yuzu/main.cpp

@@ -2992,9 +2992,10 @@ void GMainWindow::OnTasStateChanged() {
     bool is_running = false;
     bool is_recording = false;
     if (emulation_running) {
-        const TasInput::TasState tas_status = std::get<0>(input_subsystem->GetTas()->GetStatus());
-        is_running = tas_status == TasInput::TasState::Running;
-        is_recording = tas_status == TasInput::TasState::Recording;
+        const InputCommon::TasInput::TasState tas_status =
+            std::get<0>(input_subsystem->GetTas()->GetStatus());
+        is_running = tas_status == InputCommon::TasInput::TasState::Running;
+        is_recording = tas_status == InputCommon::TasInput::TasState::Recording;
     }
 
     ui->action_TAS_Start->setText(is_running ? tr("&Stop Running") : tr("&Start"));