encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use a single hint for both Xbox 360 and Xbox One controllers, since they are often the same driver.

This commit is contained in:
Sam Lantinga 2018-08-15 23:35:54 -07:00
parent a2add1f683
commit 7d3a7ef827
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/SDL_hints.h
View File

@ -510,7 +510,7 @@ extern "C" {
#define SDL_HINT_JOYSTICK_HIDAPI_SWITCH "SDL_JOYSTICK_HIDAPI_SWITCH" #define SDL_HINT_JOYSTICK_HIDAPI_SWITCH "SDL_JOYSTICK_HIDAPI_SWITCH"
/** /**
* \brief A variable controlling whether the HIDAPI driver for XBox 360 controllers should be used. * \brief A variable controlling whether the HIDAPI driver for XBox controllers should be used.
* *
* This variable can be set to the following values: * This variable can be set to the following values:
* "0" - HIDAPI driver is not used * "0" - HIDAPI driver is not used
@ -518,18 +518,7 @@ extern "C" {
* *
* The default is the value of SDL_HINT_JOYSTICK_HIDAPI * The default is the value of SDL_HINT_JOYSTICK_HIDAPI
*/ */
#define SDL_HINT_JOYSTICK_HIDAPI_XBOX360 "SDL_JOYSTICK_HIDAPI_XBOX360" #define SDL_HINT_JOYSTICK_HIDAPI_XBOX "SDL_JOYSTICK_HIDAPI_XBOX"
/**
* \brief A variable controlling whether the HIDAPI driver for XBox One controllers should be used.
*
* This variable can be set to the following values:
* "0" - HIDAPI driver is not used
* "1" - HIDAPI driver is used
*
* The default is the value of SDL_HINT_JOYSTICK_HIDAPI
*/
#define SDL_HINT_JOYSTICK_HIDAPI_XBOXONE "SDL_JOYSTICK_HIDAPI_XBOXONE"
/** /**
* \brief A variable that controls whether Steam Controllers should be exposed using the SDL joystick and game controller APIs * \brief A variable that controls whether Steam Controllers should be exposed using the SDL joystick and game controller APIs

2
src/joystick/hidapi/SDL_hidapi_xbox360.c
View File

@ -444,7 +444,7 @@ HIDAPI_DriverXbox360_Quit(SDL_Joystick *joystick, hid_device *dev, void *context
SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverXbox360 = SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverXbox360 =
{ {
SDL_HINT_JOYSTICK_HIDAPI_XBOX360, SDL_HINT_JOYSTICK_HIDAPI_XBOX,
SDL_TRUE, SDL_TRUE,
HIDAPI_DriverXbox360_IsSupportedDevice, HIDAPI_DriverXbox360_IsSupportedDevice,
HIDAPI_DriverXbox360_GetDeviceName, HIDAPI_DriverXbox360_GetDeviceName,

2
src/joystick/hidapi/SDL_hidapi_xboxone.c
View File

@ -301,7 +301,7 @@ HIDAPI_DriverXboxOne_Quit(SDL_Joystick *joystick, hid_device *dev, void *context
SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverXboxOne = SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverXboxOne =
{ {
SDL_HINT_JOYSTICK_HIDAPI_XBOXONE, SDL_HINT_JOYSTICK_HIDAPI_XBOX,
SDL_TRUE, SDL_TRUE,
HIDAPI_DriverXboxOne_IsSupportedDevice, HIDAPI_DriverXboxOne_IsSupportedDevice,
HIDAPI_DriverXboxOne_GetDeviceName, HIDAPI_DriverXboxOne_GetDeviceName,