diff options
| author | bunnei <bunneidev@gmail.com> | 2020-11-17 20:02:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 20:02:27 -0800 |
| commit | abda36636245c416a75774165d2a5b49610952fc (patch) | |
| tree | 0bf3bab90e2155a3a16ffa21eabbc2a4c8f9d39d /src/yuzu/configuration/configure_debug_controller.cpp | |
| parent | 2dc9dbb809eaebff568568fef90bbb0f19f976ad (diff) | |
| parent | e7e8a87927899b69bfe9f8e38f26dac08ec37abe (diff) | |
Merge pull request #4866 from Morph1984/mjolnir-p3-prod
Project Mjölnir: Part 3 - Controller Profiles and Vibration Rework
Diffstat (limited to 'src/yuzu/configuration/configure_debug_controller.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_debug_controller.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/yuzu/configuration/configure_debug_controller.cpp b/src/yuzu/configuration/configure_debug_controller.cpp index 0097c9a295..a878ef9c61 100644 --- a/src/yuzu/configuration/configure_debug_controller.cpp +++ b/src/yuzu/configuration/configure_debug_controller.cpp @@ -4,11 +4,14 @@ #include "ui_configure_debug_controller.h" #include "yuzu/configuration/configure_debug_controller.h" +#include "yuzu/configuration/configure_input_player.h" ConfigureDebugController::ConfigureDebugController(QWidget* parent, - InputCommon::InputSubsystem* input_subsystem) + InputCommon::InputSubsystem* input_subsystem, + InputProfiles* profiles) : QDialog(parent), ui(std::make_unique<Ui::ConfigureDebugController>()), - debug_controller(new ConfigureInputPlayer(this, 9, nullptr, input_subsystem, true)) { + debug_controller( + new ConfigureInputPlayer(this, 9, nullptr, input_subsystem, profiles, true)) { ui->setupUi(this); ui->controllerLayout->addWidget(debug_controller); |