pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged r2992:2993 from branches/SDL-1.2: Mac OS X multi-axis joystick support.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402285
This commit is contained in:
Ryan C. Gordon 2007-03-18 22:39:24 +00:00
parent 5233584282
commit 49b9e97e79
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/joystick/darwin/SDL_sysjoystick.c
View file

@ -690,9 +690,10 @@ SDL_SYS_JoystickInit(void)
*/
/* Filter device list to non-keyboard/mouse stuff */
if ((device->usagePage != kHIDPage_GenericDesktop) ||
((device->usage != kHIDUsage_GD_Joystick &&
device->usage != kHIDUsage_GD_GamePad))) {
if ( (device->usagePage != kHIDPage_GenericDesktop) ||
((device->usage != kHIDUsage_GD_Joystick &&
device->usage != kHIDUsage_GD_GamePad &&
device->usage != kHIDUsage_GD_MultiAxisController)) ) {
/* release memory for the device */
HIDDisposeDevice(&device);