ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rewind - rename Small state enable to just enabled

This commit is contained in:
adelikat 2020-06-19 15:09:59 -05:00
parent c83027b817
commit 392611d6c6
5 changed files with 523 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BizHawk.Client.Common/config/RewindConfig.cs
View File

@ -3,14 +3,14 @@
public interface IRewindSettings
{
public bool UseCompression { get; }
public bool EnabledSmall { get; }
public bool Enabled { get; }
public int BufferSize { get; }
}
public class RewindConfig : IRewindSettings
{
public bool UseCompression { get; set; }
public bool EnabledSmall { get; set; } = true;
public bool Enabled { get; set; } = true;
public int BufferSize { get; set; } = 128; // in mb
}
}

2
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -865,7 +865,7 @@ namespace BizHawk.Client.EmuHawk
public void CreateRewinder()
{
Rewinder?.Dispose();
Rewinder = Emulator.HasSavestates() && Config.Rewind.EnabledSmall // TODO: replace this with just a single "enabled"
Rewinder = Emulator.HasSavestates() && Config.Rewind.Enabled
? new Zwinder(600, Emulator.AsStatable(), Config.Rewind)
: null;
}

4
src/BizHawk.Client.EmuHawk/config/ProfileConfig.cs
View File

@ -101,7 +101,7 @@ namespace BizHawk.Client.EmuHawk
_config.Savestates.MakeBackups = false;
_config.Savestates.CompressionLevelNormal = 0;
_config.Rewind.EnabledSmall = true;
_config.Rewind.Enabled = true;
_config.SkipLagFrame = false;
// N64
@ -181,7 +181,7 @@ namespace BizHawk.Client.EmuHawk
_config.Savestates.CompressionLevelNormal = 5;
// Rewind
_config.Rewind.EnabledSmall = false;
_config.Rewind.Enabled = false;
// N64
var n64Settings = GetSyncSettings<N64, N64SyncSettings>();

1059
src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

30
src/BizHawk.Client.EmuHawk/config/RewindConfig.cs
View File

@ -41,9 +41,7 @@ namespace BizHawk.Client.EmuHawk
UseCompression.Checked = _config.Rewind.UseCompression;
SmallStateEnabledBox.Checked = _config.Rewind.EnabledSmall;
SetSmallEnabled();
RewindEnabledBox.Checked = _config.Rewind.Enabled;
SetStateSize();
@ -84,15 +82,6 @@ namespace BizHawk.Client.EmuHawk
private void SetStateSize()
{
StateSizeLabel.Text = FormatKB(_stateSize);
SmallLabel.Text = "Small savestates";
MediumLabel.Text = "Medium savestates";
LargeLabel.Text = "Large savestates";
SmallLabel.Font = new Font(SmallLabel.Font, FontStyle.Italic);
MediumLabel.Font = new Font(SmallLabel.Font, FontStyle.Regular);
LargeLabel.Font = new Font(SmallLabel.Font, FontStyle.Regular);
CalculateEstimates();
}
@ -118,7 +107,7 @@ 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.Enabled = PutRewindSetting(_config.Rewind.Enabled, RewindEnabledBox.Checked);
_config.Rewind.BufferSize = PutRewindSetting(_config.Rewind.BufferSize, (int)BufferSizeUpDown.Value);
// These settings are not used by DoRewindSettings
@ -139,21 +128,6 @@ namespace BizHawk.Client.EmuHawk
Close();
}
private void SetSmallEnabled()
{
SmallLabel.Enabled = SmallStateEnabledBox.Checked;
}
private void SmallStateEnabledBox_CheckStateChanged(object sender, EventArgs e)
{
SetSmallEnabled();
}
private void SmallLabel_Click(object sender, EventArgs e)
{
SmallStateEnabledBox.Checked ^= true;
}
private void CalculateEstimates()
{
long avgStateSize;