mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-17 07:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDL_GUIDToString() follows the SDL_GetStringRule

Browse Source 
Also removed the distinction between SDL_GUID and SDL_JoystickGUID
This commit is contained in:
Sam Lantinga
2024-07-19 09:08:17 -07:00
parent 892df4bf4b
commit 61a7a0e579
44 changed files with 182 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/joystick/android/SDL_sysjoystick.c
View File

@@ -304,7 +304,7 @@ int Android_OnHat(int device_id, int hat_id, int x, int y)
int Android_AddJoystick(int device_id, const char *name, const char *desc, int vendor_id, int product_id, int button_mask, int naxes, int axis_mask, int nhats, SDL_bool can_rumble)
{
SDL_joylist_item *item;
SDL_JoystickGUID guid;
SDL_GUID guid;
int i;
int result = -1;
@@ -551,7 +551,7 @@ static void ANDROID_JoystickSetDevicePlayerIndex(int device_index, int player_in
{
}
static SDL_JoystickGUID ANDROID_JoystickGetDeviceGUID(int device_index)
static SDL_GUID ANDROID_JoystickGetDeviceGUID(int device_index)
{
return GetJoystickByDevIndex(device_index)->guid;
}

2
src/joystick/android/SDL_sysjoystick_c.h
View File

@@ -41,7 +41,7 @@ typedef struct SDL_joylist_item
int device_instance;
int device_id; /* Android's device id */
char *name; /* "SideWinder 3D Pro" or whatever */
SDL_JoystickGUID guid;
SDL_GUID guid;
SDL_Joystick *joystick;
int nbuttons, naxes, nhats;
int dpad_state;