diff options
| author | Nick <nrmgator@gmail.com> | 2017-08-24 00:31:59 -0400 |
|---|---|---|
| committer | Nick <nrmgator@gmail.com> | 2017-08-24 00:31:59 -0400 |
| commit | ef95bf26cbf826ba627fb66f97c3f91cb24860d6 (patch) | |
| tree | 5855c3f277b71c65e6263eaba9a40aa4ad288ff8 /Source/Core/InputCommon/ControllerInterface | |
| parent | 3abde4464164c580b9f436e6212cf5ad94ef444c (diff) | |
Implement GamePAd and MultiAxisController detection
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm index 7c907cac28..b13701209e 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm @@ -167,7 +167,10 @@ static void DeviceMatchingCallback(void* inContext, IOReturn inResult, void* inS std::string name = GetDeviceRefName(inIOHIDDeviceRef); // Add a device if it's of a type we want - if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) + if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick) || + IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || + IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, + kHIDUsage_GD_MultiAxisController)) { g_controller_interface.AddDevice(std::make_shared<Joystick>(inIOHIDDeviceRef, name)); } |