include/SDL_joystick.h
changeset 12359 691c32a30fb9
parent 12357 40f09c8c517b
child 12503 806492103856
     1.1 --- a/include/SDL_joystick.h	Thu Oct 25 13:22:34 2018 -0700
     1.2 +++ b/include/SDL_joystick.h	Thu Oct 25 16:53:14 2018 -0700
     1.3 @@ -133,6 +133,12 @@
     1.4  extern DECLSPEC const char *SDLCALL SDL_JoystickNameForIndex(int device_index);
     1.5  
     1.6  /**
     1.7 + *  Get the player index of a joystick, or -1 if it's not available
     1.8 + *  This can be called before any joysticks are opened.
     1.9 + */
    1.10 +extern DECLSPEC int SDLCALL SDL_JoystickGetDevicePlayerIndex(int device_index);
    1.11 +
    1.12 +/**
    1.13   *  Return the GUID for the joystick at this index
    1.14   *  This can be called before any joysticks are opened.
    1.15   */
    1.16 @@ -195,6 +201,13 @@
    1.17  extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick);
    1.18  
    1.19  /**
    1.20 + *  Get the player index of an opened joystick, or -1 if it's not available
    1.21 + *
    1.22 + *  For XInput controllers this returns the XInput user index.
    1.23 + */
    1.24 +extern DECLSPEC int SDLCALL SDL_JoystickGetPlayerIndex(SDL_Joystick * joystick);
    1.25 +
    1.26 +/**
    1.27   *  Return the GUID for this opened joystick
    1.28   */
    1.29  extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joystick);
    1.30 @@ -384,11 +397,6 @@
    1.31   */
    1.32  extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL_Joystick * joystick);
    1.33  
    1.34 -/**
    1.35 - *  Return the XInput user index for this joystick, or -1 if it's not available
    1.36 - */
    1.37 -extern DECLSPEC int SDLCALL SDL_JoystickGetXInputUserIndex(SDL_Joystick * joystick);
    1.38 -
    1.39  /* Ends C function definitions when using C++ */
    1.40  #ifdef __cplusplus
    1.41  }