src/joystick/windows/SDL_xinputjoystick.c
changeset 12096 5b4b8242d21e
parent 12090 c3209fca27b2
child 12115 0d9277d27e2d
equal deleted inserted replaced
12095:d985a68d32ea 12096:5b4b8242d21e
   257     if (SDL_ShouldIgnoreJoystick(pNewJoystick->joystickname, pNewJoystick->guid)) {
   257     if (SDL_ShouldIgnoreJoystick(pNewJoystick->joystickname, pNewJoystick->guid)) {
   258         SDL_free(pNewJoystick);
   258         SDL_free(pNewJoystick);
   259         return;
   259         return;
   260     }
   260     }
   261 
   261 
       
   262 #if 0 /* There's no controller that's supported by both XInput and HIDAPI */
   262 #ifdef SDL_JOYSTICK_HIDAPI
   263 #ifdef SDL_JOYSTICK_HIDAPI
   263     if (HIDAPI_IsDevicePresent(vendor, product)) {
   264     if (HIDAPI_IsDevicePresent(vendor, product)) {
   264         /* The HIDAPI driver is taking care of this device */
   265         /* The HIDAPI driver is taking care of this device */
   265         SDL_free(pNewJoystick);
   266         SDL_free(pNewJoystick);
   266         return;
   267         return;
   267     }
   268     }
       
   269 #endif
   268 #endif
   270 #endif
   269 
   271 
   270     WINDOWS_AddJoystickDevice(pNewJoystick);
   272     WINDOWS_AddJoystickDevice(pNewJoystick);
   271 }
   273 }
   272 
   274