include/SDL_gamecontroller.h
changeset 6917 47dc155b774d
parent 6885 700f1b25f77f
child 6919 c9c75d062fa8
     1.1 --- a/include/SDL_gamecontroller.h	Mon Feb 25 00:47:47 2013 -0500
     1.2 +++ b/include/SDL_gamecontroller.h	Mon Feb 25 00:56:21 2013 -0500
     1.3 @@ -59,7 +59,8 @@
     1.4  	SDL_CONTROLLER_BINDTYPE_BUTTON,
     1.5  	SDL_CONTROLLER_BINDTYPE_AXIS,
     1.6  	SDL_CONTROLLER_BINDTYPE_HAT
     1.7 -} SDL_CONTROLLER_BINDTYPE;
     1.8 +} SDL_GameControllerBindType;
     1.9 +
    1.10  /**
    1.11   *  get the sdl joystick layer binding for this controller button/axis mapping
    1.12   */
    1.13 @@ -71,7 +72,7 @@
    1.14  
    1.15  typedef struct _SDL_GameControllerButtonBind
    1.16  {
    1.17 -	SDL_CONTROLLER_BINDTYPE m_eBindType;
    1.18 +	SDL_GameControllerBindType m_eBindType;
    1.19  	union
    1.20  	{
    1.21  		int button;
    1.22 @@ -172,19 +173,19 @@
    1.23  	SDL_CONTROLLER_AXIS_TRIGGERLEFT,
    1.24  	SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
    1.25  	SDL_CONTROLLER_AXIS_MAX
    1.26 -} SDL_CONTROLLER_AXIS;
    1.27 +} SDL_GameControllerAxis;
    1.28  
    1.29  /**
    1.30   *  turn this string into a axis mapping
    1.31   */
    1.32 -extern DECLSPEC SDL_CONTROLLER_AXIS SDLCALL SDL_GameControllerGetAxisFromString(const char *pchString);
    1.33 +extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *pchString);
    1.34  
    1.35  /**
    1.36   *  get the sdl joystick layer binding for this controller button mapping
    1.37   */
    1.38  extern DECLSPEC SDL_GameControllerButtonBind SDLCALL
    1.39  SDL_GameControllerGetBindForAxis(SDL_GameController *gamecontroller,
    1.40 -                                 SDL_CONTROLLER_AXIS button);
    1.41 +                                 SDL_GameControllerAxis axis);
    1.42  
    1.43  /**
    1.44   *  Get the current state of an axis control on a game controller.
    1.45 @@ -195,7 +196,7 @@
    1.46   */
    1.47  extern DECLSPEC Sint16 SDLCALL
    1.48  SDL_GameControllerGetAxis(SDL_GameController *gamecontroller,
    1.49 -                          SDL_CONTROLLER_AXIS axis);
    1.50 +                          SDL_GameControllerAxis axis);
    1.51  
    1.52  /**
    1.53   *  The list of buttons available from a controller
    1.54 @@ -219,12 +220,12 @@
    1.55  	SDL_CONTROLLER_BUTTON_DPAD_LEFT,
    1.56  	SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
    1.57  	SDL_CONTROLLER_BUTTON_MAX
    1.58 -} SDL_CONTROLLER_BUTTON;
    1.59 +} SDL_GameControllerButton;
    1.60  
    1.61  /**
    1.62   *  turn this string into a button mapping
    1.63   */
    1.64 -extern DECLSPEC SDL_CONTROLLER_BUTTON SDLCALL SDL_GameControllerGetButtonFromString(const char *pchString);
    1.65 +extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *pchString);
    1.66  
    1.67  
    1.68  /**
    1.69 @@ -232,7 +233,7 @@
    1.70   */
    1.71  extern DECLSPEC SDL_GameControllerButtonBind SDLCALL
    1.72  SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller,
    1.73 -                                   SDL_CONTROLLER_BUTTON button);
    1.74 +                                   SDL_GameControllerButton button);
    1.75  
    1.76  
    1.77  /**
    1.78 @@ -241,7 +242,7 @@
    1.79   *  The button indices start at index 0.
    1.80   */
    1.81  extern DECLSPEC Uint8 SDLCALL SDL_GameControllerGetButton(SDL_GameController *gamecontroller,
    1.82 -                                                          SDL_CONTROLLER_BUTTON button);
    1.83 +                                                          SDL_GameControllerButton button);
    1.84  
    1.85  /**
    1.86   *  Close a controller previously opened with SDL_GameControllerOpen().