From 76fd41dc5d13bf065645edf8b0e9fae944c558f6 Mon Sep 17 00:00:00 2001 From: Pavel Barabanov Date: Sat, 3 May 2025 06:26:24 +0300 Subject: [PATCH] renamed SetTouchScreenOutputRanges to SetTouchScreenOutputRanges [20.0.0+] --- src/hid_core/resources/touch_screen/touch_screen.cpp | 4 ++-- src/hid_core/resources/touch_screen/touch_screen.h | 2 +- src/hid_core/resources/touch_screen/touch_screen_resource.cpp | 2 +- src/hid_core/resources/touch_screen/touch_screen_resource.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hid_core/resources/touch_screen/touch_screen.cpp b/src/hid_core/resources/touch_screen/touch_screen.cpp index 35efb1786a..e9b1fdba51 100644 --- a/src/hid_core/resources/touch_screen/touch_screen.cpp +++ b/src/hid_core/resources/touch_screen/touch_screen.cpp @@ -82,9 +82,9 @@ Result TouchScreen::SetTouchScreenMagnification(f32 point1_x, f32 point1_y, f32 return ResultSuccess; } -Result TouchScreen::SetTouchScreenResolution(u32 width, u32 height, u64 aruid) { +Result TouchScreen::SetTouchScreenOutputRanges(u32 width, u32 height, u64 aruid) { std::scoped_lock lock{mutex}; - return touch_resource->SetTouchScreenResolution(width, height, aruid); + return touch_resource->SetTouchScreenOutputRanges(width, height, aruid); } Result TouchScreen::SetTouchScreenConfiguration( diff --git a/src/hid_core/resources/touch_screen/touch_screen.h b/src/hid_core/resources/touch_screen/touch_screen.h index 2fcb6247f1..8a08280ac5 100644 --- a/src/hid_core/resources/touch_screen/touch_screen.h +++ b/src/hid_core/resources/touch_screen/touch_screen.h @@ -42,7 +42,7 @@ public: Result ProcessTouchScreenAutoTune(); Result SetTouchScreenMagnification(f32 point1_x, f32 point1_y, f32 point2_x, f32 point2_y); - Result SetTouchScreenResolution(u32 width, u32 height, u64 aruid); + Result SetTouchScreenOutputRanges(u32 width, u32 height, u64 aruid); Result SetTouchScreenConfiguration(const Core::HID::TouchScreenConfigurationForNx& mode, u64 aruid); diff --git a/src/hid_core/resources/touch_screen/touch_screen_resource.cpp b/src/hid_core/resources/touch_screen/touch_screen_resource.cpp index 79ddaa4dfa..7c949be7fe 100644 --- a/src/hid_core/resources/touch_screen/touch_screen_resource.cpp +++ b/src/hid_core/resources/touch_screen/touch_screen_resource.cpp @@ -296,7 +296,7 @@ void TouchResource::SetTouchScreenMagnification(f32 point1_x, f32 point1_y, f32 }; } -Result TouchResource::SetTouchScreenResolution(u32 width, u32 height, u64 aruid) { +Result TouchResource::SetTouchScreenOutputRanges(u32 width, u32 height, u64 aruid) { std::scoped_lock lock{*shared_mutex}; for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) { diff --git a/src/hid_core/resources/touch_screen/touch_screen_resource.h b/src/hid_core/resources/touch_screen/touch_screen_resource.h index 095cddd762..84fa5eb0b6 100644 --- a/src/hid_core/resources/touch_screen/touch_screen_resource.h +++ b/src/hid_core/resources/touch_screen/touch_screen_resource.h @@ -66,7 +66,7 @@ public: Result ProcessTouchScreenAutoTune(); void SetTouchScreenMagnification(f32 point1_x, f32 point1_y, f32 point2_x, f32 point2_y); - Result SetTouchScreenResolution(u32 width, u32 height, u64 aruid); + Result SetTouchScreenOutputRanges(u32 width, u32 height, u64 aruid); Result SetTouchScreenConfiguration( const Core::HID::TouchScreenConfigurationForNx& touch_configuration, u64 aruid);