From b92327841aa1c91be1b79564513af5e31d838c04 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 14 Jul 2024 07:28:00 -0700 Subject: [PATCH] Experiment renaming *Instance*() to *Device*() Fixes https://github.com/libsdl-org/SDL/issues/10237 --- build-scripts/SDL_migration.cocci | 22 +++++----- docs/README-migration.md | 50 ++++++++++----------- include/SDL3/SDL_gamepad.h | 44 +++++++++---------- include/SDL3/SDL_joystick.h | 38 ++++++++-------- include/SDL3/SDL_oldnames.h | 8 ++-- include/SDL3/SDL_sensor.h | 8 ++-- src/dynapi/SDL_dynapi.sym | 48 ++++++++++---------- src/dynapi/SDL_dynapi_overrides.h | 48 ++++++++++---------- src/dynapi/SDL_dynapi_procs.h | 48 ++++++++++---------- src/haptic/SDL_haptic.c | 4 +- src/joystick/SDL_gamepad.c | 56 ++++++++++++------------ src/joystick/SDL_joystick.c | 56 ++++++++++++------------ src/joystick/SDL_joystick_c.h | 2 +- src/joystick/hidapi/SDL_hidapijoystick.c | 16 +++---- src/joystick/vita/SDL_sysjoystick.c | 6 +-- src/sensor/SDL_sensor.c | 8 ++-- test/testautomation_joystick.c | 8 ++-- test/testcontroller.c | 2 +- test/testsensor.c | 8 ++-- 19 files changed, 240 insertions(+), 240 deletions(-) diff --git a/build-scripts/SDL_migration.cocci b/build-scripts/SDL_migration.cocci index 1be44696018b7..92866ee92177e 100644 --- a/build-scripts/SDL_migration.cocci +++ b/build-scripts/SDL_migration.cocci @@ -117,56 +117,56 @@ expression e; @@ - SDL_JoystickGetDevicePlayerIndex(e) + /* FIXME MIGRATION: check for valid instance */ -+ SDL_GetJoystickInstancePlayerIndex(GetJoystickInstanceFromIndex(e)) ++ SDL_GetJoystickDevicePlayerIndex(GetJoystickDeviceFromIndex(e)) @@ expression e; @@ - SDL_JoystickIsVirtual(e) + /* FIXME MIGRATION: check for valid instance */ -+ SDL_IsJoystickVirtual(GetJoystickInstanceFromIndex(e)) ++ SDL_IsJoystickVirtual(GetJoystickDeviceFromIndex(e)) @@ expression e; @@ - SDL_JoystickPathForIndex(e) + /* FIXME MIGRATION: check for valid instance */ -+ SDL_GetJoystickInstancePath(GetJoystickInstanceFromIndex(e)) ++ SDL_GetJoystickDevicePath(GetJoystickDeviceFromIndex(e)) @@ expression e; @@ - SDL_IsGameController(e) + /* FIXME MIGRATION: check for valid instance */ -+ SDL_IsGamepad(GetJoystickInstanceFromIndex(e)) ++ SDL_IsGamepad(GetJoystickDeviceFromIndex(e)) @@ expression e; @@ - SDL_GameControllerMappingForDeviceIndex(e) + /* FIXME MIGRATION: check for valid instance */ -+ SDL_GetGamepadInstanceMapping(GetJoystickInstanceFromIndex(e)) ++ SDL_GetGamepadDeviceMapping(GetJoystickDeviceFromIndex(e)) @@ expression e; @@ - SDL_GameControllerNameForIndex(e) + /* FIXME MIGRATION: check for valid instance */ -+ SDL_GetGamepadInstanceName(GetJoystickInstanceFromIndex(e)) ++ SDL_GetGamepadDeviceName(GetJoystickDeviceFromIndex(e)) @@ expression e; @@ - SDL_GameControllerPathForIndex(e) + /* FIXME MIGRATION: check for valid instance */ -+ SDL_GetGamepadInstancePath(GetJoystickInstanceFromIndex(e)) ++ SDL_GetGamepadDevicePath(GetJoystickDeviceFromIndex(e)) @@ expression e; @@ - SDL_GameControllerTypeForIndex(e) + /* FIXME MIGRATION: check for valid instance */ -+ SDL_GetGamepadInstanceType(GetJoystickInstanceFromIndex(e)) ++ SDL_GetGamepadDeviceType(GetJoystickDeviceFromIndex(e)) // SDL_Has3DNow() has been removed; there is no replacement. @@ -1397,8 +1397,8 @@ typedef SDL_GameControllerButton, SDL_GamepadButton; (...) @@ @@ -- SDL_JoystickInstanceID -+ SDL_GetJoystickInstanceID +- SDL_JoystickDeviceID ++ SDL_GetJoystickDeviceID (...) @@ @@ @@ -1817,7 +1817,7 @@ expression e2; @@ @@ - SDL_SensorGetInstanceID -+ SDL_GetSensorInstanceID ++ SDL_GetSensorDeviceID (...) @@ @@ diff --git a/docs/README-migration.md b/docs/README-migration.md index fe767ba96c6d9..922a087e6bda9 100644 --- a/docs/README-migration.md +++ b/docs/README-migration.md @@ -461,7 +461,7 @@ SDL_gamecontroller.h has been renamed SDL_gamepad.h, and all APIs have been rena The SDL_EVENT_GAMEPAD_ADDED event now provides the joystick instance ID in the which member of the cdevice event structure. -The functions SDL_GetGamepads(), SDL_GetGamepadInstanceName(), SDL_GetGamepadInstancePath(), SDL_GetGamepadInstancePlayerIndex(), SDL_GetGamepadInstanceGUID(), SDL_GetGamepadInstanceVendor(), SDL_GetGamepadInstanceProduct(), SDL_GetGamepadInstanceProductVersion(), and SDL_GetGamepadInstanceType() have been added to directly query the list of available gamepads. +The functions SDL_GetGamepads(), SDL_GetGamepadDeviceName(), SDL_GetGamepadDevicePath(), SDL_GetGamepadDevicePlayerIndex(), SDL_GetGamepadDeviceGUID(), SDL_GetGamepadDeviceVendor(), SDL_GetGamepadDeviceProduct(), SDL_GetGamepadDeviceProductVersion(), and SDL_GetGamepadDeviceType() have been added to directly query the list of available gamepads. The gamepad face buttons have been renamed from A/B/X/Y to North/South/East/West to indicate that they are positional rather than hardware-specific. You can use SDL_GetGamepadButtonLabel() to get the labels for the face buttons, e.g. A/B/X/Y or Cross/Circle/Square/Triangle. The hint SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS is ignored, and mappings that use this hint are translated correctly into positional buttons. Applications should provide a way for users to swap between South/East as their accept/cancel buttons, as this varies based on region and muscle memory. You can use an approach similar to the following to handle this: @@ -624,12 +624,12 @@ The following functions have been removed: * SDL_GameControllerHasLED() - replaced with SDL_PROP_GAMEPAD_CAP_RGB_LED_BOOLEAN * SDL_GameControllerHasRumble() - replaced with SDL_PROP_GAMEPAD_CAP_RUMBLE_BOOLEAN * SDL_GameControllerHasRumbleTriggers() - replaced with SDL_PROP_GAMEPAD_CAP_TRIGGER_RUMBLE_BOOLEAN -* SDL_GameControllerMappingForDeviceIndex() - replaced with SDL_GetGamepadInstanceMapping() +* SDL_GameControllerMappingForDeviceIndex() - replaced with SDL_GetGamepadDeviceMapping() * SDL_GameControllerMappingForIndex() - replaced with SDL_GetGamepadMappings() -* SDL_GameControllerNameForIndex() - replaced with SDL_GetGamepadInstanceName() +* SDL_GameControllerNameForIndex() - replaced with SDL_GetGamepadDeviceName() * SDL_GameControllerNumMappings() - replaced with SDL_GetGamepadMappings() -* SDL_GameControllerPathForIndex() - replaced with SDL_GetGamepadInstancePath() -* SDL_GameControllerTypeForIndex() - replaced with SDL_GetGamepadInstanceType() +* SDL_GameControllerPathForIndex() - replaced with SDL_GetGamepadDevicePath() +* SDL_GameControllerTypeForIndex() - replaced with SDL_GetGamepadDeviceType() The following symbols have been renamed: * SDL_CONTROLLER_AXIS_INVALID => SDL_GAMEPAD_AXIS_INVALID @@ -830,11 +830,11 @@ Rather than iterating over joysticks using device index, there is a new function if (joysticks) { for (i = 0; i < num_joysticks; ++i) { SDL_JoystickID instance_id = joysticks[i]; - const char *name = SDL_GetJoystickInstanceName(instance_id); - const char *path = SDL_GetJoystickInstancePath(instance_id); + const char *name = SDL_GetJoystickDeviceName(instance_id); + const char *path = SDL_GetJoystickDevicePath(instance_id); SDL_Log("Joystick %" SDL_PRIu32 ": %s%s%s VID 0x%.4x, PID 0x%.4x\n", - instance_id, name ? name : "Unknown", path ? ", " : "", path ? path : "", SDL_GetJoystickInstanceVendor(instance_id), SDL_GetJoystickInstanceProduct(instance_id)); + instance_id, name ? name : "Unknown", path ? ", " : "", path ? path : "", SDL_GetJoystickDeviceVendor(instance_id), SDL_GetJoystickDeviceProduct(instance_id)); } SDL_free(joysticks); } @@ -845,7 +845,7 @@ Rather than iterating over joysticks using device index, there is a new function The SDL_EVENT_JOYSTICK_ADDED event now provides the joystick instance ID in the `which` member of the jdevice event structure. -The functions SDL_GetJoysticks(), SDL_GetJoystickInstanceName(), SDL_GetJoystickInstancePath(), SDL_GetJoystickInstancePlayerIndex(), SDL_GetJoystickInstanceGUID(), SDL_GetJoystickInstanceVendor(), SDL_GetJoystickInstanceProduct(), SDL_GetJoystickInstanceProductVersion(), and SDL_GetJoystickInstanceType() have been added to directly query the list of available joysticks. +The functions SDL_GetJoysticks(), SDL_GetJoystickDeviceName(), SDL_GetJoystickDevicePath(), SDL_GetJoystickDevicePlayerIndex(), SDL_GetJoystickDeviceGUID(), SDL_GetJoystickDeviceVendor(), SDL_GetJoystickDeviceProduct(), SDL_GetJoystickDeviceProductVersion(), and SDL_GetJoystickDeviceType() have been added to directly query the list of available joysticks. SDL_AttachVirtualJoystick() now returns the joystick instance ID instead of a device index, and returns 0 if there was an error. @@ -873,7 +873,7 @@ The following functions have been renamed: * SDL_JoystickGetSerial() => SDL_GetJoystickSerial() * SDL_JoystickGetType() => SDL_GetJoystickType() * SDL_JoystickGetVendor() => SDL_GetJoystickVendor() -* SDL_JoystickInstanceID() => SDL_GetJoystickInstanceID() +* SDL_JoystickDeviceID() => SDL_GetJoystickDeviceID() * SDL_JoystickIsVirtual() => SDL_IsJoystickVirtual() * SDL_JoystickName() => SDL_GetJoystickName() * SDL_JoystickNumAxes() => SDL_GetNumJoystickAxes() @@ -899,18 +899,18 @@ The following functions have been removed: * SDL_JoystickAttachVirtual() - replaced with SDL_AttachVirtualJoystick() * SDL_JoystickCurrentPowerLevel() - replaced with SDL_GetJoystickConnectionState() and SDL_GetJoystickPowerInfo() * SDL_JoystickEventState() - replaced with SDL_SetJoystickEventsEnabled() and SDL_JoystickEventsEnabled() -* SDL_JoystickGetDeviceGUID() - replaced with SDL_GetJoystickInstanceGUID() +* SDL_JoystickGetDeviceGUID() - replaced with SDL_GetJoystickDeviceGUID() * SDL_JoystickGetDeviceInstanceID() -* SDL_JoystickGetDevicePlayerIndex() - replaced with SDL_GetJoystickInstancePlayerIndex() -* SDL_JoystickGetDeviceProduct() - replaced with SDL_GetJoystickInstanceProduct() -* SDL_JoystickGetDeviceProductVersion() - replaced with SDL_GetJoystickInstanceProductVersion() -* SDL_JoystickGetDeviceType() - replaced with SDL_GetJoystickInstanceType() -* SDL_JoystickGetDeviceVendor() - replaced with SDL_GetJoystickInstanceVendor() +* SDL_JoystickGetDevicePlayerIndex() - replaced with SDL_GetJoystickDevicePlayerIndex() +* SDL_JoystickGetDeviceProduct() - replaced with SDL_GetJoystickDeviceProduct() +* SDL_JoystickGetDeviceProductVersion() - replaced with SDL_GetJoystickDeviceProductVersion() +* SDL_JoystickGetDeviceType() - replaced with SDL_GetJoystickDeviceType() +* SDL_JoystickGetDeviceVendor() - replaced with SDL_GetJoystickDeviceVendor() * SDL_JoystickHasLED() - replaced with SDL_PROP_JOYSTICK_CAP_RGB_LED_BOOLEAN * SDL_JoystickHasRumble() - replaced with SDL_PROP_JOYSTICK_CAP_RUMBLE_BOOLEAN * SDL_JoystickHasRumbleTriggers() - replaced with SDL_PROP_JOYSTICK_CAP_TRIGGER_RUMBLE_BOOLEAN -* SDL_JoystickNameForIndex() - replaced with SDL_GetJoystickInstanceName() -* SDL_JoystickPathForIndex() - replaced with SDL_GetJoystickInstancePath() +* SDL_JoystickNameForIndex() - replaced with SDL_GetJoystickDeviceName() +* SDL_JoystickPathForIndex() - replaced with SDL_GetJoystickDevicePath() * SDL_NumJoysticks() - replaced with SDL_GetJoysticks() * SDL_VIRTUAL_JOYSTICK_DESC_VERSION - no longer needed, version info has been removed from SDL_VirtualJoystickDesc. @@ -1571,9 +1571,9 @@ Rather than iterating over sensors using device index, there is a new function S for (i = 0; i < num_sensors; ++i) { SDL_Log("Sensor %" SDL_PRIu32 ": %s, type %d, platform type %d\n", sensors[i], - SDL_GetSensorInstanceName(sensors[i]), - SDL_GetSensorInstanceType(sensors[i]), - SDL_GetSensorInstanceNonPortableType(sensors[i])); + SDL_GetSensorDeviceName(sensors[i]), + SDL_GetSensorDeviceType(sensors[i]), + SDL_GetSensorDeviceNonPortableType(sensors[i])); } SDL_free(sensors); } @@ -1589,7 +1589,7 @@ The following functions have been renamed: * SDL_SensorClose() => SDL_CloseSensor() * SDL_SensorFromInstanceID() => SDL_GetSensorFromInstanceID() * SDL_SensorGetData() => SDL_GetSensorData() -* SDL_SensorGetInstanceID() => SDL_GetSensorInstanceID() +* SDL_SensorGetInstanceID() => SDL_GetSensorDeviceID() * SDL_SensorGetName() => SDL_GetSensorName() * SDL_SensorGetNonPortableType() => SDL_GetSensorNonPortableType() * SDL_SensorGetType() => SDL_GetSensorType() @@ -1600,9 +1600,9 @@ The following functions have been removed: * SDL_LockSensors() * SDL_NumSensors() - replaced with SDL_GetSensors() * SDL_SensorGetDeviceInstanceID() -* SDL_SensorGetDeviceName() - replaced with SDL_GetSensorInstanceName() -* SDL_SensorGetDeviceNonPortableType() - replaced with SDL_GetSensorInstanceNonPortableType() -* SDL_SensorGetDeviceType() - replaced with SDL_GetSensorInstanceType() +* SDL_SensorGetDeviceName() - replaced with SDL_GetSensorDeviceName() +* SDL_SensorGetDeviceNonPortableType() - replaced with SDL_GetSensorDeviceNonPortableType() +* SDL_SensorGetDeviceType() - replaced with SDL_GetSensorDeviceType() * SDL_UnlockSensors() ## SDL_shape.h diff --git a/include/SDL3/SDL_gamepad.h b/include/SDL3/SDL_gamepad.h index 36282ad5fb2b4..2ade85e21b005 100644 --- a/include/SDL3/SDL_gamepad.h +++ b/include/SDL3/SDL_gamepad.h @@ -412,7 +412,7 @@ extern SDL_DECLSPEC char ** SDLCALL SDL_GetGamepadMappings(int *count); * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetJoystickInstanceGUID + * \sa SDL_GetJoystickDeviceGUID * \sa SDL_GetJoystickGUID */ extern SDL_DECLSPEC char * SDLCALL SDL_GetGamepadMappingForGUID(SDL_JoystickGUID guid); @@ -431,7 +431,7 @@ extern SDL_DECLSPEC char * SDLCALL SDL_GetGamepadMappingForGUID(SDL_JoystickGUID * \since This function is available since SDL 3.0.0. * * \sa SDL_AddGamepadMapping - * \sa SDL_GetGamepadInstanceMapping + * \sa SDL_GetGamepadDeviceMapping * \sa SDL_GetGamepadMappingForGUID * \sa SDL_SetGamepadMapping */ @@ -511,7 +511,7 @@ extern SDL_DECLSPEC SDL_bool SDLCALL SDL_IsGamepad(SDL_JoystickID instance_id); * \sa SDL_GetGamepadName * \sa SDL_GetGamepads */ -extern SDL_DECLSPEC const char *SDLCALL SDL_GetGamepadInstanceName(SDL_JoystickID instance_id); +extern SDL_DECLSPEC const char *SDLCALL SDL_GetGamepadDeviceName(SDL_JoystickID instance_id); /** * Get the implementation dependent path of a gamepad. @@ -529,7 +529,7 @@ extern SDL_DECLSPEC const char *SDLCALL SDL_GetGamepadInstanceName(SDL_JoystickI * \sa SDL_GetGamepadPath * \sa SDL_GetGamepads */ -extern SDL_DECLSPEC const char *SDLCALL SDL_GetGamepadInstancePath(SDL_JoystickID instance_id); +extern SDL_DECLSPEC const char *SDLCALL SDL_GetGamepadDevicePath(SDL_JoystickID instance_id); /** * Get the player index of a gamepad. @@ -544,7 +544,7 @@ extern SDL_DECLSPEC const char *SDLCALL SDL_GetGamepadInstancePath(SDL_JoystickI * \sa SDL_GetGamepadPlayerIndex * \sa SDL_GetGamepads */ -extern SDL_DECLSPEC int SDLCALL SDL_GetGamepadInstancePlayerIndex(SDL_JoystickID instance_id); +extern SDL_DECLSPEC int SDLCALL SDL_GetGamepadDevicePlayerIndex(SDL_JoystickID instance_id); /** * Get the implementation-dependent GUID of a gamepad. @@ -561,7 +561,7 @@ extern SDL_DECLSPEC int SDLCALL SDL_GetGamepadInstancePlayerIndex(SDL_JoystickID * \sa SDL_GetGamepadGUIDString * \sa SDL_GetGamepads */ -extern SDL_DECLSPEC SDL_JoystickGUID SDLCALL SDL_GetGamepadInstanceGUID(SDL_JoystickID instance_id); +extern SDL_DECLSPEC SDL_JoystickGUID SDLCALL SDL_GetGamepadDeviceGUID(SDL_JoystickID instance_id); /** * Get the USB vendor ID of a gamepad, if available. @@ -578,7 +578,7 @@ extern SDL_DECLSPEC SDL_JoystickGUID SDLCALL SDL_GetGamepadInstanceGUID(SDL_Joys * \sa SDL_GetGamepadVendor * \sa SDL_GetGamepads */ -extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadInstanceVendor(SDL_JoystickID instance_id); +extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadDeviceVendor(SDL_JoystickID instance_id); /** * Get the USB product ID of a gamepad, if available. @@ -595,7 +595,7 @@ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadInstanceVendor(SDL_JoystickID i * \sa SDL_GetGamepadProduct * \sa SDL_GetGamepads */ -extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadInstanceProduct(SDL_JoystickID instance_id); +extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadDeviceProduct(SDL_JoystickID instance_id); /** * Get the product version of a gamepad, if available. @@ -612,7 +612,7 @@ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadInstanceProduct(SDL_JoystickID * \sa SDL_GetGamepadProductVersion * \sa SDL_GetGamepads */ -extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadInstanceProductVersion(SDL_JoystickID instance_id); +extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadDeviceProductVersion(SDL_JoystickID instance_id); /** * Get the type of a gamepad. @@ -626,9 +626,9 @@ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadInstanceProductVersion(SDL_Joys * * \sa SDL_GetGamepadType * \sa SDL_GetGamepads - * \sa SDL_GetRealGamepadInstanceType + * \sa SDL_GetRealGamepadDeviceType */ -extern SDL_DECLSPEC SDL_GamepadType SDLCALL SDL_GetGamepadInstanceType(SDL_JoystickID instance_id); +extern SDL_DECLSPEC SDL_GamepadType SDLCALL SDL_GetGamepadDeviceType(SDL_JoystickID instance_id); /** * Get the type of a gamepad, ignoring any mapping override. @@ -640,11 +640,11 @@ extern SDL_DECLSPEC SDL_GamepadType SDLCALL SDL_GetGamepadInstanceType(SDL_Joyst * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetGamepadInstanceType + * \sa SDL_GetGamepadDeviceType * \sa SDL_GetGamepads * \sa SDL_GetRealGamepadType */ -extern SDL_DECLSPEC SDL_GamepadType SDLCALL SDL_GetRealGamepadInstanceType(SDL_JoystickID instance_id); +extern SDL_DECLSPEC SDL_GamepadType SDLCALL SDL_GetRealGamepadDeviceType(SDL_JoystickID instance_id); /** * Get the mapping of a gamepad. @@ -660,7 +660,7 @@ extern SDL_DECLSPEC SDL_GamepadType SDLCALL SDL_GetRealGamepadInstanceType(SDL_J * \sa SDL_GetGamepads * \sa SDL_GetGamepadMapping */ -extern SDL_DECLSPEC char *SDLCALL SDL_GetGamepadInstanceMapping(SDL_JoystickID instance_id); +extern SDL_DECLSPEC char *SDLCALL SDL_GetGamepadDeviceMapping(SDL_JoystickID instance_id); /** * Open a gamepad for use. @@ -744,7 +744,7 @@ extern SDL_DECLSPEC SDL_PropertiesID SDLCALL SDL_GetGamepadProperties(SDL_Gamepa * * \since This function is available since SDL 3.0.0. */ -extern SDL_DECLSPEC SDL_JoystickID SDLCALL SDL_GetGamepadInstanceID(SDL_Gamepad *gamepad); +extern SDL_DECLSPEC SDL_JoystickID SDLCALL SDL_GetGamepadDeviceID(SDL_Gamepad *gamepad); /** * Get the implementation-dependent name for an opened gamepad. @@ -758,7 +758,7 @@ extern SDL_DECLSPEC SDL_JoystickID SDLCALL SDL_GetGamepadInstanceID(SDL_Gamepad * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetGamepadInstanceName + * \sa SDL_GetGamepadDeviceName */ extern SDL_DECLSPEC const char *SDLCALL SDL_GetGamepadName(SDL_Gamepad *gamepad); @@ -774,7 +774,7 @@ extern SDL_DECLSPEC const char *SDLCALL SDL_GetGamepadName(SDL_Gamepad *gamepad) * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetGamepadInstancePath + * \sa SDL_GetGamepadDevicePath */ extern SDL_DECLSPEC const char *SDLCALL SDL_GetGamepadPath(SDL_Gamepad *gamepad); @@ -787,7 +787,7 @@ extern SDL_DECLSPEC const char *SDLCALL SDL_GetGamepadPath(SDL_Gamepad *gamepad) * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetGamepadInstanceType + * \sa SDL_GetGamepadDeviceType */ extern SDL_DECLSPEC SDL_GamepadType SDLCALL SDL_GetGamepadType(SDL_Gamepad *gamepad); @@ -800,7 +800,7 @@ extern SDL_DECLSPEC SDL_GamepadType SDLCALL SDL_GetGamepadType(SDL_Gamepad *game * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetRealGamepadInstanceType + * \sa SDL_GetRealGamepadDeviceType */ extern SDL_DECLSPEC SDL_GamepadType SDLCALL SDL_GetRealGamepadType(SDL_Gamepad *gamepad); @@ -843,7 +843,7 @@ extern SDL_DECLSPEC int SDLCALL SDL_SetGamepadPlayerIndex(SDL_Gamepad *gamepad, * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetGamepadInstanceVendor + * \sa SDL_GetGamepadDeviceVendor */ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadVendor(SDL_Gamepad *gamepad); @@ -857,7 +857,7 @@ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadVendor(SDL_Gamepad *gamepad); * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetGamepadInstanceProduct + * \sa SDL_GetGamepadDeviceProduct */ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadProduct(SDL_Gamepad *gamepad); @@ -871,7 +871,7 @@ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadProduct(SDL_Gamepad *gamepad); * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetGamepadInstanceProductVersion + * \sa SDL_GetGamepadDeviceProductVersion */ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetGamepadProductVersion(SDL_Gamepad *gamepad); diff --git a/include/SDL3/SDL_joystick.h b/include/SDL3/SDL_joystick.h index 31c4fc58b82c6..4c6d3de20122c 100644 --- a/include/SDL3/SDL_joystick.h +++ b/include/SDL3/SDL_joystick.h @@ -112,7 +112,7 @@ typedef Uint32 SDL_JoystickID; * * In some cases, SDL can identify a low-level joystick as being a certain * type of device, and will report it through SDL_GetJoystickType (or - * SDL_GetJoystickInstanceType). + * SDL_GetJoystickDeviceType). * * This is by no means a complete list of everything that can be plugged into * a computer. @@ -238,7 +238,7 @@ extern SDL_DECLSPEC SDL_JoystickID *SDLCALL SDL_GetJoysticks(int *count); * \sa SDL_GetJoystickName * \sa SDL_GetJoysticks */ -extern SDL_DECLSPEC const char *SDLCALL SDL_GetJoystickInstanceName(SDL_JoystickID instance_id); +extern SDL_DECLSPEC const char *SDLCALL SDL_GetJoystickDeviceName(SDL_JoystickID instance_id); /** * Get the implementation dependent path of a joystick. @@ -256,7 +256,7 @@ extern SDL_DECLSPEC const char *SDLCALL SDL_GetJoystickInstanceName(SDL_Joystick * \sa SDL_GetJoystickPath * \sa SDL_GetJoysticks */ -extern SDL_DECLSPEC const char *SDLCALL SDL_GetJoystickInstancePath(SDL_JoystickID instance_id); +extern SDL_DECLSPEC const char *SDLCALL SDL_GetJoystickDevicePath(SDL_JoystickID instance_id); /** * Get the player index of a joystick. @@ -271,7 +271,7 @@ extern SDL_DECLSPEC const char *SDLCALL SDL_GetJoystickInstancePath(SDL_Joystick * \sa SDL_GetJoystickPlayerIndex * \sa SDL_GetJoysticks */ -extern SDL_DECLSPEC int SDLCALL SDL_GetJoystickInstancePlayerIndex(SDL_JoystickID instance_id); +extern SDL_DECLSPEC int SDLCALL SDL_GetJoystickDevicePlayerIndex(SDL_JoystickID instance_id); /** * Get the implementation-dependent GUID of a joystick. @@ -287,7 +287,7 @@ extern SDL_DECLSPEC int SDLCALL SDL_GetJoystickInstancePlayerIndex(SDL_JoystickI * \sa SDL_GetJoystickGUID * \sa SDL_GetJoystickGUIDString */ -extern SDL_DECLSPEC SDL_JoystickGUID SDLCALL SDL_GetJoystickInstanceGUID(SDL_JoystickID instance_id); +extern SDL_DECLSPEC SDL_JoystickGUID SDLCALL SDL_GetJoystickDeviceGUID(SDL_JoystickID instance_id); /** * Get the USB vendor ID of a joystick, if available. @@ -304,7 +304,7 @@ extern SDL_DECLSPEC SDL_JoystickGUID SDLCALL SDL_GetJoystickInstanceGUID(SDL_Joy * \sa SDL_GetJoystickVendor * \sa SDL_GetJoysticks */ -extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickInstanceVendor(SDL_JoystickID instance_id); +extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickDeviceVendor(SDL_JoystickID instance_id); /** * Get the USB product ID of a joystick, if available. @@ -321,7 +321,7 @@ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickInstanceVendor(SDL_JoystickID * \sa SDL_GetJoystickProduct * \sa SDL_GetJoysticks */ -extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickInstanceProduct(SDL_JoystickID instance_id); +extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickDeviceProduct(SDL_JoystickID instance_id); /** * Get the product version of a joystick, if available. @@ -338,7 +338,7 @@ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickInstanceProduct(SDL_JoystickID * \sa SDL_GetJoystickProductVersion * \sa SDL_GetJoysticks */ -extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickInstanceProductVersion(SDL_JoystickID instance_id); +extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickDeviceProductVersion(SDL_JoystickID instance_id); /** * Get the type of a joystick, if available. @@ -355,7 +355,7 @@ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickInstanceProductVersion(SDL_Joy * \sa SDL_GetJoystickType * \sa SDL_GetJoysticks */ -extern SDL_DECLSPEC SDL_JoystickType SDLCALL SDL_GetJoystickInstanceType(SDL_JoystickID instance_id); +extern SDL_DECLSPEC SDL_JoystickType SDLCALL SDL_GetJoystickDeviceType(SDL_JoystickID instance_id); /** * Open a joystick for use. @@ -674,7 +674,7 @@ extern SDL_DECLSPEC SDL_PropertiesID SDLCALL SDL_GetJoystickProperties(SDL_Joyst * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetJoystickInstanceName + * \sa SDL_GetJoystickDeviceName */ extern SDL_DECLSPEC const char *SDLCALL SDL_GetJoystickName(SDL_Joystick *joystick); @@ -689,7 +689,7 @@ extern SDL_DECLSPEC const char *SDLCALL SDL_GetJoystickName(SDL_Joystick *joysti * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetJoystickInstancePath + * \sa SDL_GetJoystickDevicePath */ extern SDL_DECLSPEC const char *SDLCALL SDL_GetJoystickPath(SDL_Joystick *joystick); @@ -735,7 +735,7 @@ extern SDL_DECLSPEC int SDLCALL SDL_SetJoystickPlayerIndex(SDL_Joystick *joystic * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetJoystickInstanceGUID + * \sa SDL_GetJoystickDeviceGUID * \sa SDL_GetJoystickGUIDString */ extern SDL_DECLSPEC SDL_JoystickGUID SDLCALL SDL_GetJoystickGUID(SDL_Joystick *joystick); @@ -750,7 +750,7 @@ extern SDL_DECLSPEC SDL_JoystickGUID SDLCALL SDL_GetJoystickGUID(SDL_Joystick *j * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetJoystickInstanceVendor + * \sa SDL_GetJoystickDeviceVendor */ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickVendor(SDL_Joystick *joystick); @@ -764,7 +764,7 @@ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickVendor(SDL_Joystick *joystick) * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetJoystickInstanceProduct + * \sa SDL_GetJoystickDeviceProduct */ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickProduct(SDL_Joystick *joystick); @@ -778,7 +778,7 @@ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickProduct(SDL_Joystick *joystick * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetJoystickInstanceProductVersion + * \sa SDL_GetJoystickDeviceProductVersion */ extern SDL_DECLSPEC Uint16 SDLCALL SDL_GetJoystickProductVersion(SDL_Joystick *joystick); @@ -818,7 +818,7 @@ extern SDL_DECLSPEC const char * SDLCALL SDL_GetJoystickSerial(SDL_Joystick *joy * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetJoystickInstanceType + * \sa SDL_GetJoystickDeviceType */ extern SDL_DECLSPEC SDL_JoystickType SDLCALL SDL_GetJoystickType(SDL_Joystick *joystick); @@ -835,7 +835,7 @@ extern SDL_DECLSPEC SDL_JoystickType SDLCALL SDL_GetJoystickType(SDL_Joystick *j * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetJoystickInstanceGUID + * \sa SDL_GetJoystickDeviceGUID * \sa SDL_GetJoystickGUID * \sa SDL_GetJoystickGUIDFromString */ @@ -872,7 +872,7 @@ extern SDL_DECLSPEC SDL_JoystickGUID SDLCALL SDL_GetJoystickGUIDFromString(const * * \since This function is available since SDL 3.0.0. * - * \sa SDL_GetJoystickInstanceGUID + * \sa SDL_GetJoystickDeviceGUID */ extern SDL_DECLSPEC void SDLCALL SDL_GetJoystickGUIDInfo(SDL_JoystickGUID guid, Uint16 *vendor, Uint16 *product, Uint16 *version, Uint16 *crc16); @@ -896,7 +896,7 @@ extern SDL_DECLSPEC SDL_bool SDLCALL SDL_JoystickConnected(SDL_Joystick *joystic * * \since This function is available since SDL 3.0.0. */ -extern SDL_DECLSPEC SDL_JoystickID SDLCALL SDL_GetJoystickInstanceID(SDL_Joystick *joystick); +extern SDL_DECLSPEC SDL_JoystickID SDLCALL SDL_GetJoystickDeviceID(SDL_Joystick *joystick); /** * Get the number of general axis controls on a joystick. diff --git a/include/SDL3/SDL_oldnames.h b/include/SDL3/SDL_oldnames.h index 84add35ea3484..4119313f82bbe 100644 --- a/include/SDL3/SDL_oldnames.h +++ b/include/SDL3/SDL_oldnames.h @@ -325,7 +325,7 @@ #define SDL_JoystickGetSerial SDL_GetJoystickSerial #define SDL_JoystickGetType SDL_GetJoystickType #define SDL_JoystickGetVendor SDL_GetJoystickVendor -#define SDL_JoystickInstanceID SDL_GetJoystickInstanceID +#define SDL_JoystickDeviceID SDL_GetJoystickDeviceID #define SDL_JoystickIsVirtual SDL_IsJoystickVirtual #define SDL_JoystickName SDL_GetJoystickName #define SDL_JoystickNumAxes SDL_GetNumJoystickAxes @@ -566,7 +566,7 @@ #define SDL_SensorClose SDL_CloseSensor #define SDL_SensorFromInstanceID SDL_GetSensorFromInstanceID #define SDL_SensorGetData SDL_GetSensorData -#define SDL_SensorGetInstanceID SDL_GetSensorInstanceID +#define SDL_SensorGetInstanceID SDL_GetSensorDeviceID #define SDL_SensorGetName SDL_GetSensorName #define SDL_SensorGetNonPortableType SDL_GetSensorNonPortableType #define SDL_SensorGetType SDL_GetSensorType @@ -923,7 +923,7 @@ #define SDL_JoystickGetSerial SDL_JoystickGetSerial_renamed_SDL_GetJoystickSerial #define SDL_JoystickGetType SDL_JoystickGetType_renamed_SDL_GetJoystickType #define SDL_JoystickGetVendor SDL_JoystickGetVendor_renamed_SDL_GetJoystickVendor -#define SDL_JoystickInstanceID SDL_JoystickInstanceID_renamed_SDL_GetJoystickInstanceID +#define SDL_JoystickDeviceID SDL_JoystickDeviceID_renamed_SDL_GetJoystickDeviceID #define SDL_JoystickIsVirtual SDL_JoystickIsVirtual_renamed_SDL_IsJoystickVirtual #define SDL_JoystickName SDL_JoystickName_renamed_SDL_GetJoystickName #define SDL_JoystickNumAxes SDL_JoystickNumAxes_renamed_SDL_GetNumJoystickAxes @@ -1164,7 +1164,7 @@ #define SDL_SensorClose SDL_SensorClose_renamed_SDL_CloseSensor #define SDL_SensorFromInstanceID SDL_SensorFromInstanceID_renamed_SDL_GetSensorFromInstanceID #define SDL_SensorGetData SDL_SensorGetData_renamed_SDL_GetSensorData -#define SDL_SensorGetInstanceID SDL_SensorGetInstanceID_renamed_SDL_GetSensorInstanceID +#define SDL_SensorGetInstanceID SDL_SensorGetInstanceID_renamed_SDL_GetSensorDeviceID #define SDL_SensorGetName SDL_SensorGetName_renamed_SDL_GetSensorName #define SDL_SensorGetNonPortableType SDL_SensorGetNonPortableType_renamed_SDL_GetSensorNonPortableType #define SDL_SensorGetType SDL_SensorGetType_renamed_SDL_GetSensorType diff --git a/include/SDL3/SDL_sensor.h b/include/SDL3/SDL_sensor.h index d5124beee39f1..38115edd44b9f 100644 --- a/include/SDL3/SDL_sensor.h +++ b/include/SDL3/SDL_sensor.h @@ -165,7 +165,7 @@ extern SDL_DECLSPEC SDL_SensorID *SDLCALL SDL_GetSensors(int *count); * * \since This function is available since SDL 3.0.0. */ -extern SDL_DECLSPEC const char *SDLCALL SDL_GetSensorInstanceName(SDL_SensorID instance_id); +extern SDL_DECLSPEC const char *SDLCALL SDL_GetSensorDeviceName(SDL_SensorID instance_id); /** * Get the type of a sensor. @@ -176,7 +176,7 @@ extern SDL_DECLSPEC const char *SDLCALL SDL_GetSensorInstanceName(SDL_SensorID i * * \since This function is available since SDL 3.0.0. */ -extern SDL_DECLSPEC SDL_SensorType SDLCALL SDL_GetSensorInstanceType(SDL_SensorID instance_id); +extern SDL_DECLSPEC SDL_SensorType SDLCALL SDL_GetSensorDeviceType(SDL_SensorID instance_id); /** * Get the platform dependent type of a sensor. @@ -187,7 +187,7 @@ extern SDL_DECLSPEC SDL_SensorType SDLCALL SDL_GetSensorInstanceType(SDL_SensorI * * \since This function is available since SDL 3.0.0. */ -extern SDL_DECLSPEC int SDLCALL SDL_GetSensorInstanceNonPortableType(SDL_SensorID instance_id); +extern SDL_DECLSPEC int SDLCALL SDL_GetSensorDeviceNonPortableType(SDL_SensorID instance_id); /** * Open a sensor for use. @@ -261,7 +261,7 @@ extern SDL_DECLSPEC int SDLCALL SDL_GetSensorNonPortableType(SDL_Sensor *sensor) * * \since This function is available since SDL 3.0.0. */ -extern SDL_DECLSPEC SDL_SensorID SDLCALL SDL_GetSensorInstanceID(SDL_Sensor *sensor); +extern SDL_DECLSPEC SDL_SensorID SDLCALL SDL_GetSensorDeviceID(SDL_Sensor *sensor); /** * Get the current state of an opened sensor. diff --git a/src/dynapi/SDL_dynapi.sym b/src/dynapi/SDL_dynapi.sym index e1e0e3432d3a0..e1500c0a4def4 100644 --- a/src/dynapi/SDL_dynapi.sym +++ b/src/dynapi/SDL_dynapi.sym @@ -242,16 +242,16 @@ SDL3_0.0.0 { SDL_GetGamepadFirmwareVersion; SDL_GetGamepadFromInstanceID; SDL_GetGamepadFromPlayerIndex; - SDL_GetGamepadInstanceGUID; - SDL_GetGamepadInstanceID; - SDL_GetGamepadInstanceMapping; - SDL_GetGamepadInstanceName; - SDL_GetGamepadInstancePath; - SDL_GetGamepadInstancePlayerIndex; - SDL_GetGamepadInstanceProduct; - SDL_GetGamepadInstanceProductVersion; - SDL_GetGamepadInstanceType; - SDL_GetGamepadInstanceVendor; + SDL_GetGamepadDeviceGUID; + SDL_GetGamepadDeviceID; + SDL_GetGamepadDeviceMapping; + SDL_GetGamepadDeviceName; + SDL_GetGamepadDevicePath; + SDL_GetGamepadDevicePlayerIndex; + SDL_GetGamepadDeviceProduct; + SDL_GetGamepadDeviceProductVersion; + SDL_GetGamepadDeviceType; + SDL_GetGamepadDeviceVendor; SDL_GetGamepadJoystick; SDL_GetGamepadMapping; SDL_GetGamepadMappingForGUID; @@ -303,15 +303,15 @@ SDL3_0.0.0 { SDL_GetJoystickGUIDInfo; SDL_GetJoystickGUIDString; SDL_GetJoystickHat; - SDL_GetJoystickInstanceGUID; - SDL_GetJoystickInstanceID; - SDL_GetJoystickInstanceName; - SDL_GetJoystickInstancePath; - SDL_GetJoystickInstancePlayerIndex; - SDL_GetJoystickInstanceProduct; - SDL_GetJoystickInstanceProductVersion; - SDL_GetJoystickInstanceType; - SDL_GetJoystickInstanceVendor; + SDL_GetJoystickDeviceGUID; + SDL_GetJoystickDeviceID; + SDL_GetJoystickDeviceName; + SDL_GetJoystickDevicePath; + SDL_GetJoystickDevicePlayerIndex; + SDL_GetJoystickDeviceProduct; + SDL_GetJoystickDeviceProductVersion; + SDL_GetJoystickDeviceType; + SDL_GetJoystickDeviceVendor; SDL_GetJoystickName; SDL_GetJoystickPath; SDL_GetJoystickPlayerIndex; @@ -379,7 +379,7 @@ SDL3_0.0.0 { SDL_GetPropertyType; SDL_GetRGB; SDL_GetRGBA; - SDL_GetRealGamepadInstanceType; + SDL_GetRealGamepadDeviceType; SDL_GetRealGamepadType; SDL_GetRectAndLineIntersection; SDL_GetRectAndLineIntersectionFloat; @@ -419,10 +419,10 @@ SDL3_0.0.0 { SDL_GetSemaphoreValue; SDL_GetSensorData; SDL_GetSensorFromInstanceID; - SDL_GetSensorInstanceID; - SDL_GetSensorInstanceName; - SDL_GetSensorInstanceNonPortableType; - SDL_GetSensorInstanceType; + SDL_GetSensorDeviceID; + SDL_GetSensorDeviceName; + SDL_GetSensorDeviceNonPortableType; + SDL_GetSensorDeviceType; SDL_GetSensorName; SDL_GetSensorNonPortableType; SDL_GetSensorProperties; diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h index 80eb264dd0853..d739d38fcba57 100644 --- a/src/dynapi/SDL_dynapi_overrides.h +++ b/src/dynapi/SDL_dynapi_overrides.h @@ -267,16 +267,16 @@ #define SDL_GetGamepadFirmwareVersion SDL_GetGamepadFirmwareVersion_REAL #define SDL_GetGamepadFromInstanceID SDL_GetGamepadFromInstanceID_REAL #define SDL_GetGamepadFromPlayerIndex SDL_GetGamepadFromPlayerIndex_REAL -#define SDL_GetGamepadInstanceGUID SDL_GetGamepadInstanceGUID_REAL -#define SDL_GetGamepadInstanceID SDL_GetGamepadInstanceID_REAL -#define SDL_GetGamepadInstanceMapping SDL_GetGamepadInstanceMapping_REAL -#define SDL_GetGamepadInstanceName SDL_GetGamepadInstanceName_REAL -#define SDL_GetGamepadInstancePath SDL_GetGamepadInstancePath_REAL -#define SDL_GetGamepadInstancePlayerIndex SDL_GetGamepadInstancePlayerIndex_REAL -#define SDL_GetGamepadInstanceProduct SDL_GetGamepadInstanceProduct_REAL -#define SDL_GetGamepadInstanceProductVersion SDL_GetGamepadInstanceProductVersion_REAL -#define SDL_GetGamepadInstanceType SDL_GetGamepadInstanceType_REAL -#define SDL_GetGamepadInstanceVendor SDL_GetGamepadInstanceVendor_REAL +#define SDL_GetGamepadDeviceGUID SDL_GetGamepadDeviceGUID_REAL +#define SDL_GetGamepadDeviceID SDL_GetGamepadDeviceID_REAL +#define SDL_GetGamepadDeviceMapping SDL_GetGamepadDeviceMapping_REAL +#define SDL_GetGamepadDeviceName SDL_GetGamepadDeviceName_REAL +#define SDL_GetGamepadDevicePath SDL_GetGamepadDevicePath_REAL +#define SDL_GetGamepadDevicePlayerIndex SDL_GetGamepadDevicePlayerIndex_REAL +#define SDL_GetGamepadDeviceProduct SDL_GetGamepadDeviceProduct_REAL +#define SDL_GetGamepadDeviceProductVersion SDL_GetGamepadDeviceProductVersion_REAL +#define SDL_GetGamepadDeviceType SDL_GetGamepadDeviceType_REAL +#define SDL_GetGamepadDeviceVendor SDL_GetGamepadDeviceVendor_REAL #define SDL_GetGamepadJoystick SDL_GetGamepadJoystick_REAL #define SDL_GetGamepadMapping SDL_GetGamepadMapping_REAL #define SDL_GetGamepadMappingForGUID SDL_GetGamepadMappingForGUID_REAL @@ -328,15 +328,15 @@ #define SDL_GetJoystickGUIDInfo SDL_GetJoystickGUIDInfo_REAL #define SDL_GetJoystickGUIDString SDL_GetJoystickGUIDString_REAL #define SDL_GetJoystickHat SDL_GetJoystickHat_REAL -#define SDL_GetJoystickInstanceGUID SDL_GetJoystickInstanceGUID_REAL -#define SDL_GetJoystickInstanceID SDL_GetJoystickInstanceID_REAL -#define SDL_GetJoystickInstanceName SDL_GetJoystickInstanceName_REAL -#define SDL_GetJoystickInstancePath SDL_GetJoystickInstancePath_REAL -#define SDL_GetJoystickInstancePlayerIndex SDL_GetJoystickInstancePlayerIndex_REAL -#define SDL_GetJoystickInstanceProduct SDL_GetJoystickInstanceProduct_REAL -#define SDL_GetJoystickInstanceProductVersion SDL_GetJoystickInstanceProductVersion_REAL -#define SDL_GetJoystickInstanceType SDL_GetJoystickInstanceType_REAL -#define SDL_GetJoystickInstanceVendor SDL_GetJoystickInstanceVendor_REAL +#define SDL_GetJoystickDeviceGUID SDL_GetJoystickDeviceGUID_REAL +#define SDL_GetJoystickDeviceID SDL_GetJoystickDeviceID_REAL +#define SDL_GetJoystickDeviceName SDL_GetJoystickDeviceName_REAL +#define SDL_GetJoystickDevicePath SDL_GetJoystickDevicePath_REAL +#define SDL_GetJoystickDevicePlayerIndex SDL_GetJoystickDevicePlayerIndex_REAL +#define SDL_GetJoystickDeviceProduct SDL_GetJoystickDeviceProduct_REAL +#define SDL_GetJoystickDeviceProductVersion SDL_GetJoystickDeviceProductVersion_REAL +#define SDL_GetJoystickDeviceType SDL_GetJoystickDeviceType_REAL +#define SDL_GetJoystickDeviceVendor SDL_GetJoystickDeviceVendor_REAL #define SDL_GetJoystickName SDL_GetJoystickName_REAL #define SDL_GetJoystickPath SDL_GetJoystickPath_REAL #define SDL_GetJoystickPlayerIndex SDL_GetJoystickPlayerIndex_REAL @@ -404,7 +404,7 @@ #define SDL_GetPropertyType SDL_GetPropertyType_REAL #define SDL_GetRGB SDL_GetRGB_REAL #define SDL_GetRGBA SDL_GetRGBA_REAL -#define SDL_GetRealGamepadInstanceType SDL_GetRealGamepadInstanceType_REAL +#define SDL_GetRealGamepadDeviceType SDL_GetRealGamepadDeviceType_REAL #define SDL_GetRealGamepadType SDL_GetRealGamepadType_REAL #define SDL_GetRectAndLineIntersection SDL_GetRectAndLineIntersection_REAL #define SDL_GetRectAndLineIntersectionFloat SDL_GetRectAndLineIntersectionFloat_REAL @@ -444,10 +444,10 @@ #define SDL_GetSemaphoreValue SDL_GetSemaphoreValue_REAL #define SDL_GetSensorData SDL_GetSensorData_REAL #define SDL_GetSensorFromInstanceID SDL_GetSensorFromInstanceID_REAL -#define SDL_GetSensorInstanceID SDL_GetSensorInstanceID_REAL -#define SDL_GetSensorInstanceName SDL_GetSensorInstanceName_REAL -#define SDL_GetSensorInstanceNonPortableType SDL_GetSensorInstanceNonPortableType_REAL -#define SDL_GetSensorInstanceType SDL_GetSensorInstanceType_REAL +#define SDL_GetSensorDeviceID SDL_GetSensorDeviceID_REAL +#define SDL_GetSensorDeviceName SDL_GetSensorDeviceName_REAL +#define SDL_GetSensorDeviceNonPortableType SDL_GetSensorDeviceNonPortableType_REAL +#define SDL_GetSensorDeviceType SDL_GetSensorDeviceType_REAL #define SDL_GetSensorName SDL_GetSensorName_REAL #define SDL_GetSensorNonPortableType SDL_GetSensorNonPortableType_REAL #define SDL_GetSensorProperties SDL_GetSensorProperties_REAL diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h index 1212c524ad052..0f4acc65104bc 100644 --- a/src/dynapi/SDL_dynapi_procs.h +++ b/src/dynapi/SDL_dynapi_procs.h @@ -287,16 +287,16 @@ SDL_DYNAPI_PROC(SDL_JoystickConnectionState,SDL_GetGamepadConnectionState,(SDL_G SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadFirmwareVersion,(SDL_Gamepad *a),(a),return) SDL_DYNAPI_PROC(SDL_Gamepad*,SDL_GetGamepadFromInstanceID,(SDL_JoystickID a),(a),return) SDL_DYNAPI_PROC(SDL_Gamepad*,SDL_GetGamepadFromPlayerIndex,(int a),(a),return) -SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_GetGamepadInstanceGUID,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(SDL_JoystickID,SDL_GetGamepadInstanceID,(SDL_Gamepad *a),(a),return) -SDL_DYNAPI_PROC(char*,SDL_GetGamepadInstanceMapping,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(const char*,SDL_GetGamepadInstanceName,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(const char*,SDL_GetGamepadInstancePath,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(int,SDL_GetGamepadInstancePlayerIndex,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadInstanceProduct,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadInstanceProductVersion,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(SDL_GamepadType,SDL_GetGamepadInstanceType,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadInstanceVendor,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_GetGamepadDeviceGUID,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(SDL_JoystickID,SDL_GetGamepadDeviceID,(SDL_Gamepad *a),(a),return) +SDL_DYNAPI_PROC(char*,SDL_GetGamepadDeviceMapping,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(const char*,SDL_GetGamepadDeviceName,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(const char*,SDL_GetGamepadDevicePath,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(int,SDL_GetGamepadDevicePlayerIndex,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadDeviceProduct,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadDeviceProductVersion,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(SDL_GamepadType,SDL_GetGamepadDeviceType,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadDeviceVendor,(SDL_JoystickID a),(a),return) SDL_DYNAPI_PROC(SDL_Joystick*,SDL_GetGamepadJoystick,(SDL_Gamepad *a),(a),return) SDL_DYNAPI_PROC(char*,SDL_GetGamepadMapping,(SDL_Gamepad *a),(a),return) SDL_DYNAPI_PROC(char*,SDL_GetGamepadMappingForGUID,(SDL_JoystickGUID a),(a),return) @@ -348,15 +348,15 @@ SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_GetJoystickGUIDFromString,(const char *a),( SDL_DYNAPI_PROC(void,SDL_GetJoystickGUIDInfo,(SDL_JoystickGUID a, Uint16 *b, Uint16 *c, Uint16 *d, Uint16 *e),(a,b,c,d,e),) SDL_DYNAPI_PROC(int,SDL_GetJoystickGUIDString,(SDL_JoystickGUID a, char *b, int c),(a,b,c),return) SDL_DYNAPI_PROC(Uint8,SDL_GetJoystickHat,(SDL_Joystick *a, int b),(a,b),return) -SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_GetJoystickInstanceGUID,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(SDL_JoystickID,SDL_GetJoystickInstanceID,(SDL_Joystick *a),(a),return) -SDL_DYNAPI_PROC(const char*,SDL_GetJoystickInstanceName,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(const char*,SDL_GetJoystickInstancePath,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(int,SDL_GetJoystickInstancePlayerIndex,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickInstanceProduct,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickInstanceProductVersion,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(SDL_JoystickType,SDL_GetJoystickInstanceType,(SDL_JoystickID a),(a),return) -SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickInstanceVendor,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_GetJoystickDeviceGUID,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(SDL_JoystickID,SDL_GetJoystickDeviceID,(SDL_Joystick *a),(a),return) +SDL_DYNAPI_PROC(const char*,SDL_GetJoystickDeviceName,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(const char*,SDL_GetJoystickDevicePath,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(int,SDL_GetJoystickDevicePlayerIndex,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickDeviceProduct,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickDeviceProductVersion,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(SDL_JoystickType,SDL_GetJoystickDeviceType,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickDeviceVendor,(SDL_JoystickID a),(a),return) SDL_DYNAPI_PROC(const char*,SDL_GetJoystickName,(SDL_Joystick *a),(a),return) SDL_DYNAPI_PROC(const char*,SDL_GetJoystickPath,(SDL_Joystick *a),(a),return) SDL_DYNAPI_PROC(int,SDL_GetJoystickPlayerIndex,(SDL_Joystick *a),(a),return) @@ -424,7 +424,7 @@ SDL_DYNAPI_PROC(char*,SDL_GetPrimarySelectionText,(void),(),return) SDL_DYNAPI_PROC(SDL_PropertyType,SDL_GetPropertyType,(SDL_PropertiesID a, const char *b),(a,b),return) SDL_DYNAPI_PROC(void,SDL_GetRGB,(Uint32 a, const SDL_PixelFormatDetails *b, const SDL_Palette *c, Uint8 *d, Uint8 *e, Uint8 *f),(a,b,c,d,e,f),) SDL_DYNAPI_PROC(void,SDL_GetRGBA,(Uint32 a, const SDL_PixelFormatDetails *b, const SDL_Palette *c, Uint8 *d, Uint8 *e, Uint8 *f, Uint8 *g),(a,b,c,d,e,f,g),) -SDL_DYNAPI_PROC(SDL_GamepadType,SDL_GetRealGamepadInstanceType,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(SDL_GamepadType,SDL_GetRealGamepadDeviceType,(SDL_JoystickID a),(a),return) SDL_DYNAPI_PROC(SDL_GamepadType,SDL_GetRealGamepadType,(SDL_Gamepad *a),(a),return) SDL_DYNAPI_PROC(SDL_bool,SDL_GetRectAndLineIntersection,(const SDL_Rect *a, int *b, int *c, int *d, int *e),(a,b,c,d,e),return) SDL_DYNAPI_PROC(SDL_bool,SDL_GetRectAndLineIntersectionFloat,(const SDL_FRect *a, float *b, float *c, float *d, float *e),(a,b,c,d,e),return) @@ -464,10 +464,10 @@ SDL_DYNAPI_PROC(const char*,SDL_GetScancodeName,(SDL_Scancode a),(a),return) SDL_DYNAPI_PROC(Uint32,SDL_GetSemaphoreValue,(SDL_Semaphore *a),(a),return) SDL_DYNAPI_PROC(int,SDL_GetSensorData,(SDL_Sensor *a, float *b, int c),(a,b,c),return) SDL_DYNAPI_PROC(SDL_Sensor*,SDL_GetSensorFromInstanceID,(SDL_SensorID a),(a),return) -SDL_DYNAPI_PROC(SDL_SensorID,SDL_GetSensorInstanceID,(SDL_Sensor *a),(a),return) -SDL_DYNAPI_PROC(const char*,SDL_GetSensorInstanceName,(SDL_SensorID a),(a),return) -SDL_DYNAPI_PROC(int,SDL_GetSensorInstanceNonPortableType,(SDL_SensorID a),(a),return) -SDL_DYNAPI_PROC(SDL_SensorType,SDL_GetSensorInstanceType,(SDL_SensorID a),(a),return) +SDL_DYNAPI_PROC(SDL_SensorID,SDL_GetSensorDeviceID,(SDL_Sensor *a),(a),return) +SDL_DYNAPI_PROC(const char*,SDL_GetSensorDeviceName,(SDL_SensorID a),(a),return) +SDL_DYNAPI_PROC(int,SDL_GetSensorDeviceNonPortableType,(SDL_SensorID a),(a),return) +SDL_DYNAPI_PROC(SDL_SensorType,SDL_GetSensorDeviceType,(SDL_SensorID a),(a),return) SDL_DYNAPI_PROC(const char*,SDL_GetSensorName,(SDL_Sensor *a),(a),return) SDL_DYNAPI_PROC(int,SDL_GetSensorNonPortableType,(SDL_Sensor *a),(a),return) SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetSensorProperties,(SDL_Sensor *a),(a),return) diff --git a/src/haptic/SDL_haptic.c b/src/haptic/SDL_haptic.c index 371dc342ea017..9acea84226b77 100644 --- a/src/haptic/SDL_haptic.c +++ b/src/haptic/SDL_haptic.c @@ -222,7 +222,7 @@ SDL_bool SDL_IsJoystickHaptic(SDL_Joystick *joystick) { /* Must be a valid joystick */ if (SDL_IsJoystickValid(joystick) && - !SDL_IsGamepad(SDL_GetJoystickInstanceID(joystick))) { + !SDL_IsGamepad(SDL_GetJoystickDeviceID(joystick))) { result = SDL_SYS_JoystickIsHaptic(joystick); } } @@ -246,7 +246,7 @@ SDL_Haptic *SDL_OpenHapticFromJoystick(SDL_Joystick *joystick) } /* Joystick must be haptic */ - if (SDL_IsGamepad(SDL_GetJoystickInstanceID(joystick)) || + if (SDL_IsGamepad(SDL_GetJoystickDeviceID(joystick)) || SDL_SYS_JoystickIsHaptic(joystick) <= 0) { SDL_SetError("Haptic: Joystick isn't a haptic device."); SDL_UnlockJoysticks(); diff --git a/src/joystick/SDL_gamepad.c b/src/joystick/SDL_gamepad.c index bf1c5b35a6062..e4609f6b1416c 100644 --- a/src/joystick/SDL_gamepad.c +++ b/src/joystick/SDL_gamepad.c @@ -1324,7 +1324,7 @@ static void SDL_UpdateGamepadType(SDL_Gamepad *gamepad) } } if (gamepad->type == SDL_GAMEPAD_TYPE_UNKNOWN) { - gamepad->type = SDL_GetRealGamepadInstanceType(gamepad->joystick->instance_id); + gamepad->type = SDL_GetRealGamepadDeviceType(gamepad->joystick->instance_id); } } @@ -1778,8 +1778,8 @@ static GamepadMapping_t *SDL_PrivateGetGamepadMapping(SDL_JoystickID instance_id SDL_AssertJoysticksLocked(); - name = SDL_GetJoystickInstanceName(instance_id); - guid = SDL_GetJoystickInstanceGUID(instance_id); + name = SDL_GetJoystickDeviceName(instance_id); + guid = SDL_GetJoystickDeviceGUID(instance_id); mapping = SDL_PrivateGetGamepadMappingForNameAndGUID(name, guid); if (!mapping && create_mapping) { SDL_GamepadMapping raw_map; @@ -2246,7 +2246,7 @@ char *SDL_GetGamepadMapping(SDL_Gamepad *gamepad) */ int SDL_SetGamepadMapping(SDL_JoystickID instance_id, const char *mapping) { - SDL_JoystickGUID guid = SDL_GetJoystickInstanceGUID(instance_id); + SDL_JoystickGUID guid = SDL_GetJoystickDeviceGUID(instance_id); int retval = -1; if (SDL_memcmp(&guid, &s_zeroGUID, sizeof(guid)) == 0) { @@ -2420,7 +2420,7 @@ SDL_JoystickID *SDL_GetGamepads(int *count) return joysticks; } -const char *SDL_GetGamepadInstanceName(SDL_JoystickID instance_id) +const char *SDL_GetGamepadDeviceName(SDL_JoystickID instance_id) { const char *retval = NULL; @@ -2429,7 +2429,7 @@ const char *SDL_GetGamepadInstanceName(SDL_JoystickID instance_id) GamepadMapping_t *mapping = SDL_PrivateGetGamepadMapping(instance_id, SDL_TRUE); if (mapping) { if (SDL_strcmp(mapping->name, "*") == 0) { - retval = SDL_GetJoystickInstanceName(instance_id); + retval = SDL_GetJoystickDeviceName(instance_id); } else { retval = mapping->name; } @@ -2440,37 +2440,37 @@ const char *SDL_GetGamepadInstanceName(SDL_JoystickID instance_id) return retval; } -const char *SDL_GetGamepadInstancePath(SDL_JoystickID instance_id) +const char *SDL_GetGamepadDevicePath(SDL_JoystickID instance_id) { - return SDL_GetJoystickInstancePath(instance_id); + return SDL_GetJoystickDevicePath(instance_id); } -int SDL_GetGamepadInstancePlayerIndex(SDL_JoystickID instance_id) +int SDL_GetGamepadDevicePlayerIndex(SDL_JoystickID instance_id) { - return SDL_GetJoystickInstancePlayerIndex(instance_id); + return SDL_GetJoystickDevicePlayerIndex(instance_id); } -SDL_JoystickGUID SDL_GetGamepadInstanceGUID(SDL_JoystickID instance_id) +SDL_JoystickGUID SDL_GetGamepadDeviceGUID(SDL_JoystickID instance_id) { - return SDL_GetJoystickInstanceGUID(instance_id); + return SDL_GetJoystickDeviceGUID(instance_id); } -Uint16 SDL_GetGamepadInstanceVendor(SDL_JoystickID instance_id) +Uint16 SDL_GetGamepadDeviceVendor(SDL_JoystickID instance_id) { - return SDL_GetJoystickInstanceVendor(instance_id); + return SDL_GetJoystickDeviceVendor(instance_id); } -Uint16 SDL_GetGamepadInstanceProduct(SDL_JoystickID instance_id) +Uint16 SDL_GetGamepadDeviceProduct(SDL_JoystickID instance_id) { - return SDL_GetJoystickInstanceProduct(instance_id); + return SDL_GetJoystickDeviceProduct(instance_id); } -Uint16 SDL_GetGamepadInstanceProductVersion(SDL_JoystickID instance_id) +Uint16 SDL_GetGamepadDeviceProductVersion(SDL_JoystickID instance_id) { - return SDL_GetJoystickInstanceProductVersion(instance_id); + return SDL_GetJoystickDeviceProductVersion(instance_id); } -SDL_GamepadType SDL_GetGamepadInstanceType(SDL_JoystickID instance_id) +SDL_GamepadType SDL_GetGamepadDeviceType(SDL_JoystickID instance_id) { SDL_GamepadType type = SDL_GAMEPAD_TYPE_UNKNOWN; @@ -2497,21 +2497,21 @@ SDL_GamepadType SDL_GetGamepadInstanceType(SDL_JoystickID instance_id) if (type != SDL_GAMEPAD_TYPE_UNKNOWN) { return type; } - return SDL_GetRealGamepadInstanceType(instance_id); + return SDL_GetRealGamepadDeviceType(instance_id); } -SDL_GamepadType SDL_GetRealGamepadInstanceType(SDL_JoystickID instance_id) +SDL_GamepadType SDL_GetRealGamepadDeviceType(SDL_JoystickID instance_id) { SDL_GamepadType type = SDL_GAMEPAD_TYPE_UNKNOWN; const SDL_SteamVirtualGamepadInfo *info; SDL_LockJoysticks(); { - info = SDL_GetJoystickInstanceVirtualGamepadInfo(instance_id); + info = SDL_GetJoystickDeviceVirtualGamepadInfo(instance_id); if (info) { type = info->type; } else { - type = SDL_GetGamepadTypeFromGUID(SDL_GetJoystickInstanceGUID(instance_id), SDL_GetJoystickInstanceName(instance_id)); + type = SDL_GetGamepadTypeFromGUID(SDL_GetJoystickDeviceGUID(instance_id), SDL_GetJoystickDeviceName(instance_id)); } } SDL_UnlockJoysticks(); @@ -2519,7 +2519,7 @@ SDL_GamepadType SDL_GetRealGamepadInstanceType(SDL_JoystickID instance_id) return type; } -char *SDL_GetGamepadInstanceMapping(SDL_JoystickID instance_id) +char *SDL_GetGamepadDeviceMapping(SDL_JoystickID instance_id) { char *retval = NULL; @@ -2528,7 +2528,7 @@ char *SDL_GetGamepadInstanceMapping(SDL_JoystickID instance_id) GamepadMapping_t *mapping = SDL_PrivateGetGamepadMapping(instance_id, SDL_TRUE); if (mapping) { char pchGUID[33]; - const SDL_JoystickGUID guid = SDL_GetJoystickInstanceGUID(instance_id); + const SDL_JoystickGUID guid = SDL_GetJoystickDeviceGUID(instance_id); SDL_GetJoystickGUIDString(guid, pchGUID, sizeof(pchGUID)); SDL_asprintf(&retval, "%s,%s,%s", pchGUID, mapping->name, mapping->mapping); } @@ -3272,14 +3272,14 @@ int SDL_GetGamepadSensorData(SDL_Gamepad *gamepad, SDL_SensorType type, float *d return SDL_Unsupported(); } -SDL_JoystickID SDL_GetGamepadInstanceID(SDL_Gamepad *gamepad) +SDL_JoystickID SDL_GetGamepadDeviceID(SDL_Gamepad *gamepad) { SDL_Joystick *joystick = SDL_GetGamepadJoystick(gamepad); if (!joystick) { return 0; } - return SDL_GetJoystickInstanceID(joystick); + return SDL_GetJoystickDeviceID(joystick); } SDL_PropertiesID SDL_GetGamepadProperties(SDL_Gamepad *gamepad) @@ -3336,7 +3336,7 @@ SDL_GamepadType SDL_GetGamepadType(SDL_Gamepad *gamepad) { CHECK_GAMEPAD_MAGIC(gamepad, SDL_GAMEPAD_TYPE_UNKNOWN); - info = SDL_GetJoystickInstanceVirtualGamepadInfo(gamepad->joystick->instance_id); + info = SDL_GetJoystickDeviceVirtualGamepadInfo(gamepad->joystick->instance_id); if (info) { type = info->type; } else { diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c index 15ee1e44f682e..65ae2778004fc 100644 --- a/src/joystick/SDL_joystick.c +++ b/src/joystick/SDL_joystick.c @@ -754,7 +754,7 @@ SDL_JoystickID *SDL_GetJoysticks(int *count) return joysticks; } -const SDL_SteamVirtualGamepadInfo *SDL_GetJoystickInstanceVirtualGamepadInfo(SDL_JoystickID instance_id) +const SDL_SteamVirtualGamepadInfo *SDL_GetJoystickDeviceVirtualGamepadInfo(SDL_JoystickID instance_id) { SDL_JoystickDriver *driver; int device_index; @@ -770,7 +770,7 @@ const SDL_SteamVirtualGamepadInfo *SDL_GetJoystickInstanceVirtualGamepadInfo(SDL /* * Get the implementation dependent name of a joystick */ -const char *SDL_GetJoystickInstanceName(SDL_JoystickID instance_id) +const char *SDL_GetJoystickDeviceName(SDL_JoystickID instance_id) { SDL_JoystickDriver *driver; int device_index; @@ -778,7 +778,7 @@ const char *SDL_GetJoystickInstanceName(SDL_JoystickID instance_id) const SDL_SteamVirtualGamepadInfo *info; SDL_LockJoysticks(); - info = SDL_GetJoystickInstanceVirtualGamepadInfo(instance_id); + info = SDL_GetJoystickDeviceVirtualGamepadInfo(instance_id); if (info) { name = info->name; } else if (SDL_GetDriverAndJoystickIndex(instance_id, &driver, &device_index)) { @@ -792,7 +792,7 @@ const char *SDL_GetJoystickInstanceName(SDL_JoystickID instance_id) /* * Get the implementation dependent path of a joystick */ -const char *SDL_GetJoystickInstancePath(SDL_JoystickID instance_id) +const char *SDL_GetJoystickDevicePath(SDL_JoystickID instance_id) { SDL_JoystickDriver *driver; int device_index; @@ -813,7 +813,7 @@ const char *SDL_GetJoystickInstancePath(SDL_JoystickID instance_id) /* * Get the player index of a joystick, or -1 if it's not available */ -int SDL_GetJoystickInstancePlayerIndex(SDL_JoystickID instance_id) +int SDL_GetJoystickDevicePlayerIndex(SDL_JoystickID instance_id) { int player_index; @@ -864,14 +864,14 @@ static SDL_bool IsROGAlly(SDL_Joystick *joystick) for (i = 0; sensors[i]; ++i) { SDL_SensorID sensor = sensors[i]; - if (!has_ally_accel && SDL_GetSensorInstanceType(sensor) == SDL_SENSOR_ACCEL) { - const char *sensor_name = SDL_GetSensorInstanceName(sensor); + if (!has_ally_accel && SDL_GetSensorDeviceType(sensor) == SDL_SENSOR_ACCEL) { + const char *sensor_name = SDL_GetSensorDeviceName(sensor); if (sensor_name && SDL_strcmp(sensor_name, "Sensor BMI320 Acc") == 0) { has_ally_accel = SDL_TRUE; } } - if (!has_ally_gyro && SDL_GetSensorInstanceType(sensor) == SDL_SENSOR_GYRO) { - const char *sensor_name = SDL_GetSensorInstanceName(sensor); + if (!has_ally_gyro && SDL_GetSensorDeviceType(sensor) == SDL_SENSOR_GYRO) { + const char *sensor_name = SDL_GetSensorDeviceName(sensor); if (sensor_name && SDL_strcmp(sensor_name, "Sensor BMI320 Gyr") == 0) { has_ally_gyro = SDL_TRUE; } @@ -966,14 +966,14 @@ static void AttemptSensorFusion(SDL_Joystick *joystick, SDL_bool invert_sensors) for (i = 0; sensors[i]; ++i) { SDL_SensorID sensor = sensors[i]; - if (!joystick->accel_sensor && SDL_GetSensorInstanceType(sensor) == SDL_SENSOR_ACCEL) { + if (!joystick->accel_sensor && SDL_GetSensorDeviceType(sensor) == SDL_SENSOR_ACCEL) { /* Increment the sensor subsystem reference count */ SDL_InitSubSystem(SDL_INIT_SENSOR); joystick->accel_sensor = sensor; SDL_PrivateJoystickAddSensor(joystick, SDL_SENSOR_ACCEL, 0.0f); } - if (!joystick->gyro_sensor && SDL_GetSensorInstanceType(sensor) == SDL_SENSOR_GYRO) { + if (!joystick->gyro_sensor && SDL_GetSensorDeviceType(sensor) == SDL_SENSOR_GYRO) { /* Increment the sensor subsystem reference count */ SDL_InitSubSystem(SDL_INIT_SENSOR); @@ -1151,7 +1151,7 @@ SDL_Joystick *SDL_OpenJoystick(SDL_JoystickID instance_id) } /* Get the Steam Input API handle */ - info = SDL_GetJoystickInstanceVirtualGamepadInfo(instance_id); + info = SDL_GetJoystickDeviceVirtualGamepadInfo(instance_id); if (info) { joystick->steam_handle = info->handle; } @@ -1567,7 +1567,7 @@ SDL_bool SDL_JoystickConnected(SDL_Joystick *joystick) /* * Get the instance id for this opened joystick */ -SDL_JoystickID SDL_GetJoystickInstanceID(SDL_Joystick *joystick) +SDL_JoystickID SDL_GetJoystickDeviceID(SDL_Joystick *joystick) { SDL_JoystickID retval; @@ -1651,7 +1651,7 @@ const char *SDL_GetJoystickName(SDL_Joystick *joystick) { CHECK_JOYSTICK_MAGIC(joystick, NULL); - info = SDL_GetJoystickInstanceVirtualGamepadInfo(joystick->instance_id); + info = SDL_GetJoystickDeviceVirtualGamepadInfo(joystick->instance_id); if (info) { retval = info->name; } else { @@ -2362,7 +2362,7 @@ static void SendSteamHandleUpdateEvents(void) continue; } - info = SDL_GetJoystickInstanceVirtualGamepadInfo(joystick->instance_id); + info = SDL_GetJoystickDeviceVirtualGamepadInfo(joystick->instance_id); if (info) { if (joystick->steam_handle != info->handle) { joystick->steam_handle = info->handle; @@ -3258,7 +3258,7 @@ SDL_bool SDL_ShouldIgnoreJoystick(const char *name, SDL_JoystickGUID guid) } /* return the guid for this index */ -SDL_JoystickGUID SDL_GetJoystickInstanceGUID(SDL_JoystickID instance_id) +SDL_JoystickGUID SDL_GetJoystickDeviceGUID(SDL_JoystickID instance_id) { SDL_JoystickDriver *driver; int device_index; @@ -3275,17 +3275,17 @@ SDL_JoystickGUID SDL_GetJoystickInstanceGUID(SDL_JoystickID instance_id) return guid; } -Uint16 SDL_GetJoystickInstanceVendor(SDL_JoystickID instance_id) +Uint16 SDL_GetJoystickDeviceVendor(SDL_JoystickID instance_id) { Uint16 vendor; const SDL_SteamVirtualGamepadInfo *info; SDL_LockJoysticks(); - info = SDL_GetJoystickInstanceVirtualGamepadInfo(instance_id); + info = SDL_GetJoystickDeviceVirtualGamepadInfo(instance_id); if (info) { vendor = info->vendor_id; } else { - SDL_JoystickGUID guid = SDL_GetJoystickInstanceGUID(instance_id); + SDL_JoystickGUID guid = SDL_GetJoystickDeviceGUID(instance_id); SDL_GetJoystickGUIDInfo(guid, &vendor, NULL, NULL, NULL); } @@ -3294,17 +3294,17 @@ Uint16 SDL_GetJoystickInstanceVendor(SDL_JoystickID instance_id) return vendor; } -Uint16 SDL_GetJoystickInstanceProduct(SDL_JoystickID instance_id) +Uint16 SDL_GetJoystickDeviceProduct(SDL_JoystickID instance_id) { Uint16 product; const SDL_SteamVirtualGamepadInfo *info; SDL_LockJoysticks(); - info = SDL_GetJoystickInstanceVirtualGamepadInfo(instance_id); + info = SDL_GetJoystickDeviceVirtualGamepadInfo(instance_id); if (info) { product = info->product_id; } else { - SDL_JoystickGUID guid = SDL_GetJoystickInstanceGUID(instance_id); + SDL_JoystickGUID guid = SDL_GetJoystickDeviceGUID(instance_id); SDL_GetJoystickGUIDInfo(guid, NULL, &product, NULL, NULL); } @@ -3313,19 +3313,19 @@ Uint16 SDL_GetJoystickInstanceProduct(SDL_JoystickID instance_id) return product; } -Uint16 SDL_GetJoystickInstanceProductVersion(SDL_JoystickID instance_id) +Uint16 SDL_GetJoystickDeviceProductVersion(SDL_JoystickID instance_id) { Uint16 version; - SDL_JoystickGUID guid = SDL_GetJoystickInstanceGUID(instance_id); + SDL_JoystickGUID guid = SDL_GetJoystickDeviceGUID(instance_id); SDL_GetJoystickGUIDInfo(guid, NULL, NULL, &version, NULL); return version; } -SDL_JoystickType SDL_GetJoystickInstanceType(SDL_JoystickID instance_id) +SDL_JoystickType SDL_GetJoystickDeviceType(SDL_JoystickID instance_id) { SDL_JoystickType type; - SDL_JoystickGUID guid = SDL_GetJoystickInstanceGUID(instance_id); + SDL_JoystickGUID guid = SDL_GetJoystickDeviceGUID(instance_id); type = SDL_GetJoystickGUIDType(guid); if (type == SDL_JOYSTICK_TYPE_UNKNOWN) { @@ -3362,7 +3362,7 @@ Uint16 SDL_GetJoystickVendor(SDL_Joystick *joystick) { CHECK_JOYSTICK_MAGIC(joystick, 0); - info = SDL_GetJoystickInstanceVirtualGamepadInfo(joystick->instance_id); + info = SDL_GetJoystickDeviceVirtualGamepadInfo(joystick->instance_id); if (info) { vendor = info->vendor_id; } else { @@ -3385,7 +3385,7 @@ Uint16 SDL_GetJoystickProduct(SDL_Joystick *joystick) { CHECK_JOYSTICK_MAGIC(joystick, 0); - info = SDL_GetJoystickInstanceVirtualGamepadInfo(joystick->instance_id); + info = SDL_GetJoystickDeviceVirtualGamepadInfo(joystick->instance_id); if (info) { product = info->product_id; } else { diff --git a/src/joystick/SDL_joystick_c.h b/src/joystick/SDL_joystick_c.h index ba99b012c8e2a..8a2514998104f 100644 --- a/src/joystick/SDL_joystick_c.h +++ b/src/joystick/SDL_joystick_c.h @@ -170,7 +170,7 @@ extern int SDL_SendJoystickSensor(Uint64 timestamp, SDL_Joystick *joystick, SDL_ extern void SDL_SendJoystickPowerInfo(SDL_Joystick *joystick, SDL_PowerState state, int percent); /* Function to get the Steam virtual gamepad info for a joystick */ -extern const struct SDL_SteamVirtualGamepadInfo *SDL_GetJoystickInstanceVirtualGamepadInfo(SDL_JoystickID instance_id); +extern const struct SDL_SteamVirtualGamepadInfo *SDL_GetJoystickDeviceVirtualGamepadInfo(SDL_JoystickID instance_id); /* Internal sanity checking functions */ extern SDL_bool SDL_IsJoystickValid(SDL_Joystick *joystick); diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c index 1e240f974eb04..93d8754cb7e0d 100644 --- a/src/joystick/hidapi/SDL_hidapijoystick.c +++ b/src/joystick/hidapi/SDL_hidapijoystick.c @@ -617,7 +617,7 @@ static int HIDAPI_JoystickInit(void) return 0; } -static SDL_bool HIDAPI_AddJoystickInstanceToDevice(SDL_HIDAPI_Device *device, SDL_JoystickID joystickID) +static SDL_bool HIDAPI_AddJoystickDeviceToDevice(SDL_HIDAPI_Device *device, SDL_JoystickID joystickID) { SDL_JoystickID *joysticks = (SDL_JoystickID *)SDL_realloc(device->joysticks, (device->num_joysticks + 1) * sizeof(*device->joysticks)); if (!joysticks) { @@ -629,7 +629,7 @@ static SDL_bool HIDAPI_AddJoystickInstanceToDevice(SDL_HIDAPI_Device *device, SD return SDL_TRUE; } -static SDL_bool HIDAPI_DelJoystickInstanceFromDevice(SDL_HIDAPI_Device *device, SDL_JoystickID joystickID) +static SDL_bool HIDAPI_DelJoystickDeviceFromDevice(SDL_HIDAPI_Device *device, SDL_JoystickID joystickID) { int i, size; @@ -648,7 +648,7 @@ static SDL_bool HIDAPI_DelJoystickInstanceFromDevice(SDL_HIDAPI_Device *device, return SDL_FALSE; } -static SDL_bool HIDAPI_JoystickInstanceIsUnique(SDL_HIDAPI_Device *device, SDL_JoystickID joystickID) +static SDL_bool HIDAPI_JoystickDeviceIsUnique(SDL_HIDAPI_Device *device, SDL_JoystickID joystickID) { if (device->parent && device->num_joysticks == 1 && device->parent->num_joysticks == 1 && device->joysticks[0] == device->parent->joysticks[0]) { @@ -804,11 +804,11 @@ SDL_bool HIDAPI_JoystickConnected(SDL_HIDAPI_Device *device, SDL_JoystickID *pJo } joystickID = SDL_GetNextObjectID(); - HIDAPI_AddJoystickInstanceToDevice(device, joystickID); + HIDAPI_AddJoystickDeviceToDevice(device, joystickID); for (i = 0; i < device->num_children; ++i) { SDL_HIDAPI_Device *child = device->children[i]; - HIDAPI_AddJoystickInstanceToDevice(child, joystickID); + HIDAPI_AddJoystickDeviceToDevice(child, joystickID); } ++SDL_HIDAPI_numjoysticks; @@ -827,7 +827,7 @@ void HIDAPI_JoystickDisconnected(SDL_HIDAPI_Device *device, SDL_JoystickID joyst SDL_LockJoysticks(); - if (!HIDAPI_JoystickInstanceIsUnique(device, joystickID)) { + if (!HIDAPI_JoystickDeviceIsUnique(device, joystickID)) { /* Disconnecting a child always disconnects the parent */ device = device->parent; } @@ -839,11 +839,11 @@ void HIDAPI_JoystickDisconnected(SDL_HIDAPI_Device *device, SDL_JoystickID joyst HIDAPI_JoystickClose(joystick); } - HIDAPI_DelJoystickInstanceFromDevice(device, joystickID); + HIDAPI_DelJoystickDeviceFromDevice(device, joystickID); for (j = 0; j < device->num_children; ++j) { SDL_HIDAPI_Device *child = device->children[j]; - HIDAPI_DelJoystickInstanceFromDevice(child, joystickID); + HIDAPI_DelJoystickDeviceFromDevice(child, joystickID); } --SDL_HIDAPI_numjoysticks; diff --git a/src/joystick/vita/SDL_sysjoystick.c b/src/joystick/vita/SDL_sysjoystick.c index fcd4f26aadaee..59a95cb7173a8 100644 --- a/src/joystick/vita/SDL_sysjoystick.c +++ b/src/joystick/vita/SDL_sysjoystick.c @@ -234,7 +234,7 @@ static void VITA_JoystickUpdate(SDL_Joystick *joystick) SceCtrlData *pad = NULL; Uint64 timestamp = SDL_GetTicksNS(); - int index = (int)SDL_GetJoystickInstanceID(joystick) - 1; + int index = (int)SDL_GetJoystickDeviceID(joystick) - 1; if (index == 0) pad = &pad0; @@ -327,7 +327,7 @@ static SDL_JoystickGUID VITA_JoystickGetDeviceGUID(int device_index) static int VITA_JoystickRumble(SDL_Joystick *joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble) { - int index = (int)SDL_GetJoystickInstanceID(joystick) - 1; + int index = (int)SDL_GetJoystickDeviceID(joystick) - 1; SceCtrlActuator act; if (index < 0 || index > 3) { @@ -349,7 +349,7 @@ static int VITA_JoystickRumbleTriggers(SDL_Joystick *joystick, Uint16 left, Uint static int VITA_JoystickSetLED(SDL_Joystick *joystick, Uint8 red, Uint8 green, Uint8 blue) { - int index = (int)SDL_GetJoystickInstanceID(joystick) - 1; + int index = (int)SDL_GetJoystickDeviceID(joystick) - 1; if (index < 0 || index > 3) { return -1; } diff --git a/src/sensor/SDL_sensor.c b/src/sensor/SDL_sensor.c index e584788f10e43..26c164532bfc2 100644 --- a/src/sensor/SDL_sensor.c +++ b/src/sensor/SDL_sensor.c @@ -238,7 +238,7 @@ static SDL_bool SDL_GetDriverAndSensorIndex(SDL_SensorID instance_id, SDL_Sensor /* * Get the implementation dependent name of a sensor */ -const char *SDL_GetSensorInstanceName(SDL_SensorID instance_id) +const char *SDL_GetSensorDeviceName(SDL_SensorID instance_id) { SDL_SensorDriver *driver; int device_index; @@ -253,7 +253,7 @@ const char *SDL_GetSensorInstanceName(SDL_SensorID instance_id) return name ? SDL_FreeLater(SDL_strdup(name)) : NULL; } -SDL_SensorType SDL_GetSensorInstanceType(SDL_SensorID instance_id) +SDL_SensorType SDL_GetSensorDeviceType(SDL_SensorID instance_id) { SDL_SensorDriver *driver; int device_index; @@ -268,7 +268,7 @@ SDL_SensorType SDL_GetSensorInstanceType(SDL_SensorID instance_id) return type; } -int SDL_GetSensorInstanceNonPortableType(SDL_SensorID instance_id) +int SDL_GetSensorDeviceNonPortableType(SDL_SensorID instance_id) { SDL_SensorDriver *driver; int device_index; @@ -453,7 +453,7 @@ int SDL_GetSensorNonPortableType(SDL_Sensor *sensor) /* * Get the instance id for this opened sensor */ -SDL_SensorID SDL_GetSensorInstanceID(SDL_Sensor *sensor) +SDL_SensorID SDL_GetSensorDeviceID(SDL_Sensor *sensor) { SDL_SensorID retval; diff --git a/test/testautomation_joystick.c b/test/testautomation_joystick.c index 9e9fdd297eaf1..b4925337afb54 100644 --- a/test/testautomation_joystick.c +++ b/test/testautomation_joystick.c @@ -61,7 +61,7 @@ static int TestVirtualJoystick(void *arg) SDL_UpdateJoysticks(); SDLTest_AssertCheck(SDL_GetJoystickButton(joystick, SDL_GAMEPAD_BUTTON_SOUTH) == SDL_RELEASED, "SDL_GetJoystickButton(SDL_GAMEPAD_BUTTON_SOUTH) == SDL_RELEASED"); - gamepad = SDL_OpenGamepad(SDL_GetJoystickInstanceID(joystick)); + gamepad = SDL_OpenGamepad(SDL_GetJoystickDeviceID(joystick)); SDLTest_AssertCheck(gamepad != NULL, "SDL_OpenGamepad() succeeded"); if (gamepad) { SDLTest_AssertCheck(SDL_strcmp(SDL_GetGamepadName(gamepad), desc.name) == 0, "SDL_GetGamepadName()"); @@ -69,7 +69,7 @@ static int TestVirtualJoystick(void *arg) SDLTest_AssertCheck(SDL_GetGamepadProduct(gamepad) == desc.product_id, "SDL_GetGamepadProduct()"); /* Set an explicit mapping with a different name */ - SDL_SetGamepadMapping(SDL_GetJoystickInstanceID(joystick), "ff0013db5669727475616c2043007601,Virtual Gamepad,a:b0,b:b1,x:b2,y:b3,back:b4,guide:b5,start:b6,leftstick:b7,rightstick:b8,leftshoulder:b9,rightshoulder:b10,dpup:b11,dpdown:b12,dpleft:b13,dpright:b14,misc1:b15,paddle1:b16,paddle2:b17,paddle3:b18,paddle4:b19,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,"); + SDL_SetGamepadMapping(SDL_GetJoystickDeviceID(joystick), "ff0013db5669727475616c2043007601,Virtual Gamepad,a:b0,b:b1,x:b2,y:b3,back:b4,guide:b5,start:b6,leftstick:b7,rightstick:b8,leftshoulder:b9,rightshoulder:b10,dpup:b11,dpdown:b12,dpleft:b13,dpright:b14,misc1:b15,paddle1:b16,paddle2:b17,paddle3:b18,paddle4:b19,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,"); SDLTest_AssertCheck(SDL_strcmp(SDL_GetGamepadName(gamepad), "Virtual Gamepad") == 0, "SDL_GetGamepadName() == Virtual Gamepad"); SDLTest_AssertCheck(SDL_GetGamepadButtonLabel(gamepad, SDL_GAMEPAD_BUTTON_SOUTH) == SDL_GAMEPAD_BUTTON_LABEL_A, "SDL_GetGamepadButtonLabel(SDL_GAMEPAD_BUTTON_SOUTH) == SDL_GAMEPAD_BUTTON_LABEL_A"); @@ -83,7 +83,7 @@ static int TestVirtualJoystick(void *arg) SDLTest_AssertCheck(SDL_GetGamepadButton(gamepad, SDL_GAMEPAD_BUTTON_SOUTH) == SDL_RELEASED, "SDL_GetGamepadButton(SDL_GAMEPAD_BUTTON_SOUTH) == SDL_RELEASED"); /* Set an explicit mapping with legacy Nintendo style buttons */ - SDL_SetGamepadMapping(SDL_GetJoystickInstanceID(joystick), "ff0013db5669727475616c2043007601,Virtual Nintendo Gamepad,a:b1,b:b0,x:b3,y:b2,back:b4,guide:b5,start:b6,leftstick:b7,rightstick:b8,leftshoulder:b9,rightshoulder:b10,dpup:b11,dpdown:b12,dpleft:b13,dpright:b14,misc1:b15,paddle1:b16,paddle2:b17,paddle3:b18,paddle4:b19,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,"); + SDL_SetGamepadMapping(SDL_GetJoystickDeviceID(joystick), "ff0013db5669727475616c2043007601,Virtual Nintendo Gamepad,a:b1,b:b0,x:b3,y:b2,back:b4,guide:b5,start:b6,leftstick:b7,rightstick:b8,leftshoulder:b9,rightshoulder:b10,dpup:b11,dpdown:b12,dpleft:b13,dpright:b14,misc1:b15,paddle1:b16,paddle2:b17,paddle3:b18,paddle4:b19,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,"); SDLTest_AssertCheck(SDL_strcmp(SDL_GetGamepadName(gamepad), "Virtual Nintendo Gamepad") == 0, "SDL_GetGamepadName() == Virtual Nintendo Gamepad"); SDLTest_AssertCheck(SDL_GetGamepadButtonLabel(gamepad, SDL_GAMEPAD_BUTTON_SOUTH) == SDL_GAMEPAD_BUTTON_LABEL_B, "SDL_GetGamepadButtonLabel(SDL_GAMEPAD_BUTTON_SOUTH) == SDL_GAMEPAD_BUTTON_LABEL_B"); @@ -97,7 +97,7 @@ static int TestVirtualJoystick(void *arg) SDLTest_AssertCheck(SDL_GetGamepadButton(gamepad, SDL_GAMEPAD_BUTTON_SOUTH) == SDL_RELEASED, "SDL_GetGamepadButton(SDL_GAMEPAD_BUTTON_SOUTH) == SDL_RELEASED"); /* Set an explicit mapping with PS4 style buttons */ - SDL_SetGamepadMapping(SDL_GetJoystickInstanceID(joystick), "ff0013db5669727475616c2043007601,Virtual PS4 Gamepad,type:ps4,a:b0,b:b1,x:b2,y:b3,back:b4,guide:b5,start:b6,leftstick:b7,rightstick:b8,leftshoulder:b9,rightshoulder:b10,dpup:b11,dpdown:b12,dpleft:b13,dpright:b14,misc1:b15,paddle1:b16,paddle2:b17,paddle3:b18,paddle4:b19,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,"); + SDL_SetGamepadMapping(SDL_GetJoystickDeviceID(joystick), "ff0013db5669727475616c2043007601,Virtual PS4 Gamepad,type:ps4,a:b0,b:b1,x:b2,y:b3,back:b4,guide:b5,start:b6,leftstick:b7,rightstick:b8,leftshoulder:b9,rightshoulder:b10,dpup:b11,dpdown:b12,dpleft:b13,dpright:b14,misc1:b15,paddle1:b16,paddle2:b17,paddle3:b18,paddle4:b19,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,"); SDLTest_AssertCheck(SDL_strcmp(SDL_GetGamepadName(gamepad), "Virtual PS4 Gamepad") == 0, "SDL_GetGamepadName() == Virtual PS4 Gamepad"); SDLTest_AssertCheck(SDL_GetGamepadButtonLabel(gamepad, SDL_GAMEPAD_BUTTON_SOUTH) == SDL_GAMEPAD_BUTTON_LABEL_CROSS, "SDL_GetGamepadButtonLabel(SDL_GAMEPAD_BUTTON_SOUTH) == SDL_GAMEPAD_BUTTON_LABEL_CROSS"); diff --git a/test/testcontroller.c b/test/testcontroller.c index 5c50d21f65fa3..96379fb7c8dce 100644 --- a/test/testcontroller.c +++ b/test/testcontroller.c @@ -1371,7 +1371,7 @@ static void DrawGamepadInfo(SDL_Renderer *renderer) } if (controller->joystick) { - SDL_snprintf(text, sizeof(text), "(%" SDL_PRIu32 ")", SDL_GetJoystickInstanceID(controller->joystick)); + SDL_snprintf(text, sizeof(text), "(%" SDL_PRIu32 ")", SDL_GetJoystickDeviceID(controller->joystick)); x = SCREEN_WIDTH - (FONT_CHARACTER_SIZE * SDL_strlen(text)) - 8.0f; y = 8.0f; SDLTest_DrawString(renderer, x, y, text); diff --git a/test/testsensor.c b/test/testsensor.c index a5b715e663e27..c6a762cc53fc0 100644 --- a/test/testsensor.c +++ b/test/testsensor.c @@ -91,11 +91,11 @@ int main(int argc, char **argv) for (i = 0; i < num_sensors; ++i) { SDL_Log("Sensor %" SDL_PRIu32 ": %s, type %s, platform type %d\n", sensors[i], - SDL_GetSensorInstanceName(sensors[i]), - GetSensorTypeString(SDL_GetSensorInstanceType(sensors[i])), - SDL_GetSensorInstanceNonPortableType(sensors[i])); + SDL_GetSensorDeviceName(sensors[i]), + GetSensorTypeString(SDL_GetSensorDeviceType(sensors[i])), + SDL_GetSensorDeviceNonPortableType(sensors[i])); - if (SDL_GetSensorInstanceType(sensors[i]) != SDL_SENSOR_UNKNOWN) { + if (SDL_GetSensorDeviceType(sensors[i]) != SDL_SENSOR_UNKNOWN) { SDL_Sensor *sensor = SDL_OpenSensor(sensors[i]); if (!sensor) { SDL_Log("Couldn't open sensor %" SDL_PRIu32 ": %s\n", sensors[i], SDL_GetError());