From c83027b817ad547a2d1f70b2d2d59353b3ab05ec Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 19 Jun 2020 15:05:49 -0500 Subject: [PATCH] remove medium and large state enabled rewind options --- .../config/RewindConfig.cs | 4 -- .../config/ProfileConfig.cs | 4 -- .../config/RewindConfig.Designer.cs | 52 ------------------- .../config/RewindConfig.cs | 36 ------------- 4 files changed, 96 deletions(-) diff --git a/src/BizHawk.Client.Common/config/RewindConfig.cs b/src/BizHawk.Client.Common/config/RewindConfig.cs index 364f7d50d1..158b9bcd74 100644 --- a/src/BizHawk.Client.Common/config/RewindConfig.cs +++ b/src/BizHawk.Client.Common/config/RewindConfig.cs @@ -4,8 +4,6 @@ { public bool UseCompression { get; } public bool EnabledSmall { get; } - public bool EnabledMedium { get; } - public bool EnabledLarge { get; } public int BufferSize { get; } } @@ -13,8 +11,6 @@ { public bool UseCompression { get; set; } public bool EnabledSmall { get; set; } = true; - public bool EnabledMedium { get; set; } - public bool EnabledLarge { get; set; } public int BufferSize { get; set; } = 128; // in mb } } diff --git a/src/BizHawk.Client.EmuHawk/config/ProfileConfig.cs b/src/BizHawk.Client.EmuHawk/config/ProfileConfig.cs index acf3925c17..65c9c10883 100644 --- a/src/BizHawk.Client.EmuHawk/config/ProfileConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/ProfileConfig.cs @@ -101,8 +101,6 @@ namespace BizHawk.Client.EmuHawk _config.Savestates.MakeBackups = false; _config.Savestates.CompressionLevelNormal = 0; - _config.Rewind.EnabledLarge = false; - _config.Rewind.EnabledMedium = false; _config.Rewind.EnabledSmall = true; _config.SkipLagFrame = false; @@ -183,8 +181,6 @@ namespace BizHawk.Client.EmuHawk _config.Savestates.CompressionLevelNormal = 5; // Rewind - _config.Rewind.EnabledLarge = false; - _config.Rewind.EnabledMedium = false; _config.Rewind.EnabledSmall = false; // N64 diff --git a/src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs index c27c24b9b8..285096394e 100644 --- a/src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs @@ -34,11 +34,7 @@ this.SmallLabel = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.label10 = new System.Windows.Forms.Label(); - this.LargeStateEnabledBox = new System.Windows.Forms.CheckBox(); - this.MediumStateEnabledBox = new System.Windows.Forms.CheckBox(); this.SmallStateEnabledBox = new System.Windows.Forms.CheckBox(); - this.LargeLabel = new System.Windows.Forms.Label(); - this.MediumLabel = new System.Windows.Forms.Label(); this.UseCompression = new System.Windows.Forms.CheckBox(); this.label1 = new System.Windows.Forms.Label(); this.StateSizeLabel = new System.Windows.Forms.Label(); @@ -124,11 +120,7 @@ // groupBox1 // this.groupBox1.Controls.Add(this.label10); - this.groupBox1.Controls.Add(this.LargeStateEnabledBox); - this.groupBox1.Controls.Add(this.MediumStateEnabledBox); this.groupBox1.Controls.Add(this.SmallStateEnabledBox); - this.groupBox1.Controls.Add(this.LargeLabel); - this.groupBox1.Controls.Add(this.MediumLabel); this.groupBox1.Controls.Add(this.SmallLabel); this.groupBox1.Location = new System.Drawing.Point(12, 90); this.groupBox1.Name = "groupBox1"; @@ -146,26 +138,6 @@ this.label10.TabIndex = 0; this.label10.Text = "Enable"; // - // LargeStateEnabledBox - // - this.LargeStateEnabledBox.AutoSize = true; - this.LargeStateEnabledBox.Location = new System.Drawing.Point(9, 87); - this.LargeStateEnabledBox.Name = "LargeStateEnabledBox"; - this.LargeStateEnabledBox.Size = new System.Drawing.Size(15, 14); - this.LargeStateEnabledBox.TabIndex = 11; - this.LargeStateEnabledBox.UseVisualStyleBackColor = true; - this.LargeStateEnabledBox.CheckStateChanged += new System.EventHandler(this.LargeStateEnabledBox_CheckStateChanged); - // - // MediumStateEnabledBox - // - this.MediumStateEnabledBox.AutoSize = true; - this.MediumStateEnabledBox.Location = new System.Drawing.Point(9, 63); - this.MediumStateEnabledBox.Name = "MediumStateEnabledBox"; - this.MediumStateEnabledBox.Size = new System.Drawing.Size(15, 14); - this.MediumStateEnabledBox.TabIndex = 6; - this.MediumStateEnabledBox.UseVisualStyleBackColor = true; - this.MediumStateEnabledBox.CheckStateChanged += new System.EventHandler(this.MediumStateEnabledBox_CheckStateChanged); - // // SmallStateEnabledBox // this.SmallStateEnabledBox.AutoSize = true; @@ -176,26 +148,6 @@ this.SmallStateEnabledBox.UseVisualStyleBackColor = true; this.SmallStateEnabledBox.CheckStateChanged += new System.EventHandler(this.SmallStateEnabledBox_CheckStateChanged); // - // LargeLabel1 - // - this.LargeLabel.AutoSize = true; - this.LargeLabel.Location = new System.Drawing.Point(40, 88); - this.LargeLabel.Name = "LargeLabel"; - this.LargeLabel.Size = new System.Drawing.Size(179, 13); - this.LargeLabel.TabIndex = 12; - this.LargeLabel.Text = "Large savestates (more than 100KB)"; - this.LargeLabel.Click += new System.EventHandler(this.LargeLabel_Click); - // - // MediumLabel1 - // - this.MediumLabel.AutoSize = true; - this.MediumLabel.Location = new System.Drawing.Point(40, 64); - this.MediumLabel.Name = "MediumLabel"; - this.MediumLabel.Size = new System.Drawing.Size(160, 13); - this.MediumLabel.TabIndex = 7; - this.MediumLabel.Text = "Medium savestates (32 - 100KB)"; - this.MediumLabel.Click += new System.EventHandler(this.MediumLabel_Click); - // // UseCompression // this.UseCompression.AutoSize = true; @@ -660,11 +612,7 @@ private System.Windows.Forms.Button Cancel; private System.Windows.Forms.Label SmallLabel; private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label LargeLabel; - private System.Windows.Forms.Label MediumLabel; private System.Windows.Forms.Label label10; - private System.Windows.Forms.CheckBox LargeStateEnabledBox; - private System.Windows.Forms.CheckBox MediumStateEnabledBox; private System.Windows.Forms.CheckBox SmallStateEnabledBox; private System.Windows.Forms.CheckBox UseCompression; private System.Windows.Forms.Label label1; diff --git a/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs b/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs index dd4aed2c3d..d2c936239d 100644 --- a/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/RewindConfig.cs @@ -42,12 +42,8 @@ namespace BizHawk.Client.EmuHawk UseCompression.Checked = _config.Rewind.UseCompression; SmallStateEnabledBox.Checked = _config.Rewind.EnabledSmall; - MediumStateEnabledBox.Checked = _config.Rewind.EnabledMedium; - LargeStateEnabledBox.Checked = _config.Rewind.EnabledLarge; SetSmallEnabled(); - SetMediumEnabled(); - SetLargeEnabled(); SetStateSize(); @@ -123,8 +119,6 @@ namespace BizHawk.Client.EmuHawk // These settings are used by DoRewindSettings, which we'll only call if anything actually changed (i.e. preserve rewind history if possible) _config.Rewind.UseCompression = PutRewindSetting(_config.Rewind.UseCompression, UseCompression.Checked); _config.Rewind.EnabledSmall = PutRewindSetting(_config.Rewind.EnabledSmall, SmallStateEnabledBox.Checked); - _config.Rewind.EnabledMedium = PutRewindSetting(_config.Rewind.EnabledMedium, MediumStateEnabledBox.Checked); - _config.Rewind.EnabledLarge = PutRewindSetting(_config.Rewind.EnabledLarge, LargeStateEnabledBox.Checked); _config.Rewind.BufferSize = PutRewindSetting(_config.Rewind.BufferSize, (int)BufferSizeUpDown.Value); // These settings are not used by DoRewindSettings @@ -150,41 +144,11 @@ namespace BizHawk.Client.EmuHawk SmallLabel.Enabled = SmallStateEnabledBox.Checked; } - private void SetMediumEnabled() - { - MediumLabel.Enabled = MediumStateEnabledBox.Checked; - } - - private void SetLargeEnabled() - { - LargeLabel.Enabled = LargeStateEnabledBox.Checked; - } - private void SmallStateEnabledBox_CheckStateChanged(object sender, EventArgs e) { SetSmallEnabled(); } - private void MediumStateEnabledBox_CheckStateChanged(object sender, EventArgs e) - { - SetMediumEnabled(); - } - - private void LargeStateEnabledBox_CheckStateChanged(object sender, EventArgs e) - { - SetLargeEnabled(); - } - - private void LargeLabel_Click(object sender, EventArgs e) - { - LargeStateEnabledBox.Checked ^= true; - } - - private void MediumLabel_Click(object sender, EventArgs e) - { - MediumStateEnabledBox.Checked ^= true; - } - private void SmallLabel_Click(object sender, EventArgs e) { SmallStateEnabledBox.Checked ^= true;