Просмотр исходного кода

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

This reverts commit 964bedfdd906673944ea5fce52c2e748a62f4994.

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.
Sam Lantinga 3 месяцев назад
Родитель
Сommit
ef0ae4c903
1 измененных файлов с 2 добавлено и 8 удалено
  1. 2 8
      src/joystick/apple/SDL_mfijoystick.m

+ 2 - 8
src/joystick/apple/SDL_mfijoystick.m

@@ -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) {