eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-06-01 09:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Updated gamepad, joystick, sensor APIs, removing device indices

Browse source 
Instead of indexing into an internal list of devices which requires locking, we return a list of device IDs which can then be queried individually.

Reference: https://github.com/libsdl-org/SDL/issues/6889
This commit is contained in:
Sam Lantinga 2022-12-27 18:10:06 -08:00
parent e40a96155f
commit 16092f58bb
27 changed files with 917 additions and 797 deletions
Download patch file Download diff file Expand all files Collapse all files

33
test/testsensor.c
View file

@ -57,8 +57,8 @@ static void HandleSensorEvent(SDL_SensorEvent *event)
int main(int argc, char **argv)
{
int i;
int num_sensors, num_opened;
SDL_SensorID *sensors;
int i, num_sensors, num_opened;
/* Load the SDL library */
if (SDL_Init(SDL_INIT_SENSOR) < 0) {
@ -66,25 +66,28 @@ int main(int argc, char **argv)
return 1;
}
num_sensors = SDL_GetNumSensors();
sensors = SDL_GetSensors(&num_sensors);
num_opened = 0;
SDL_Log("There are %d sensors available\n", num_sensors);
for (i = 0; i < num_sensors; ++i) {
SDL_Log("Sensor %" SDL_PRIs32 ": %s, type %s, platform type %d\n",
SDL_GetSensorDeviceInstanceID(i),
SDL_GetSensorDeviceName(i),
GetSensorTypeString(SDL_GetSensorDeviceType(i)),
SDL_GetSensorDeviceNonPortableType(i));
if (sensors) {
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]));
if (SDL_GetSensorDeviceType(i) != SDL_SENSOR_UNKNOWN) {
SDL_Sensor *sensor = SDL_OpenSensor(i);
if (sensor == NULL) {
SDL_Log("Couldn't open sensor %" SDL_PRIs32 ": %s\n", SDL_GetSensorDeviceInstanceID(i), SDL_GetError());
} else {
++num_opened;
if (SDL_GetSensorInstanceType(sensors[i]) != SDL_SENSOR_UNKNOWN) {
SDL_Sensor *sensor = SDL_OpenSensor(sensors[i]);
if (sensor == NULL) {
SDL_Log("Couldn't open sensor %" SDL_PRIu32 ": %s\n", sensors[i], SDL_GetError());
} else {
++num_opened;
}
}
}
SDL_free(sensors);
}
SDL_Log("Opened %d sensors\n", num_opened);