diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_input_player_widget.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/debugger/controller.cpp | 10 | ||||
| -rw-r--r-- | src/yuzu/debugger/controller.h | 2 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 3 |
5 files changed, 4 insertions, 17 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 2e0ade815..1519a46ed 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include "input_common/keyboard.h" | 36 | #include "input_common/keyboard.h" |
| 37 | #include "input_common/main.h" | 37 | #include "input_common/main.h" |
| 38 | #include "input_common/mouse/mouse_input.h" | 38 | #include "input_common/mouse/mouse_input.h" |
| 39 | #include "input_common/tas/tas_input.h" | ||
| 39 | #include "video_core/renderer_base.h" | 40 | #include "video_core/renderer_base.h" |
| 40 | #include "video_core/video_core.h" | 41 | #include "video_core/video_core.h" |
| 41 | #include "yuzu/bootmanager.h" | 42 | #include "yuzu/bootmanager.h" |
| @@ -312,6 +313,7 @@ GRenderWindow::~GRenderWindow() { | |||
| 312 | } | 313 | } |
| 313 | 314 | ||
| 314 | void GRenderWindow::OnFrameDisplayed() { | 315 | void GRenderWindow::OnFrameDisplayed() { |
| 316 | input_subsystem->GetTas()->UpdateThread(); | ||
| 315 | if (!first_frame) { | 317 | if (!first_frame) { |
| 316 | first_frame = true; | 318 | first_frame = true; |
| 317 | emit FirstFrameDisplayed(); | 319 | emit FirstFrameDisplayed(); |
diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp index 38c59263c..da328d904 100644 --- a/src/yuzu/configuration/configure_input_player_widget.cpp +++ b/src/yuzu/configuration/configure_input_player_widget.cpp | |||
| @@ -237,10 +237,6 @@ void PlayerControlPreview::UpdateInput() { | |||
| 237 | } | 237 | } |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | if (controller_callback.update != nullptr) { | ||
| 241 | controller_callback.update(true); | ||
| 242 | } | ||
| 243 | |||
| 244 | if (mapping_active) { | 240 | if (mapping_active) { |
| 245 | blink_counter = (blink_counter + 1) % 50; | 241 | blink_counter = (blink_counter + 1) % 50; |
| 246 | } | 242 | } |
diff --git a/src/yuzu/debugger/controller.cpp b/src/yuzu/debugger/controller.cpp index a745699bf..296000ed5 100644 --- a/src/yuzu/debugger/controller.cpp +++ b/src/yuzu/debugger/controller.cpp | |||
| @@ -41,8 +41,7 @@ void ControllerDialog::refreshConfiguration() { | |||
| 41 | constexpr std::size_t player = 0; | 41 | constexpr std::size_t player = 0; |
| 42 | widget->SetPlayerInputRaw(player, players[player].buttons, players[player].analogs); | 42 | widget->SetPlayerInputRaw(player, players[player].buttons, players[player].analogs); |
| 43 | widget->SetControllerType(players[player].controller_type); | 43 | widget->SetControllerType(players[player].controller_type); |
| 44 | ControllerCallback callback{[this](ControllerInput input) { InputController(input); }, | 44 | ControllerCallback callback{[this](ControllerInput input) { InputController(input); }}; |
| 45 | [this](bool update) { UpdateController(update); }}; | ||
| 46 | widget->SetCallBack(callback); | 45 | widget->SetCallBack(callback); |
| 47 | widget->repaint(); | 46 | widget->repaint(); |
| 48 | widget->SetConnectedStatus(players[player].connected); | 47 | widget->SetConnectedStatus(players[player].connected); |
| @@ -84,10 +83,3 @@ void ControllerDialog::InputController(ControllerInput input) { | |||
| 84 | } | 83 | } |
| 85 | input_subsystem->GetTas()->RecordInput(buttons, input.axis_values); | 84 | input_subsystem->GetTas()->RecordInput(buttons, input.axis_values); |
| 86 | } | 85 | } |
| 87 | |||
| 88 | void ControllerDialog::UpdateController(bool update) { | ||
| 89 | if (!update) { | ||
| 90 | return; | ||
| 91 | } | ||
| 92 | input_subsystem->GetTas()->UpdateThread(); | ||
| 93 | } | ||
diff --git a/src/yuzu/debugger/controller.h b/src/yuzu/debugger/controller.h index 448d24b67..7742db58b 100644 --- a/src/yuzu/debugger/controller.h +++ b/src/yuzu/debugger/controller.h | |||
| @@ -25,7 +25,6 @@ struct ControllerInput { | |||
| 25 | 25 | ||
| 26 | struct ControllerCallback { | 26 | struct ControllerCallback { |
| 27 | std::function<void(ControllerInput)> input; | 27 | std::function<void(ControllerInput)> input; |
| 28 | std::function<void(bool)> update; | ||
| 29 | }; | 28 | }; |
| 30 | 29 | ||
| 31 | class ControllerDialog : public QWidget { | 30 | class ControllerDialog : public QWidget { |
| @@ -45,7 +44,6 @@ protected: | |||
| 45 | 44 | ||
| 46 | private: | 45 | private: |
| 47 | void InputController(ControllerInput input); | 46 | void InputController(ControllerInput input); |
| 48 | void UpdateController(bool update); | ||
| 49 | QAction* toggle_view_action = nullptr; | 47 | QAction* toggle_view_action = nullptr; |
| 50 | QFileSystemWatcher* watcher = nullptr; | 48 | QFileSystemWatcher* watcher = nullptr; |
| 51 | PlayerControlPreview* widget; | 49 | PlayerControlPreview* widget; |
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 7d12fcca7..ea77caad5 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -31,8 +31,6 @@ | |||
| 31 | #include "core/hle/service/am/applet_oe.h" | 31 | #include "core/hle/service/am/applet_oe.h" |
| 32 | #include "core/hle/service/am/applets/applets.h" | 32 | #include "core/hle/service/am/applets/applets.h" |
| 33 | 33 | ||
| 34 | #include "input_common/tas/tas_input.h" | ||
| 35 | |||
| 36 | // These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows | 34 | // These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows |
| 37 | // defines. | 35 | // defines. |
| 38 | static FileSys::VirtualDir VfsFilesystemCreateDirectoryWrapper( | 36 | static FileSys::VirtualDir VfsFilesystemCreateDirectoryWrapper( |
| @@ -105,6 +103,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual | |||
| 105 | #include "core/perf_stats.h" | 103 | #include "core/perf_stats.h" |
| 106 | #include "core/telemetry_session.h" | 104 | #include "core/telemetry_session.h" |
| 107 | #include "input_common/main.h" | 105 | #include "input_common/main.h" |
| 106 | #include "input_common/tas/tas_input.h" | ||
| 108 | #include "util/overlay_dialog.h" | 107 | #include "util/overlay_dialog.h" |
| 109 | #include "video_core/gpu.h" | 108 | #include "video_core/gpu.h" |
| 110 | #include "video_core/renderer_base.h" | 109 | #include "video_core/renderer_base.h" |