qt_controller: Make use of (Enable/Disable)AllControllerConfiguration
This also moves the use of DisableConfiguration to the destructor.
This commit is contained in:
parent
940375dfbb
commit
b86fcf7c31
|
@ -139,7 +139,6 @@ QtControllerSelectorDialog::QtControllerSelectorDialog(
|
||||||
DisableUnsupportedPlayers();
|
DisableUnsupportedPlayers();
|
||||||
|
|
||||||
for (std::size_t player_index = 0; player_index < NUM_PLAYERS; ++player_index) {
|
for (std::size_t player_index = 0; player_index < NUM_PLAYERS; ++player_index) {
|
||||||
system.HIDCore().GetEmulatedControllerByIndex(player_index)->EnableConfiguration();
|
|
||||||
SetEmulatedControllers(player_index);
|
SetEmulatedControllers(player_index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -205,9 +204,6 @@ QtControllerSelectorDialog::QtControllerSelectorDialog(
|
||||||
// If all the parameters are met AND only allows a single player,
|
// If all the parameters are met AND only allows a single player,
|
||||||
// stop the constructor here as we do not need to continue.
|
// stop the constructor here as we do not need to continue.
|
||||||
if (CheckIfParametersMet() && parameters.enable_single_mode) {
|
if (CheckIfParametersMet() && parameters.enable_single_mode) {
|
||||||
for (std::size_t player_index = 0; player_index < NUM_PLAYERS; ++player_index) {
|
|
||||||
system.HIDCore().GetEmulatedControllerByIndex(player_index)->DisableConfiguration();
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -221,7 +217,9 @@ QtControllerSelectorDialog::QtControllerSelectorDialog(
|
||||||
resize(0, 0);
|
resize(0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
QtControllerSelectorDialog::~QtControllerSelectorDialog() = default;
|
QtControllerSelectorDialog::~QtControllerSelectorDialog() {
|
||||||
|
system.HIDCore().DisableAllControllerConfiguration();
|
||||||
|
}
|
||||||
|
|
||||||
int QtControllerSelectorDialog::exec() {
|
int QtControllerSelectorDialog::exec() {
|
||||||
if (parameters_met && parameters.enable_single_mode) {
|
if (parameters_met && parameters.enable_single_mode) {
|
||||||
|
@ -237,12 +235,11 @@ void QtControllerSelectorDialog::ApplyConfiguration() {
|
||||||
|
|
||||||
Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked());
|
Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked());
|
||||||
Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked());
|
Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked());
|
||||||
for (std::size_t player_index = 0; player_index < NUM_PLAYERS; ++player_index) {
|
|
||||||
system.HIDCore().GetEmulatedControllerByIndex(player_index)->DisableConfiguration();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void QtControllerSelectorDialog::LoadConfiguration() {
|
void QtControllerSelectorDialog::LoadConfiguration() {
|
||||||
|
system.HIDCore().EnableAllControllerConfiguration();
|
||||||
|
|
||||||
const auto* handheld = system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld);
|
const auto* handheld = system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld);
|
||||||
for (std::size_t index = 0; index < NUM_PLAYERS; ++index) {
|
for (std::size_t index = 0; index < NUM_PLAYERS; ++index) {
|
||||||
const auto* controller = system.HIDCore().GetEmulatedControllerByIndex(index);
|
const auto* controller = system.HIDCore().GetEmulatedControllerByIndex(index);
|
||||||
|
|
Loading…
Reference in a new issue