summaryrefslogtreecommitdiff
path: root/src/hid_core/resources/npad
diff options
context:
space:
mode:
authorGravatar liamwhite2024-02-16 13:11:36 -0500
committerGravatar GitHub2024-02-16 13:11:36 -0500
commitc7588c042ba14bce871d12f5cf4dbf64bb5b3fe9 (patch)
tree59e23eb8b42ec44318ca00f8972a33fe7181984c /src/hid_core/resources/npad
parentMerge pull request #13011 from liamwhite/vi-ipc (diff)
parentservice: set: Migrate ISystemSettingsServer to new IPC (diff)
downloadyuzu-c7588c042ba14bce871d12f5cf4dbf64bb5b3fe9.tar.gz
yuzu-c7588c042ba14bce871d12f5cf4dbf64bb5b3fe9.tar.xz
yuzu-c7588c042ba14bce871d12f5cf4dbf64bb5b3fe9.zip
Merge pull request #13016 from german77/set-interface2
service: set: Migrate ISystemSettingsServer to new IPC
Diffstat (limited to 'src/hid_core/resources/npad')
-rw-r--r--src/hid_core/resources/npad/npad_vibration.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/hid_core/resources/npad/npad_vibration.cpp b/src/hid_core/resources/npad/npad_vibration.cpp
index 02b1f0290..4c103889a 100644
--- a/src/hid_core/resources/npad/npad_vibration.cpp
+++ b/src/hid_core/resources/npad/npad_vibration.cpp
@@ -15,7 +15,7 @@ Result NpadVibration::Activate() {
15 std::scoped_lock lock{mutex}; 15 std::scoped_lock lock{mutex};
16 16
17 f32 master_volume = 1.0f; 17 f32 master_volume = 1.0f;
18 m_set_sys->GetVibrationMasterVolume(master_volume); 18 m_set_sys->GetVibrationMasterVolume(&master_volume);
19 if (master_volume < 0.0f || master_volume > 1.0f) { 19 if (master_volume < 0.0f || master_volume > 1.0f) {
20 return ResultVibrationStrengthOutOfRange; 20 return ResultVibrationStrengthOutOfRange;
21 } 21 }
@@ -57,7 +57,7 @@ Result NpadVibration::GetVibrationMasterVolume(f32& out_volume) const {
57 std::scoped_lock lock{mutex}; 57 std::scoped_lock lock{mutex};
58 58
59 f32 master_volume = 1.0f; 59 f32 master_volume = 1.0f;
60 m_set_sys->GetVibrationMasterVolume(master_volume); 60 m_set_sys->GetVibrationMasterVolume(&master_volume);
61 if (master_volume < 0.0f || master_volume > 1.0f) { 61 if (master_volume < 0.0f || master_volume > 1.0f) {
62 return ResultVibrationStrengthOutOfRange; 62 return ResultVibrationStrengthOutOfRange;
63 } 63 }
@@ -77,7 +77,7 @@ Result NpadVibration::EndPermitVibrationSession() {
77 std::scoped_lock lock{mutex}; 77 std::scoped_lock lock{mutex};
78 78
79 f32 master_volume = 1.0f; 79 f32 master_volume = 1.0f;
80 m_set_sys->GetVibrationMasterVolume(master_volume); 80 m_set_sys->GetVibrationMasterVolume(&master_volume);
81 if (master_volume < 0.0f || master_volume > 1.0f) { 81 if (master_volume < 0.0f || master_volume > 1.0f) {
82 return ResultVibrationStrengthOutOfRange; 82 return ResultVibrationStrengthOutOfRange;
83 } 83 }