add frame skip to preferences

tooncoon · Sep 13, 2020 · a8921f4 · a8921f4
1 parent 7d6a63f
commit a8921f4
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 20 deletions.
diff --git a/macosx/Snes9x/AppDelegate.h b/macosx/Snes9x/AppDelegate.h
@@ -41,6 +41,7 @@
 - (BOOL)getValuesFromString:(NSString *)str cookie:(uint32 *)cookie value:(int32 *)value;
 
 - (void)setVideoMode:(int)videoMode;
+- (void)setMacFrameSkip:(int)_macFrameSkip;
 - (void)setShowFPS:(BOOL)showFPS;
 
 @end

diff --git a/macosx/Snes9x/AppDelegate.m b/macosx/Snes9x/AppDelegate.m
@@ -119,7 +119,8 @@ - (void)setupDefaults
             @(kKeyTC).stringValue : @(kVK_ANSI_Comma)
         },
         kShowFPSPref: @(NO),
-        kVideoModePref:@(VIDEOMODE_BLOCKY)
+        kVideoModePref:@(VIDEOMODE_BLOCKY),
+        kMacFrameSkipPref:@(macFrameSkip)
     };
 
     [defaults registerDefaults:defaultSettings];
@@ -513,6 +514,13 @@ - (void)setVideoMode:(int)videoMode
     [NSUserDefaults.standardUserDefaults synchronize];
 }
 
+- (void)setMacFrameSkip:(int)_macFrameSkip
+{
+    [self.s9xEngine setMacFrameSkip:_macFrameSkip];
+    [NSUserDefaults.standardUserDefaults setObject:@(_macFrameSkip) forKey:kMacFrameSkipPref];
+    [NSUserDefaults.standardUserDefaults synchronize];
+}
+
 - (void)setShowFPS:(BOOL)showFPS
 {
     [self.s9xEngine setShowFPS:showFPS];

diff --git a/macosx/Snes9x/S9xPrefsConstants.h b/macosx/Snes9x/S9xPrefsConstants.h
@@ -25,3 +25,4 @@ extern NSString * const kJoypadInputPrefs;
 extern NSString * const kJoypadPlayerPrefs;
 extern NSString * const kShowFPSPref;
 extern NSString * const kVideoModePref;
+extern NSString * const kMacFrameSkipPref;
diff --git a/macosx/Snes9x/S9xPrefsConstants.m b/macosx/Snes9x/S9xPrefsConstants.m
@@ -25,3 +25,4 @@ SNES9X for Mac OS (c) Copyright John Stiles
 NSString * const kJoypadPlayerPrefs = @"JoypadPlayers";
 NSString * const kShowFPSPref = @"ShowFPS";
 NSString * const kVideoModePref = @"VideoMode";
+NSString * const kMacFrameSkipPref = @"MacFrameSkip";
diff --git a/macosx/Snes9x/S9xPrefsViewController.m b/macosx/Snes9x/S9xPrefsViewController.m
@@ -30,6 +30,7 @@ @interface S9xPrefsViewController ()
 @property (nonatomic, weak) IBOutlet NSButton *showFPSCheckbox;
 @property (nonatomic, weak) IBOutlet NSPopUpButton *devicePopUp;
 @property (nonatomic, weak) IBOutlet NSPopUpButton *playerPopUp;
+@property (nonatomic, weak) IBOutlet NSTextField *macFrameSkipTextField;
 @end
 
 @implementation S9xPrefsViewController
@@ -103,6 +104,11 @@ - (void)refresh
 {
     NSUInteger index = MIN([NSUserDefaults.standardUserDefaults integerForKey:kVideoModePref], 1);
     [self.videoModePopup selectItemAtIndex:index];
+
+	// set maxFrameSkipTextField to user default
+    NSInteger macFrameSkipDefault = [NSUserDefaults.standardUserDefaults integerForKey:kMacFrameSkipPref];
+    [self.macFrameSkipTextField setIntegerValue:macFrameSkipDefault];
+
     self.showFPSCheckbox.state = [NSUserDefaults.standardUserDefaults boolForKey:kShowFPSPref];
 
     if (self.devicePopUp.selectedItem.tag < 0)
@@ -271,6 +277,13 @@ - (IBAction)setVideoMode:(NSPopUpButton *)sender
     [appDelegate setVideoMode:(int)sender.selectedTag];
 }
 
+- (IBAction)setMacFrameSkip:(NSTextField *)sender
+{
+    AppDelegate *appDelegate = (AppDelegate *)NSApp.delegate;
+	[appDelegate setMacFrameSkip:(int)sender.integerValue];
+	NSLog(@"setMacFrameSkip %ld", sender.integerValue);
+}
+
 - (BOOL)handleInput:(S9xJoypadInput *)input fromJoypad:(S9xJoypad *)joypad
 {
     id firstResponder = self.view.window.firstResponder;
@@ -293,5 +306,18 @@ - (BOOL)handleInput:(S9xJoypadInput *)input fromJoypad:(S9xJoypad *)joypad
 
     return NO;
 }
-
+- (IBAction) bumpMacFrameSkip:(id)sender
+{
+    int bumpValue = [sender intValue];   // 1 or -1
+	[self.macFrameSkipTextField setIntegerValue:[self.macFrameSkipTextField integerValue] + bumpValue];
+
+	// constrain value
+	if ([self.macFrameSkipTextField integerValue] < -1)
+		[self.macFrameSkipTextField setIntegerValue: -1];
+	if ([self.macFrameSkipTextField integerValue] > 200)
+		[self.macFrameSkipTextField setIntegerValue: 200];
+
+	[sender setIntValue:0];	// reset stepper value
+	[self setMacFrameSkip:self.macFrameSkipTextField]; // execute setter
+}
 @end
diff --git a/macosx/Snes9x/S9xPrefsViewController.xib b/macosx/Snes9x/S9xPrefsViewController.xib
diff --git a/macosx/mac-os.h b/macosx/mac-os.h
@@ -192,6 +192,7 @@ extern id<S9xInputDelegate> inputDelegate;
 - (BOOL)loadROM:(NSURL *)fileURL;
 
 - (void)setVideoMode:(int)videoMode;
+- (void)setMacFrameSkip:(int)_macFrameSkip;
 - (void)setShowFPS:(BOOL)showFPS;
 
 @end

diff --git a/macosx/mac-os.mm b/macosx/mac-os.mm
@@ -3235,6 +3235,17 @@ - (void)setVideoMode:(int)mode
     videoMode = mode;
 }
 
+- (void)setMacFrameSkip:(int)_macFrameSkip
+{
+    macFrameSkip = _macFrameSkip;
+
+	// contrains to -1 to 200
+	if (macFrameSkip < -1)
+		macFrameSkip = -1;
+	if (macFrameSkip > 200)
+		macFrameSkip = 200;
+}
+
 @dynamic inputDelegate;
 - (void)setInputDelegate:(id<S9xInputDelegate>)delegate
 {

diff --git a/macosx/mac-render.mm b/macosx/mac-render.mm
@@ -297,6 +297,10 @@ void S9xPutImage (int width, int height)
         for (int i = 0; i < 60; i++)
             frameCalc += drawnFrames[i];
 
+		// avoid dividing by 0
+		if (frameCalc == 0)
+			frameCalc = 1;
+
         IPPU.DisplayedRenderedFrameCount = (Memory.ROMFramesPerSecond * 60) / frameCalc;
     }
 
@@ -408,4 +412,4 @@ void S9xTextMode (void)
 void S9xGraphicsMode (void)
 {
 	return;
-}
+}