empathicqubit/Mesen-SX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Video: Added integer (60.0 vs 60.1) FPS mode

Browse source
This commit is contained in:
Sour 2019-03-14 15:29:13 -04:00
parent 45f0f77d6b
commit fe7a1add99
3 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/Console.cpp
View file

@ -258,8 +258,8 @@ double Console::GetFrameDelay()
} else {
UpdateRegion();
switch(_region) {
case ConsoleRegion::Ntsc: frameDelay = 16.63926405550947; break;
case ConsoleRegion::Pal: frameDelay = 19.99720882631146; break;
case ConsoleRegion::Ntsc: frameDelay = _settings->GetVideoConfig().IntegerFpsMode ? 16.6666666666666666667 : 16.63926405550947; break;
case ConsoleRegion::Pal: frameDelay = _settings->GetVideoConfig().IntegerFpsMode ? 20 : 19.99720882631146; break;
}
frameDelay /= (emulationSpeed / 100.0);
}

20
UI/Forms/Config/frmVideoConfig.Designer.cs generated
View file

@ -41,7 +41,6 @@
this.lblCustomRatio = new System.Windows.Forms.Label();
this.nudCustomRatio = new Mesen.GUI.Controls.MesenNumericUpDown();
this.chkFullscreenForceIntegerScale = new System.Windows.Forms.CheckBox();
this.chkShowFps = new System.Windows.Forms.CheckBox();
this.chkIntegerFpsMode = new System.Windows.Forms.CheckBox();
this.flpRefreshRate = new System.Windows.Forms.FlowLayoutPanel();
this.lblRequestedRefreshRate = new System.Windows.Forms.Label();
@ -133,15 +132,13 @@
this.tlpMain.Controls.Add(this.nudScale, 1, 0);
this.tlpMain.Controls.Add(this.flowLayoutPanel6, 1, 1);
this.tlpMain.Controls.Add(this.chkFullscreenForceIntegerScale, 0, 6);
this.tlpMain.Controls.Add(this.chkShowFps, 0, 7);
this.tlpMain.Controls.Add(this.chkIntegerFpsMode, 0, 2);
this.tlpMain.Controls.Add(this.flpRefreshRate, 0, 5);
this.tlpMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.tlpMain.Location = new System.Drawing.Point(3, 3);
this.tlpMain.Margin = new System.Windows.Forms.Padding(0);
this.tlpMain.Name = "tlpMain";
this.tlpMain.RowCount = 9;
this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tlpMain.RowCount = 8;
this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle());
@ -314,19 +311,6 @@
this.chkFullscreenForceIntegerScale.UseVisualStyleBackColor = true;
this.chkFullscreenForceIntegerScale.Visible = false;
//
// chkShowFps
//
this.chkShowFps.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.chkShowFps.AutoSize = true;
this.tlpMain.SetColumnSpan(this.chkShowFps, 2);
this.chkShowFps.Location = new System.Drawing.Point(3, 169);
this.chkShowFps.Name = "chkShowFps";
this.chkShowFps.Size = new System.Drawing.Size(76, 17);
this.chkShowFps.TabIndex = 9;
this.chkShowFps.Text = "Show FPS";
this.chkShowFps.UseVisualStyleBackColor = true;
this.chkShowFps.Visible = false;
//
// chkIntegerFpsMode
//
this.chkIntegerFpsMode.Anchor = System.Windows.Forms.AnchorStyles.Left;
@ -338,7 +322,6 @@
this.chkIntegerFpsMode.TabIndex = 24;
this.chkIntegerFpsMode.Text = "Enable integer FPS mode (e.g: run at 60 fps instead of 60.1)";
this.chkIntegerFpsMode.UseVisualStyleBackColor = true;
this.chkIntegerFpsMode.Visible = false;
//
// flpRefreshRate
//
@ -863,7 +846,6 @@
private System.Windows.Forms.Label lblCustomRatio;
private Controls.MesenNumericUpDown nudCustomRatio;
private System.Windows.Forms.CheckBox chkFullscreenForceIntegerScale;
private System.Windows.Forms.CheckBox chkShowFps;
private System.Windows.Forms.CheckBox chkIntegerFpsMode;
private System.Windows.Forms.FlowLayoutPanel flpRefreshRate;
private System.Windows.Forms.Label lblRequestedRefreshRate;

1
UI/Forms/Config/frmVideoConfig.cs
View file

@ -22,7 +22,6 @@ namespace Mesen.GUI.Forms.Config
Entity = ConfigManager.Config.Video.Clone();
//AddBinding(nameof(VideoConfig.ShowFPS), chkShowFps);
AddBinding(nameof(VideoConfig.UseBilinearInterpolation), chkBilinearInterpolation);
AddBinding(nameof(VideoConfig.VerticalSync), chkVerticalSync);
AddBinding(nameof(VideoConfig.IntegerFpsMode), chkIntegerFpsMode);