asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OSX: Revert back to kHIDUsage_GD_Joystick

Browse source 
Bug introduced in 547a57777b.
This commit is contained in:
Rémi Verschelde 2017-01-09 10:05:50 +01:00 committed by GitHub
parent be13360f56
commit 4163be67a1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/osx/joypad_osx.cpp
View file

@ -234,7 +234,7 @@ static bool is_joypad(IOHIDDeviceRef p_device_ref) {
if (refCF) { if (refCF) {
CFNumberGetValue((CFNumberRef) refCF, kCFNumberSInt32Type, &usage); CFNumberGetValue((CFNumberRef) refCF, kCFNumberSInt32Type, &usage);
} }
if ((usage != kHIDUsage_GD_Joypad && if ((usage != kHIDUsage_GD_Joystick &&
usage != kHIDUsage_GD_GamePad && usage != kHIDUsage_GD_GamePad &&
usage != kHIDUsage_GD_MultiAxisController)) { usage != kHIDUsage_GD_MultiAxisController)) {
return false; return false;
@ -588,7 +588,7 @@ JoypadOSX::JoypadOSX()
int okay = 1; int okay = 1;
const void *vals[] = { const void *vals[] = {
(void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Joypad, &okay), (void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick, &okay),
(void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad, &okay), (void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad, &okay),
(void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_MultiAxisController, &okay), (void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_MultiAxisController, &okay),
}; };