diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2024-01-26 15:55:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-26 15:55:47 +0100 |
| commit | 4d206d849ec0ac2e90226eb67d90b310afd0a269 (patch) | |
| tree | bb292c61287e988e13dfd5feaecaa6503d932baf /src/hid_core/resource_manager.cpp | |
| parent | Merge pull request #12801 from german77/vibration-fix (diff) | |
| parent | service: set: Implement more settings functions for Qlaunch (diff) | |
| download | yuzu-4d206d849ec0ac2e90226eb67d90b310afd0a269.tar yuzu-4d206d849ec0ac2e90226eb67d90b310afd0a269.tar.gz yuzu-4d206d849ec0ac2e90226eb67d90b310afd0a269.tar.bz2 yuzu-4d206d849ec0ac2e90226eb67d90b310afd0a269.tar.lz yuzu-4d206d849ec0ac2e90226eb67d90b310afd0a269.tar.xz yuzu-4d206d849ec0ac2e90226eb67d90b310afd0a269.tar.zst yuzu-4d206d849ec0ac2e90226eb67d90b310afd0a269.zip | |
Diffstat (limited to 'src/hid_core/resource_manager.cpp')
| -rw-r--r-- | src/hid_core/resource_manager.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/hid_core/resource_manager.cpp b/src/hid_core/resource_manager.cpp index 8ef0df020..a2295219a 100644 --- a/src/hid_core/resource_manager.cpp +++ b/src/hid_core/resource_manager.cpp @@ -6,6 +6,8 @@ #include "core/core_timing.h" #include "core/hle/kernel/k_shared_memory.h" #include "core/hle/service/ipc_helpers.h" +#include "core/hle/service/set/system_settings_server.h" +#include "core/hle/service/sm/sm.h" #include "hid_core/hid_core.h" #include "hid_core/hid_util.h" #include "hid_core/resource_manager.h" @@ -180,7 +182,11 @@ void ResourceManager::InitializeHidCommonSampler() { debug_pad->SetAppletResource(applet_resource, &shared_mutex); digitizer->SetAppletResource(applet_resource, &shared_mutex); keyboard->SetAppletResource(applet_resource, &shared_mutex); - npad->SetNpadExternals(applet_resource, &shared_mutex, handheld_config); + + const auto settings = + system.ServiceManager().GetService<Service::Set::ISystemSettingsServer>("set:sys"); + npad->SetNpadExternals(applet_resource, &shared_mutex, handheld_config, settings); + six_axis->SetAppletResource(applet_resource, &shared_mutex); mouse->SetAppletResource(applet_resource, &shared_mutex); debug_mouse->SetAppletResource(applet_resource, &shared_mutex); |