summaryrefslogtreecommitdiffstats
path: root/src/input_common
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-10-21 20:56:52 +0200
committerNarr the Reg <juangerman-13@hotmail.com>2021-11-25 03:30:25 +0100
commitb5e72de753ae4de5c5fae7087abb00dc4242451d (patch)
treeac1f2b56814bbaaa1a5432c4e1d79c12dd16296d /src/input_common
parentservice/hid: Use ring buffer for gestures (diff)
downloadyuzu-b5e72de753ae4de5c5fae7087abb00dc4242451d.tar
yuzu-b5e72de753ae4de5c5fae7087abb00dc4242451d.tar.gz
yuzu-b5e72de753ae4de5c5fae7087abb00dc4242451d.tar.bz2
yuzu-b5e72de753ae4de5c5fae7087abb00dc4242451d.tar.lz
yuzu-b5e72de753ae4de5c5fae7087abb00dc4242451d.tar.xz
yuzu-b5e72de753ae4de5c5fae7087abb00dc4242451d.tar.zst
yuzu-b5e72de753ae4de5c5fae7087abb00dc4242451d.zip
Diffstat (limited to 'src/input_common')
-rw-r--r--src/input_common/drivers/udp_client.cpp2
-rw-r--r--src/input_common/drivers/udp_client.h4
-rw-r--r--src/input_common/helpers/stick_from_buttons.h1
-rw-r--r--src/input_common/main.cpp7
4 files changed, 9 insertions, 5 deletions
diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp
index f0c0a6b8b..192ab336b 100644
--- a/src/input_common/drivers/udp_client.cpp
+++ b/src/input_common/drivers/udp_client.cpp
@@ -268,6 +268,8 @@ void UDPClient::OnPadData(Response::PadData data, std::size_t client) {
SetButton(identifier, touch_id, true);
continue;
}
+ SetAxis(identifier, touch_id * 2, 0);
+ SetAxis(identifier, touch_id * 2 + 1, 0);
SetButton(identifier, touch_id, false);
}
}
diff --git a/src/input_common/drivers/udp_client.h b/src/input_common/drivers/udp_client.h
index 58b2e921d..639325b17 100644
--- a/src/input_common/drivers/udp_client.h
+++ b/src/input_common/drivers/udp_client.h
@@ -1,6 +1,6 @@
-// Copyright 2021 yuzu Emulator Project
+// Copyright 2018 Citra Emulator Project
// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included
+// Refer to the license.txt file included.
#pragma once
diff --git a/src/input_common/helpers/stick_from_buttons.h b/src/input_common/helpers/stick_from_buttons.h
index 1d6e24c98..82dff5ca8 100644
--- a/src/input_common/helpers/stick_from_buttons.h
+++ b/src/input_common/helpers/stick_from_buttons.h
@@ -1,4 +1,3 @@
-
// Copyright 2017 Citra Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp
index b048783c9..8f7ce59b7 100644
--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@@ -87,25 +87,30 @@ struct InputSubsystem::Impl {
void Shutdown() {
Input::UnregisterFactory<Input::InputDevice>(keyboard->GetEngineName());
+ Input::UnregisterFactory<Input::OutputDevice>(keyboard->GetEngineName());
keyboard.reset();
Input::UnregisterFactory<Input::InputDevice>(mouse->GetEngineName());
+ Input::UnregisterFactory<Input::OutputDevice>(mouse->GetEngineName());
mouse.reset();
Input::UnregisterFactory<Input::InputDevice>(touch_screen->GetEngineName());
touch_screen.reset();
Input::UnregisterFactory<Input::InputDevice>(gcadapter->GetEngineName());
+ Input::UnregisterFactory<Input::OutputDevice>(gcadapter->GetEngineName());
gcadapter.reset();
Input::UnregisterFactory<Input::InputDevice>(udp_client->GetEngineName());
udp_client.reset();
Input::UnregisterFactory<Input::InputDevice>(tas_input->GetEngineName());
+ Input::UnregisterFactory<Input::OutputDevice>(tas_input->GetEngineName());
tas_input.reset();
#ifdef HAVE_SDL2
Input::UnregisterFactory<Input::InputDevice>(sdl->GetEngineName());
+ Input::UnregisterFactory<Input::OutputDevice>(sdl->GetEngineName());
sdl.reset();
#endif
@@ -124,8 +129,6 @@ struct InputSubsystem::Impl {
devices.insert(devices.end(), mouse_devices.begin(), mouse_devices.end());
auto gcadapter_devices = gcadapter->GetInputDevices();
devices.insert(devices.end(), gcadapter_devices.begin(), gcadapter_devices.end());
- auto tas_input_devices = tas_input->GetInputDevices();
- devices.insert(devices.end(), tas_input_devices.begin(), tas_input_devices.end());
#ifdef HAVE_SDL2
auto sdl_devices = sdl->GetInputDevices();
devices.insert(devices.end(), sdl_devices.begin(), sdl_devices.end());