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

Changes from Alfred:

Browse source 
- rename JoystickGUID -> SDL_JoystickGUID
- change SDL_JoystickGetGUIDString to take the string as an arg, rather than doing a malloc
This commit is contained in:
Sam Lantinga 2012-12-11 11:54:32 -08:00
parent 6b3312c807
commit 89ef9e3168
9 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/joystick/SDL_gamecontroller.c
View file

@ -48,7 +48,7 @@ struct _SDL_HatAsButton
/* our in memory mapping db between joystick objects and controller mappings*/
struct _SDL_ControllerMapping
{
JoystickGUID guid;
SDL_JoystickGUID guid;
const char *name;
// mapping of axis/button id to controller version
@ -71,7 +71,7 @@ struct _SDL_ControllerMapping
/* our hard coded list of mapping support */
typedef struct _ControllerMapping_t
{
JoystickGUID guid;
SDL_JoystickGUID guid;
char *name;
const char *mapping;
struct _ControllerMapping_t *next;
@ -458,7 +458,7 @@ SDL_PrivateGameControllerParseControllerConfigString( struct _SDL_ControllerMapp
/*
* Make a new button mapping struct
*/
void SDL_PrivateLoadButtonMapping( struct _SDL_ControllerMapping *pMapping, JoystickGUID guid, const char *pchName, const char *pchMapping )
void SDL_PrivateLoadButtonMapping( struct _SDL_ControllerMapping *pMapping, SDL_JoystickGUID guid, const char *pchName, const char *pchMapping )
{
int j;
@ -673,7 +673,7 @@ SDL_GameControllerNameForIndex(int device_index)
}
else
{
JoystickGUID jGUID = SDL_JoystickGetDeviceGUID( device_index );
SDL_JoystickGUID jGUID = SDL_JoystickGetDeviceGUID( device_index );
pSupportedController = s_pSupportedControllers;
while ( pSupportedController )
{
@ -700,10 +700,11 @@ int SDL_IsGameController(int device_index)
}
else
{
JoystickGUID jGUID = SDL_JoystickGetDeviceGUID( device_index );
SDL_JoystickGUID jGUID = SDL_JoystickGetDeviceGUID( device_index );
pSupportedController = s_pSupportedControllers;
// debug code to help get the guid string for a new joystick
/*const char *pchGUID = SDL_JoystickGetGUIDString( jGUID );
/* char szGUID[33];
SDL_JoystickGetGUIDString( jGUID, szGUID, sizeof(szGUID) );
printf( "%s\n", pchGUID );
SDL_free( pchGUID );*/
while ( pSupportedController )
@ -759,7 +760,7 @@ SDL_GameControllerOpen(int device_index)
pSupportedController = SDL_PrivateGetControllerMapping(device_index);
if ( !pSupportedController )
{
JoystickGUID jGUID;
SDL_JoystickGUID jGUID;
jGUID = SDL_JoystickGetDeviceGUID( device_index );
pSupportedController = s_pSupportedControllers;