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

Revert "fix: use productCategory instead of vendorName for joy name for apple driver"

Browse Source 
This reverts commit 964bedfdd9.

The vendorName is more expressive and lets the user distinguish between different controllers of the same type, e.g. "PlayStation VR2 Sense Controller (R)" and "PlayStation VR2 Sense Controller (L)" vs "Spatial Controller"

If the product category is necessary, we can add a property to store that as additional information on the controller.
This commit is contained in:
Sam Lantinga
2025-11-19 11:35:38 -08:00
parent 6d60cc65cf
commit ef0ae4c903
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/joystick/apple/SDL_mfijoystick.m
View File

@@ -304,14 +304,8 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
* struct, and ARC doesn't work with structs. */
device->controller = (__bridge GCController *)CFBridgingRetain(controller);
if (@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)) {
if (controller.productCategory) {
name = controller.productCategory.UTF8String;
}
} else {
if (controller.vendorName) {
name = controller.vendorName.UTF8String;
}
if (controller.vendorName) {
name = controller.vendorName.UTF8String;
}
if (!name) {