Fix conflicts between controller-triggered run modes and swipe-trigge…

…red run-mode. Fixes #640
LIJI32 · Jun 28, 2024 · 407e540 · 407e540
1 parent 8db2490
commit 407e540
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 deletions.
diff --git a/iOS/GBBackgroundView.h b/iOS/GBBackgroundView.h
@@ -11,4 +11,5 @@
 
 - (void)enterPreviewMode:(bool)showLabel;
 - (void)reloadThemeImages;
+- (void)fadeOverlayOut;
 @end
diff --git a/iOS/GBViewController.h b/iOS/GBViewController.h
@@ -7,6 +7,7 @@ typedef enum {
     GBRunModeTurbo,
     GBRunModeRewind,
     GBRunModePaused,
+    GBRunModeUnderclock,
 } GBRunMode;
 
 @interface GBViewController : UIViewController <UIApplicationDelegate,

diff --git a/iOS/GBViewController.m b/iOS/GBViewController.m
@@ -60,6 +60,8 @@ @implementation GBViewController
     __weak GCController *_lastController;
 
     dispatch_queue_t _cameraQueue;
+
+    bool _runModeFromController;
 }
 
 static void loadBootROM(GB_gameboy_t *gb, GB_boot_rom_t type)
@@ -390,9 +392,14 @@ - (void)controller:(GCController *)controller buttonChanged:(GCControllerButtonI
                 if (button.isAnalog && [[NSUserDefaults standardUserDefaults] boolForKey:@"GBDynamicSpeed"]) {
                     GB_set_clock_multiplier(&_gb, (button.value - analogThreshold) / (1 - analogThreshold) * 3 + 1);
                 }
+                _runModeFromController = true;
+                [_backgroundView fadeOverlayOut];
             }
             else {
-                [self setRunMode:GBRunModeNormal];
+                if (self.runMode == GBRunModeTurbo && _runModeFromController) {
+                    [self setRunMode:GBRunModeNormal];
+                    _runModeFromController = false;
+                }
             }
             break;
         case GBRewind:
@@ -401,22 +408,30 @@ - (void)controller:(GCController *)controller buttonChanged:(GCControllerButtonI
                 if (button.isAnalog && [[NSUserDefaults standardUserDefaults] boolForKey:@"GBDynamicSpeed"]) {
                     GB_set_clock_multiplier(&_gb, (button.value - analogThreshold) / (1 - analogThreshold) * 4);
                 }
+                _runModeFromController = true;
+                [_backgroundView fadeOverlayOut];
             }
             else {
-                [self setRunMode:GBRunModeNormal];
+                if (self.runMode == GBRunModeRewind && _runModeFromController) {
+                    [self setRunMode:GBRunModeNormal];
+                    _runModeFromController = false;
+                }
             }
             break;
         case GBUnderclock:
             if (button.value > analogThreshold) {
+                [self setRunMode:GBRunModeUnderclock ignoreDynamicSpeed:!button.isAnalog];
                 if (button.isAnalog && [[NSUserDefaults standardUserDefaults] boolForKey:@"GBDynamicSpeed"]) {
                     GB_set_clock_multiplier(&_gb, 1 - ((button.value - analogThreshold) / (1 - analogThreshold) * 0.75));
                 }
-                else {
-                    GB_set_clock_multiplier(&_gb, 0.5);
-                }
+                _runModeFromController = true;
+                [_backgroundView fadeOverlayOut];
             }
             else {
-                GB_set_clock_multiplier(&_gb, 1.0);
+                if (self.runMode == GBRunModeUnderclock && _runModeFromController) {
+                    [self setRunMode:GBRunModeNormal];
+                    _runModeFromController = false;
+                }
             }
             break;
         default: break;
@@ -1030,6 +1045,10 @@ - (void)stop
         [_audioLock signal];
         [_audioLock unlock];
     }
+    dispatch_async(dispatch_get_main_queue(), ^{
+        self.runMode = GBRunModeNormal;
+        [_backgroundView fadeOverlayOut];
+    });
 }
 
 
@@ -1161,16 +1180,19 @@ - (void)setRunMode:(GBRunMode)runMode ignoreDynamicSpeed:(bool)ignoreDynamicSpee
         [_audioClient stop];
     }
 
-    if (_runMode == GBRunModeNormal || _runMode == GBRunModeTurbo) {
+    if (_runMode == GBRunModeNormal || _runMode == GBRunModeTurbo || _runMode == GBRunModeUnderclock) {
         _rewindOver = false;
     }
 
-    if (_runMode == GBRunModeNormal || !([[NSUserDefaults standardUserDefaults] boolForKey:@"GBDynamicSpeed"] && !ignoreDynamicSpeed)) {
+    if (_runMode == GBRunModeNormal  || _runMode == GBRunModeUnderclock || !([[NSUserDefaults standardUserDefaults] boolForKey:@"GBDynamicSpeed"] && !ignoreDynamicSpeed)) {
         if (_runMode == GBRunModeTurbo) {
             double multiplier = [[NSUserDefaults standardUserDefaults] doubleForKey:@"GBTurboSpeed"];
             GB_set_turbo_mode(&_gb, multiplier == 1, false);
             GB_set_clock_multiplier(&_gb, multiplier);
         }
+        else if (_runMode == GBRunModeUnderclock) {
+            GB_set_clock_multiplier(&_gb, 0.5);
+        }
         else {
             GB_set_turbo_mode(&_gb, false, false);
             GB_set_clock_multiplier(&_gb, 1.0);