summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/bootmanager.cpp3
-rw-r--r--src/yuzu/bootmanager.h10
-rw-r--r--src/yuzu/main.cpp7
3 files changed, 11 insertions, 9 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index 5e19f8cb1..114f17c06 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -320,7 +320,8 @@ GRenderWindow::~GRenderWindow() {
320 320
321void GRenderWindow::OnFrameDisplayed() { 321void GRenderWindow::OnFrameDisplayed() {
322 input_subsystem->GetTas()->UpdateThread(); 322 input_subsystem->GetTas()->UpdateThread();
323 const TasInput::TasState new_tas_state = std::get<0>(input_subsystem->GetTas()->GetStatus()); 323 const InputCommon::TasInput::TasState new_tas_state =
324 std::get<0>(input_subsystem->GetTas()->GetStatus());
324 325
325 if (!first_frame) { 326 if (!first_frame) {
326 last_tas_state = new_tas_state; 327 last_tas_state = new_tas_state;
diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h
index c8a2c59b4..92297a43b 100644
--- a/src/yuzu/bootmanager.h
+++ b/src/yuzu/bootmanager.h
@@ -33,15 +33,15 @@ class InputSubsystem;
33enum class MouseButton; 33enum class MouseButton;
34} // namespace InputCommon 34} // namespace InputCommon
35 35
36namespace InputCommon::TasInput {
37enum class TasState;
38} // namespace InputCommon::TasInput
39
36namespace VideoCore { 40namespace VideoCore {
37enum class LoadCallbackStage; 41enum class LoadCallbackStage;
38class RendererBase; 42class RendererBase;
39} // namespace VideoCore 43} // namespace VideoCore
40 44
41namespace TasInput {
42enum class TasState;
43}
44
45class EmuThread final : public QThread { 45class EmuThread final : public QThread {
46 Q_OBJECT 46 Q_OBJECT
47 47
@@ -245,7 +245,7 @@ private:
245 QWidget* child_widget = nullptr; 245 QWidget* child_widget = nullptr;
246 246
247 bool first_frame = false; 247 bool first_frame = false;
248 TasInput::TasState last_tas_state; 248 InputCommon::TasInput::TasState last_tas_state;
249 249
250 std::array<std::size_t, 16> touch_ids{}; 250 std::array<std::size_t, 16> touch_ids{};
251 251
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index cd8ea221d..09ea21f5e 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -2992,9 +2992,10 @@ void GMainWindow::OnTasStateChanged() {
2992 bool is_running = false; 2992 bool is_running = false;
2993 bool is_recording = false; 2993 bool is_recording = false;
2994 if (emulation_running) { 2994 if (emulation_running) {
2995 const TasInput::TasState tas_status = std::get<0>(input_subsystem->GetTas()->GetStatus()); 2995 const InputCommon::TasInput::TasState tas_status =
2996 is_running = tas_status == TasInput::TasState::Running; 2996 std::get<0>(input_subsystem->GetTas()->GetStatus());
2997 is_recording = tas_status == TasInput::TasState::Recording; 2997 is_running = tas_status == InputCommon::TasInput::TasState::Running;
2998 is_recording = tas_status == InputCommon::TasInput::TasState::Recording;
2998 } 2999 }
2999 3000
3000 ui->action_TAS_Start->setText(is_running ? tr("&Stop Running") : tr("&Start")); 3001 ui->action_TAS_Start->setText(is_running ? tr("&Stop Running") : tr("&Start"));