From 63533888ad735372502bcf5d5bd0b889104477e8 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 19 Jun 2020 14:47:25 -0500 Subject: [PATCH] Rewind config - remove on disk option --- .../config/RewindConfig.cs | 3 -- .../config/RewindConfig.Designer.cs | 31 ++----------------- .../config/RewindConfig.cs | 2 -- 3 files changed, 2 insertions(+), 34 deletions(-) diff --git a/src/BizHawk.Client.Common/config/RewindConfig.cs b/src/BizHawk.Client.Common/config/RewindConfig.cs index 2a73dd316c..f7462ad941 100644 --- a/src/BizHawk.Client.Common/config/RewindConfig.cs +++ b/src/BizHawk.Client.Common/config/RewindConfig.cs @@ -10,7 +10,6 @@ public int FrequencyMedium { get; } public int FrequencyLarge { get; } public int BufferSize { get; } - public bool OnDisk { get; } } public class RewindConfig : IRewindSettings @@ -24,8 +23,6 @@ public int FrequencyLarge { get; set; } = 60; public int BufferSize { get; set; } = 128; // in mb - public bool OnDisk { get; set; } - public int SpeedMultiplier { get; set; } = 1; } } diff --git a/src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs index 7684f0782c..4419140349 100644 --- a/src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs @@ -55,11 +55,9 @@ this.label19 = new System.Windows.Forms.Label(); this.RewindSpeedNumeric = new System.Windows.Forms.NumericUpDown(); this.label18 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.BufferSizeUpDown = new System.Windows.Forms.NumericUpDown(); this.label3 = new System.Windows.Forms.Label(); - this.DiskBufferCheckbox = new System.Windows.Forms.CheckBox(); this.label6 = new System.Windows.Forms.Label(); this.FullnessLabel = new System.Windows.Forms.Label(); this.groupBox4 = new System.Windows.Forms.GroupBox(); @@ -379,11 +377,9 @@ this.groupBox3.Controls.Add(this.label19); this.groupBox3.Controls.Add(this.RewindSpeedNumeric); this.groupBox3.Controls.Add(this.label18); - this.groupBox3.Controls.Add(this.label17); this.groupBox3.Controls.Add(this.label4); this.groupBox3.Controls.Add(this.BufferSizeUpDown); this.groupBox3.Controls.Add(this.label3); - this.groupBox3.Controls.Add(this.DiskBufferCheckbox); this.groupBox3.Controls.Add(this.UseCompression); this.groupBox3.Location = new System.Drawing.Point(12, 214); this.groupBox3.Name = "groupBox3"; @@ -431,16 +427,7 @@ this.label18.Size = new System.Drawing.Size(78, 13); this.label18.TabIndex = 0; this.label18.Text = "Rewind speed:"; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(6, 47); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(278, 13); - this.label17.TabIndex = 3; - this.label17.Text = "These options affect rewind performance in various ways:"; - // + // // label4 // this.label4.AutoSize = true; @@ -481,19 +468,7 @@ this.label3.Size = new System.Drawing.Size(81, 13); this.label3.TabIndex = 7; this.label3.Text = "Max buffer size:"; - // - // DiskBufferCheckbox - // - this.DiskBufferCheckbox.AutoSize = true; - this.DiskBufferCheckbox.Location = new System.Drawing.Point(16, 67); - this.DiskBufferCheckbox.Name = "DiskBufferCheckbox"; - this.DiskBufferCheckbox.Size = new System.Drawing.Size(188, 17); - this.DiskBufferCheckbox.TabIndex = 4; - this.DiskBufferCheckbox.Text = "Use disk for buffer instead of RAM"; - this.toolTip1.SetToolTip(this.DiskBufferCheckbox, "To support a longer rewind buffer, you can choose to have it stored on your disk." + - " Where, precisely? Not sure. Probably %TEMP%"); - this.DiskBufferCheckbox.UseVisualStyleBackColor = true; - // + // // label6 // this.label6.AutoSize = true; @@ -888,7 +863,6 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Label StateSizeLabel; private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.CheckBox DiskBufferCheckbox; private System.Windows.Forms.Label label4; private System.Windows.Forms.NumericUpDown BufferSizeUpDown; private System.Windows.Forms.Label label3; @@ -912,7 +886,6 @@ private System.Windows.Forms.Button btnResetCompression; private System.Windows.Forms.GroupBox groupBox7; private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label17; private System.Windows.Forms.Label KbLabel; private System.Windows.Forms.NumericUpDown BigScreenshotNumeric; private System.Windows.Forms.CheckBox LowResLargeScreenshotsCheckbox; diff --git a/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs b/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs index 8deb6a9791..c9d02d1410 100644 --- a/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs @@ -38,7 +38,6 @@ namespace BizHawk.Client.EmuHawk } RewindSpeedNumeric.Value = _config.Rewind.SpeedMultiplier; - DiskBufferCheckbox.Checked = _config.Rewind.OnDisk; _stateSize = _statableCore.CloneSavestate().Length; BufferSizeUpDown.Value = Math.Max(_config.Rewind.BufferSize, BufferSizeUpDown.Minimum); @@ -137,7 +136,6 @@ namespace BizHawk.Client.EmuHawk _config.Rewind.FrequencyMedium = PutRewindSetting(_config.Rewind.FrequencyMedium, (int)MediumSavestateNumeric.Value); _config.Rewind.FrequencyLarge = PutRewindSetting(_config.Rewind.FrequencyLarge, (int)LargeSavestateNumeric.Value); _config.Rewind.BufferSize = PutRewindSetting(_config.Rewind.BufferSize, (int)BufferSizeUpDown.Value); - _config.Rewind.OnDisk = PutRewindSetting(_config.Rewind.OnDisk, DiskBufferCheckbox.Checked); // These settings are not used by DoRewindSettings _config.Rewind.SpeedMultiplier = (int)RewindSpeedNumeric.Value;