use selected game controller instead of the current

sh95014 · Dec 19, 2023 · a0b008a · a0b008a
1 parent 364a102
commit a0b008a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/source/frontends/mariani/MarianiJoystick.mm b/source/frontends/mariani/MarianiJoystick.mm
@@ -15,15 +15,15 @@
 
 bool Gamepad::getButton(int i) const
 {
-    GCController *gc = [GCController current];
+    GCController *gc = [GCController defaultController];
     GCExtendedGamepad *gamepad = [gc extendedGamepad];
     GCControllerButtonInput *button = inputForButton(gamepad, i);
     return (button != nil) ? button.isPressed : 0;
 }
 
 double Gamepad::getAxis(int i) const
 {
-    GCController *gc = [GCController current];
+    GCController *gc = [GCController defaultController];
     GCExtendedGamepad *gamepad = [gc extendedGamepad];
 
     if (gamepad != nil) {

diff --git a/source/frontends/mariani/UserDefaults.h b/source/frontends/mariani/UserDefaults.h
@@ -32,6 +32,9 @@ extern NSString *NumericKeypadControllerIdentifier;
 
 @property (readonly) NSString *fullName;
 
++ (GCController *)defaultController;
++ (GCController *)controllerNamed:(NSString *)fullName;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/source/frontends/mariani/UserDefaults.m b/source/frontends/mariani/UserDefaults.m
@@ -60,15 +60,15 @@ - (void)setScreenshotsFolder:(NSURL *)screenshotsFolder {
 
 - (NSString *)gameController {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSString *name = [defaults stringForKey:GAME_CONTROLLER_KEY];
+    NSString *fullName = [defaults stringForKey:GAME_CONTROLLER_KEY];
 
-    if ([name isEqualToString:NumericKeypadControllerIdentifier]) {
-        return name;
-    } else if (name.length > 0) {
+    if ([fullName isEqualToString:NumericKeypadControllerIdentifier]) {
+        return fullName;
+    } else if (fullName.length > 0) {
         // make sure the selected controller is still conected
         for (GCController *controller in [GCController controllers]) {
-            if ([controller.fullName isEqualToString:name]) {
-                return name;
+            if ([controller.fullName isEqualToString:fullName]) {
+                return fullName;
             }
         }
     }
@@ -157,4 +157,21 @@ - (NSString *)fullName {
     return [NSString stringWithFormat:@"%@ %@", self.vendorName, self.productCategory];
 }
 
++ (GCController *)controllerNamed:(NSString *)fullName {
+    if (fullName != nil) {
+        for (GCController *controller in [GCController controllers]) {
+            if ([controller.fullName isEqualToString:fullName]) {
+                return controller;
+            }
+        }
+    }
+    return nil;
+}
+
++ (GCController *)defaultController {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NSString *fullName = [defaults stringForKey:GAME_CONTROLLER_KEY];
+    return [self controllerNamed:fullName];
+}
+
 @end