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_input.h | |
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_input.h')
-rw-r--r-- | src/yuzu/configuration/configure_input.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/yuzu/configuration/configure_input.h b/src/yuzu/configuration/configure_input.h index 0e8b2fd4e..f4eb0d78b 100644 --- a/src/yuzu/configuration/configure_input.h +++ b/src/yuzu/configuration/configure_input.h @@ -8,17 +8,18 @@ #include <memory> #include <QKeyEvent> +#include <QList> #include <QWidget> -#include "yuzu/configuration/configure_input_advanced.h" -#include "yuzu/configuration/configure_input_player.h" - -#include "ui_configure_input.h" - class QCheckBox; class QString; class QTimer; +class ConfigureInputAdvanced; +class ConfigureInputPlayer; + +class InputProfiles; + namespace InputCommon { class InputSubsystem; } @@ -51,6 +52,7 @@ private: void UpdateDockedState(bool is_handheld); void UpdateAllInputDevices(); + void UpdateAllInputProfiles(std::size_t player_index); /// Load configuration settings. void LoadConfiguration(); @@ -61,6 +63,8 @@ private: std::unique_ptr<Ui::ConfigureInput> ui; + std::unique_ptr<InputProfiles> profiles; + std::array<ConfigureInputPlayer*, 8> player_controllers; std::array<QWidget*, 8> player_tabs; std::array<QCheckBox*, 8> player_connected; |