Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Unified Diff: ui/events/ozone/evdev/gamepad_event_converter_evdev.cc

Issue 2899893003: Add generic mapping for gamepad (Closed)
Patch Set: Add generic mapping for gamepad Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/ozone/evdev/gamepad_event_converter_evdev.h ('k') | ui/events/ozone/gamepad/gamepad_mapping.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/evdev/gamepad_event_converter_evdev.cc
diff --git a/ui/events/ozone/evdev/gamepad_event_converter_evdev.cc b/ui/events/ozone/evdev/gamepad_event_converter_evdev.cc
index ecd451377b91039325e22e629d3107ab3226f636..1af45d0762eca0a72defc007d865b35313826a6b 100644
--- a/ui/events/ozone/evdev/gamepad_event_converter_evdev.cc
+++ b/ui/events/ozone/evdev/gamepad_event_converter_evdev.cc
@@ -107,7 +107,7 @@ GamepadEventConverterEvdev::GamepadEventConverterEvdev(
last_hat_right_press_(false),
last_hat_up_press_(false),
last_hat_down_press_(false),
- mapper_(GetGamepadMapper(devinfo.vendor_id(), devinfo.product_id())),
+ mapper_(GetGamepadMapper(devinfo)),
input_device_fd_(std::move(fd)),
dispatcher_(dispatcher) {
input_absinfo abs_info;
@@ -125,7 +125,7 @@ GamepadEventConverterEvdev::GamepadEventConverterEvdev(
if (abs_info.fuzz == 0) {
abs_info.fuzz = abs_info.flat * 0.25f;
}
- mapper_(EV_ABS, code, &mapped_type, &mapped_code);
+ mapper_->Map(EV_ABS, code, &mapped_type, &mapped_code);
axes_[code] = Axis(abs_info, mapped_type, mapped_code);
}
}
@@ -190,7 +190,7 @@ void GamepadEventConverterEvdev::ProcessEvdevKey(
GamepadEventType mapped_type;
uint16_t mapped_code;
- bool found_map = mapper_(EV_KEY, code, &mapped_type, &mapped_code);
+ bool found_map = mapper_->Map(EV_KEY, code, &mapped_type, &mapped_code);
// If we cannot find a map for this event, it will be discarded.
if (!found_map) {
« no previous file with comments | « ui/events/ozone/evdev/gamepad_event_converter_evdev.h ('k') | ui/events/ozone/gamepad/gamepad_mapping.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698