octo
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yuzu: Fix TAS from rebase

This commit is contained in:
german77 2021-11-21 22:37:50 -06:00 committed by Narr the Reg
parent 746c85b560
commit e64ee99f00
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/yuzu/bootmanager.cpp
View File

@ -320,7 +320,8 @@ GRenderWindow::~GRenderWindow() {
void GRenderWindow::OnFrameDisplayed() { void GRenderWindow::OnFrameDisplayed() {
input_subsystem->GetTas()->UpdateThread(); 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) { if (!first_frame) {
last_tas_state = new_tas_state; last_tas_state = new_tas_state;

10
src/yuzu/bootmanager.h
View File

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

7
src/yuzu/main.cpp
View File

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