This is an automated email from the git hooks/post-receive script. wrar-guest pushed a commit to branch master in repository xboxdrv.
commit 074439415ce1abb2069db83f8c24bc91e5e42ee4 Merge: 66e7c7d 3eaaba4 Author: Andrey Rahmatullin <[email protected]> Date: Thu Nov 12 03:14:33 2015 +0500 Merge branch 'upstream' .gitignore | 15 +- .travis.yml | 45 +++++ Makefile | 2 +- NEWS | 35 ++++ README => README.md | 44 ++--- SConstruct | 12 +- VERSION | 2 +- data/org.seul.Xboxdrv.conf | 6 + doc/xboxdrv.xml | 2 +- examples/microsoft-ergonomic-4000.xboxdrv | 3 +- examples/ps4_usb.xboxdrv | 51 ++++++ src/abs_list.x | 12 ++ src/arg_parser.cpp | 98 +++++------ src/arg_parser.hpp | 18 +- src/axis_event.cpp | 10 +- src/axis_event.hpp | 4 +- src/axis_filter.cpp | 4 +- src/axis_filter.hpp | 2 +- src/axis_map.cpp | 2 +- src/axis_map.hpp | 4 +- src/axisevent/abs_axis_event_handler.cpp | 14 +- src/axisevent/abs_axis_event_handler.hpp | 2 +- src/axisevent/key_axis_event_handler.cpp | 10 +- src/axisevent/key_axis_event_handler.hpp | 6 +- src/axisevent/rel_axis_event_handler.cpp | 10 +- src/axisevent/rel_axis_event_handler.hpp | 2 +- src/axisevent/rel_repeat_axis_event_handler.cpp | 8 +- src/axisevent/rel_repeat_axis_event_handler.hpp | 2 +- src/axisfilter/calibration_axis_filter.cpp | 2 +- src/axisfilter/calibration_axis_filter.hpp | 2 +- src/axisfilter/const_axis_filter.cpp | 2 +- src/axisfilter/const_axis_filter.hpp | 2 +- src/axisfilter/deadzone_axis_filter.cpp | 14 +- src/axisfilter/deadzone_axis_filter.hpp | 2 +- src/axisfilter/invert_axis_filter.cpp | 2 +- src/axisfilter/invert_axis_filter.hpp | 2 +- src/axisfilter/log_axis_filter.cpp | 4 +- src/axisfilter/log_axis_filter.hpp | 4 +- src/axisfilter/relative_axis_filter.cpp | 2 +- src/axisfilter/relative_axis_filter.hpp | 2 +- src/axisfilter/response_curve_axis_filter.cpp | 6 +- src/axisfilter/response_curve_axis_filter.hpp | 4 +- src/axisfilter/sensitivity_axis_filter.cpp | 6 +- src/axisfilter/sensitivity_axis_filter.hpp | 2 +- src/button_event.cpp | 8 +- src/button_event.hpp | 6 +- src/button_filter.cpp | 4 +- src/button_filter.hpp | 2 +- src/button_map.cpp | 4 +- src/button_map.hpp | 4 +- src/buttonevent/abs_button_event_handler.cpp | 4 +- src/buttonevent/abs_button_event_handler.hpp | 2 +- src/buttonevent/cycle_key_button_event_handler.cpp | 6 +- src/buttonevent/cycle_key_button_event_handler.hpp | 10 +- src/buttonevent/cycle_key_sequence.cpp | 6 +- src/buttonevent/cycle_key_sequence.hpp | 8 +- src/buttonevent/exec_button_event_handler.cpp | 17 +- src/buttonevent/exec_button_event_handler.hpp | 2 +- src/buttonevent/key_button_event_handler.cpp | 8 +- src/buttonevent/key_button_event_handler.hpp | 4 +- src/buttonevent/macro_button_event_handler.cpp | 6 +- src/buttonevent/macro_button_event_handler.hpp | 42 +++-- src/buttonevent/rel_button_event_handler.cpp | 12 +- src/buttonevent/rel_button_event_handler.hpp | 2 +- src/buttonfilter/autofire_button_filter.cpp | 2 +- src/buttonfilter/autofire_button_filter.hpp | 2 +- src/buttonfilter/click_button_filter.cpp | 2 +- src/buttonfilter/click_button_filter.hpp | 2 +- src/buttonfilter/const_button_filter.cpp | 2 +- src/buttonfilter/const_button_filter.hpp | 2 +- src/buttonfilter/delay_button_filter.cpp | 2 +- src/buttonfilter/delay_button_filter.hpp | 2 +- src/buttonfilter/invert_button_filter.cpp | 2 +- src/buttonfilter/invert_button_filter.hpp | 2 +- src/buttonfilter/log_button_filter.cpp | 4 +- src/buttonfilter/log_button_filter.hpp | 2 +- src/buttonfilter/toggle_button_filter.cpp | 2 +- src/buttonfilter/toggle_button_filter.hpp | 2 +- src/chatpad.cpp | 110 ++++++------ src/chatpad.hpp | 39 ++-- src/command_line_options.cpp | 68 +++---- src/command_line_options.hpp | 10 +- src/controller.cpp | 4 +- src/controller.hpp | 4 +- src/controller_config.cpp | 2 +- src/controller_config.hpp | 4 +- src/controller_factory.cpp | 30 ++-- src/controller_factory.hpp | 8 +- src/controller_match_rule.cpp | 12 +- src/controller_match_rule.hpp | 2 +- src/controller_options.cpp | 2 +- src/controller_options.hpp | 2 +- src/controller_ptr.hpp | 2 +- src/controller_slot.cpp | 2 +- src/controller_slot.hpp | 6 +- src/controller_slot_config.cpp | 24 +-- src/controller_slot_config.hpp | 6 +- src/controller_slot_options.cpp | 4 +- src/controller_slot_options.hpp | 2 +- src/controller_slot_ptr.hpp | 2 +- src/controller_thread.cpp | 6 +- src/controller_thread.hpp | 4 +- src/dbus_subsystem.cpp | 12 +- src/dbus_subsystem.hpp | 2 +- src/dummy_message_processor.cpp | 2 +- src/dummy_message_processor.hpp | 2 +- src/enum_box.hpp | 10 +- src/evdev_absmap.cpp | 18 +- src/evdev_absmap.hpp | 4 +- src/evdev_controller.cpp | 12 +- src/evdev_controller.hpp | 6 +- src/evdev_helper.cpp | 26 +-- src/evdev_helper.hpp | 4 +- src/firestorm_dual_controller.cpp | 20 +-- src/firestorm_dual_controller.hpp | 4 +- src/force_feedback_handler.cpp | 16 +- src/force_feedback_handler.hpp | 12 +- src/generic_usb_controller.cpp | 6 +- src/generic_usb_controller.hpp | 2 +- src/headset.cpp | 12 +- src/headset.hpp | 4 +- src/helper.cpp | 17 +- src/helper.hpp | 6 +- src/ini_builder.hpp | 2 +- src/ini_parser.cpp | 28 +-- src/ini_parser.hpp | 10 +- src/ini_schema.cpp | 52 +++--- src/ini_schema.hpp | 10 +- src/ini_schema_builder.cpp | 2 +- src/ini_schema_builder.hpp | 2 +- src/key_list.x | 196 +++++++++++++++++++++ src/linux_uinput.cpp | 24 +-- src/linux_uinput.hpp | 12 +- src/log.cpp | 8 +- src/log.hpp | 2 +- src/main/main.cpp | 2 +- src/message_processor.hpp | 2 +- src/modifier.cpp | 4 +- src/modifier.hpp | 4 +- src/modifier/axismap_modifier.cpp | 2 +- src/modifier/axismap_modifier.hpp | 4 +- src/modifier/buttonmap_modifier.cpp | 10 +- src/modifier/buttonmap_modifier.hpp | 4 +- src/modifier/dpad_restrictor_modifier.cpp | 4 +- src/modifier/dpad_restrictor_modifier.hpp | 2 +- src/modifier/dpad_rotation_modifier.cpp | 8 +- src/modifier/dpad_rotation_modifier.hpp | 4 +- src/modifier/four_way_restrictor_modifier.cpp | 27 +-- src/modifier/four_way_restrictor_modifier.hpp | 2 +- src/modifier/rotate_axis_modifier.cpp | 2 +- src/modifier/rotate_axis_modifier.hpp | 4 +- src/modifier/square_axis_modifier.cpp | 2 +- src/modifier/square_axis_modifier.hpp | 2 +- src/modifier/statistic_modifier.cpp | 8 +- src/modifier/statistic_modifier.hpp | 2 +- src/options.cpp | 12 +- src/options.hpp | 34 ++-- src/path.cpp | 2 +- src/path.hpp | 2 +- src/playstation3_usb_controller.cpp | 22 +-- src/playstation3_usb_controller.hpp | 2 +- src/pretty_printer.cpp | 14 +- src/pretty_printer.hpp | 4 +- src/raise_exception.hpp | 2 +- src/saitek_p2500_controller.cpp | 14 +- src/saitek_p2500_controller.hpp | 6 +- ..._controller.cpp => saitek_p3600_controller.cpp} | 108 ++++++++---- ..._controller.hpp => saitek_p3600_controller.hpp} | 20 +-- src/select.cpp | 2 +- src/select.hpp | 4 +- src/udev_subsystem.cpp | 34 ++-- src/udev_subsystem.hpp | 2 +- src/ui_abs_event_collector.cpp | 4 +- src/ui_abs_event_collector.hpp | 2 +- src/ui_abs_event_emitter.cpp | 2 +- src/ui_abs_event_emitter.hpp | 2 +- src/ui_event.cpp | 10 +- src/ui_event.hpp | 8 +- src/ui_event_collector.cpp | 8 +- src/ui_event_collector.hpp | 4 +- src/ui_event_emitter.cpp | 2 +- src/ui_event_emitter.hpp | 4 +- src/ui_event_sequence.cpp | 4 +- src/ui_event_sequence.hpp | 10 +- src/ui_key_event_collector.cpp | 2 +- src/ui_key_event_collector.hpp | 2 +- src/ui_key_event_emitter.cpp | 2 +- src/ui_key_event_emitter.hpp | 2 +- src/ui_rel_event_collector.cpp | 4 +- src/ui_rel_event_collector.hpp | 2 +- src/ui_rel_event_emitter.cpp | 2 +- src/ui_rel_event_emitter.hpp | 2 +- src/uinput.cpp | 38 ++-- src/uinput.hpp | 8 +- src/uinput_config.cpp | 18 +- src/uinput_config.hpp | 4 +- src/uinput_message_processor.cpp | 14 +- src/uinput_message_processor.hpp | 2 +- src/uinput_options.cpp | 34 ++-- src/uinput_options.hpp | 6 +- src/unpack.hpp | 2 +- src/usb_controller.cpp | 75 +++++--- src/usb_controller.hpp | 4 +- src/usb_gsource.cpp | 8 +- src/usb_gsource.hpp | 2 +- src/usb_helper.cpp | 4 +- src/usb_helper.hpp | 2 +- src/usb_interface.cpp | 12 +- src/usb_interface.hpp | 4 +- src/usb_subsystem.cpp | 8 +- src/usb_subsystem.hpp | 2 +- src/word_wrap.cpp | 4 +- src/word_wrap.hpp | 2 +- src/xbox360_controller.cpp | 18 +- src/xbox360_controller.hpp | 14 +- src/xbox360_wireless_controller.cpp | 20 +-- src/xbox360_wireless_controller.hpp | 6 +- src/xbox_controller.cpp | 6 +- src/xbox_controller.hpp | 6 +- src/xboxdrv.cpp | 52 +++--- src/xboxdrv.hpp | 4 +- src/xboxdrv_daemon.cpp | 52 +++--- src/xboxdrv_daemon.hpp | 10 +- src/xboxdrv_g_controller.cpp | 4 +- src/xboxdrv_g_controller.hpp | 4 +- src/xboxdrv_g_daemon.cpp | 2 +- src/xboxdrv_g_daemon.hpp | 2 +- src/xboxdrv_main.cpp | 30 ++-- src/xboxdrv_main.hpp | 6 +- src/xboxmsg.cpp | 59 ++++--- src/xboxmsg.hpp | 9 +- src/xpad_device.cpp | 71 +++++--- src/xpad_device.hpp | 6 +- test/dirname_test.cpp | 2 +- test/ini_parser_test.cpp | 4 +- test/unpack_test.cpp | 2 +- test/usb_system_test.cpp | 8 +- tools/evsend.cpp | 2 +- tools/evtest.c | 2 +- tools/evtestplus.cpp | 20 +-- tools/usbcat.cpp | 50 +++--- tools/usbdebug.cpp | 72 ++++---- tools/usbread.cpp | 6 +- tools/usbtool.c | 2 +- xboxdrvctl | 25 ++- 245 files changed, 1670 insertions(+), 1190 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/xboxdrv.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
