summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-11-22 05:37:50 +0100
committerNarr the Reg <juangerman-13@hotmail.com>2021-11-25 03:30:29 +0100
commite64ee99f00c6d2d884113f79785d4aec9fc05db8 (patch)
tree2474337869fecc94ff5dbc8fb0ed0704a2ea75b7 /src
parentinput_common: Move button names to the frontend (diff)
downloadyuzu-e64ee99f00c6d2d884113f79785d4aec9fc05db8.tar
yuzu-e64ee99f00c6d2d884113f79785d4aec9fc05db8.tar.gz
yuzu-e64ee99f00c6d2d884113f79785d4aec9fc05db8.tar.bz2
yuzu-e64ee99f00c6d2d884113f79785d4aec9fc05db8.tar.lz
yuzu-e64ee99f00c6d2d884113f79785d4aec9fc05db8.tar.xz
yuzu-e64ee99f00c6d2d884113f79785d4aec9fc05db8.tar.zst
yuzu-e64ee99f00c6d2d884113f79785d4aec9fc05db8.zip
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() {
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;
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;
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{};
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() {
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"));