summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2022-12-06 00:23:17 +0100
committerLioncash <mathew1800@gmail.com>2022-12-06 00:27:18 +0100
commite4a16f50eff470d9c87a32143e559716171f12b2 (patch)
treed082c473d8b98cdc25a2803531c20c5e849313b9 /src
parentemulated_controller: Use std::move() in GetMappedDevices() (diff)
downloadyuzu-e4a16f50eff470d9c87a32143e559716171f12b2.tar
yuzu-e4a16f50eff470d9c87a32143e559716171f12b2.tar.gz
yuzu-e4a16f50eff470d9c87a32143e559716171f12b2.tar.bz2
yuzu-e4a16f50eff470d9c87a32143e559716171f12b2.tar.lz
yuzu-e4a16f50eff470d9c87a32143e559716171f12b2.tar.xz
yuzu-e4a16f50eff470d9c87a32143e559716171f12b2.tar.zst
yuzu-e4a16f50eff470d9c87a32143e559716171f12b2.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hid/emulated_controller.cpp3
-rw-r--r--src/core/hid/emulated_controller.h2
-rw-r--r--src/yuzu/configuration/configure_input_player.cpp3
3 files changed, 3 insertions, 5 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp
index 09f870eb0..67969e938 100644
--- a/src/core/hid/emulated_controller.cpp
+++ b/src/core/hid/emulated_controller.cpp
@@ -424,8 +424,7 @@ void EmulatedController::RestoreConfig() {
ReloadFromSettings();
}
-std::vector<Common::ParamPackage> EmulatedController::GetMappedDevices(
- EmulatedDeviceIndex device_index) const {
+std::vector<Common::ParamPackage> EmulatedController::GetMappedDevices() const {
std::vector<Common::ParamPackage> devices;
for (const auto& param : button_params) {
if (!param.Has("engine")) {
diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h
index 3f83108d3..fa7a34278 100644
--- a/src/core/hid/emulated_controller.h
+++ b/src/core/hid/emulated_controller.h
@@ -244,7 +244,7 @@ public:
void RestoreConfig();
/// Returns a vector of mapped devices from the mapped button and stick parameters
- std::vector<Common::ParamPackage> GetMappedDevices(EmulatedDeviceIndex device_index) const;
+ std::vector<Common::ParamPackage> GetMappedDevices() const;
// Returns the current mapped button device
Common::ParamPackage GetButtonParam(std::size_t index) const;
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp
index ed21f4b92..b1575b0d3 100644
--- a/src/yuzu/configuration/configure_input_player.cpp
+++ b/src/yuzu/configuration/configure_input_player.cpp
@@ -855,8 +855,7 @@ void ConfigureInputPlayer::UpdateInputDeviceCombobox() {
return;
}
- const auto devices =
- emulated_controller->GetMappedDevices(Core::HID::EmulatedDeviceIndex::AllDevices);
+ const auto devices = emulated_controller->GetMappedDevices();
UpdateInputDevices();
if (devices.empty()) {