SDL3 compat for joy_set_led

oddbookworm · oddbookworm · commit 53c0310261f8 · 2025-06-16T22:02:46.000-05:00
diff --git a/src_c/joystick.c b/src_c/joystick.c
@@ -548,10 +548,19 @@ joy_set_led(PyObject *self, PyObject *arg)
                      "set_led must be passed in a Color-compatible argument");
     }
 
+#if !SDL_VERSION_ATLEAST(3, 0, 0)
     if (SDL_JoystickSetLED(joy, colors[0], colors[1], colors[2]) < 0) {
         Py_RETURN_FALSE;
     }
     Py_RETURN_TRUE;
+#else
+    // SDL3 renames the function and sets an error message on failure
+    bool result = SDL_SetJoystickLED(joy, colors[0], colors[1], colors[2]);
+    if (!result) {
+        printf("%s\n", SDL_GetError());
+    }
+    return PyBool_FromLong(result);
+#endif
 }
 
 static PyMethodDef joy_methods[] = {

Original file line number	Diff line number	Diff line change
`@@ -548,10 +548,19 @@ joy_set_led(PyObject self, PyObject arg)`
`548`	`548`	`"set_led must be passed in a Color-compatible argument");`
`549`	`549`	`}`
`550`	`550`
	`551`	`+#if !SDL_VERSION_ATLEAST(3, 0, 0)`
`551`	`552`	`if (SDL_JoystickSetLED(joy, colors[0], colors[1], colors[2]) < 0) {`
`552`	`553`	`Py_RETURN_FALSE;`
`553`	`554`	`}`
`554`	`555`	`Py_RETURN_TRUE;`
	`556`	`+#else`
	`557`	`+ // SDL3 renames the function and sets an error message on failure`
	`558`	`+ bool result = SDL_SetJoystickLED(joy, colors[0], colors[1], colors[2]);`
	`559`	`+ if (!result) {`
	`560`	`+ printf("%s\n", SDL_GetError());`
	`561`	`+ }`
	`562`	`+ return PyBool_FromLong(result);`
	`563`	`+#endif`
`555`	`564`	`}`
`556`	`565`
`557`	`566`	`static PyMethodDef joy_methods[] = {`