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

Rewind - UI for toggling threading

This commit is contained in:
adelikat 2013-07-30 01:30:59 +00:00
parent f3eb9e7fc7
commit 7df7a5e803
4 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/Config.cs
View File

@ -237,6 +237,7 @@ namespace BizHawk.MultiClient
public int Rewind_LargeStateSize = 1048576; //1mb
public int Rewind_BufferSize = 128; //in mb
public bool Rewind_OnDisk = false;
public bool Rewind_IsThreaded = false;
/// <summary>use vsync. if VSyncThrottle = false, this will try to use vsync without throttling to it</summary>
public bool VSync = false;

5
BizHawk.MultiClient/Rewind.cs
View File

@ -251,8 +251,9 @@ namespace BizHawk.MultiClient
MainForm mf;
public RewindThreader(MainForm mf)
public RewindThreader(MainForm mf, bool isThreaded)
{
IsThreaded = isThreaded;
this.mf = mf;
if (IsThreaded)
@ -405,7 +406,7 @@ namespace BizHawk.MultiClient
RewindBuf = new StreamBlobDatabase(Global.Config.Rewind_OnDisk, cap);
if (RewindThread != null)
RewindThread.Dispose();
RewindThread = new RewindThreader(this);
RewindThread = new RewindThreader(this, Global.Config.Rewind_IsThreaded);
// This is the first frame. Capture the state, and put it in LastState for future deltas to be compared against.
LastState = Global.Emulator.SaveStateBinary();

33
BizHawk.MultiClient/config/RewindConfig.Designer.cs generated
View File

@ -65,6 +65,7 @@
this.BufferSizeUpDown = new System.Windows.Forms.NumericUpDown();
this.label3 = new System.Windows.Forms.Label();
this.DiskBufferCheckbox = new System.Windows.Forms.CheckBox();
this.RewindIsThreadedCheckbox = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.LargeSavestateNumeric)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.MediumSavestateNumeric)).BeginInit();
@ -81,7 +82,7 @@
// OK
//
this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.OK.Location = new System.Drawing.Point(215, 369);
this.OK.Location = new System.Drawing.Point(215, 389);
this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 0;
@ -93,7 +94,7 @@
//
this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.Cancel.Location = new System.Drawing.Point(296, 369);
this.Cancel.Location = new System.Drawing.Point(296, 389);
this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 1;
@ -131,7 +132,7 @@
this.groupBox1.Controls.Add(this.SmallLabel3);
this.groupBox1.Controls.Add(this.SmallSavestateNumeric);
this.groupBox1.Controls.Add(this.SmallLabel1);
this.groupBox1.Location = new System.Drawing.Point(12, 128);
this.groupBox1.Location = new System.Drawing.Point(12, 154);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(359, 118);
this.groupBox1.TabIndex = 3;
@ -320,7 +321,7 @@
// UseDeltaCompression
//
this.UseDeltaCompression.AutoSize = true;
this.UseDeltaCompression.Location = new System.Drawing.Point(9, 39);
this.UseDeltaCompression.Location = new System.Drawing.Point(9, 38);
this.UseDeltaCompression.Name = "UseDeltaCompression";
this.UseDeltaCompression.Size = new System.Drawing.Size(133, 17);
this.UseDeltaCompression.TabIndex = 4;
@ -370,7 +371,7 @@
this.groupBox2.Controls.Add(this.MediumStateSizeLabel);
this.groupBox2.Controls.Add(this.label2);
this.groupBox2.Controls.Add(this.MediumStateTrackbar);
this.groupBox2.Location = new System.Drawing.Point(12, 252);
this.groupBox2.Location = new System.Drawing.Point(12, 278);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(359, 105);
this.groupBox2.TabIndex = 8;
@ -476,6 +477,7 @@
//
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.RewindIsThreadedCheckbox);
this.groupBox3.Controls.Add(this.label4);
this.groupBox3.Controls.Add(this.BufferSizeUpDown);
this.groupBox3.Controls.Add(this.label3);
@ -483,14 +485,14 @@
this.groupBox3.Controls.Add(this.UseDeltaCompression);
this.groupBox3.Location = new System.Drawing.Point(12, 25);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(359, 97);
this.groupBox3.Size = new System.Drawing.Size(359, 123);
this.groupBox3.TabIndex = 9;
this.groupBox3.TabStop = false;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(148, 70);
this.label4.Location = new System.Drawing.Point(148, 86);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(21, 13);
this.label4.TabIndex = 16;
@ -498,7 +500,7 @@
//
// BufferSizeUpDown
//
this.BufferSizeUpDown.Location = new System.Drawing.Point(90, 68);
this.BufferSizeUpDown.Location = new System.Drawing.Point(90, 84);
this.BufferSizeUpDown.Maximum = new decimal(new int[] {
32768,
0,
@ -521,7 +523,7 @@
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(11, 70);
this.label3.Location = new System.Drawing.Point(11, 86);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(81, 13);
this.label3.TabIndex = 6;
@ -537,13 +539,23 @@
this.DiskBufferCheckbox.Text = "Use disk for buffer instead of RAM";
this.DiskBufferCheckbox.UseVisualStyleBackColor = true;
//
// RewindIsThreadedCheckbox
//
this.RewindIsThreadedCheckbox.AutoSize = true;
this.RewindIsThreadedCheckbox.Location = new System.Drawing.Point(9, 60);
this.RewindIsThreadedCheckbox.Name = "RewindIsThreadedCheckbox";
this.RewindIsThreadedCheckbox.Size = new System.Drawing.Size(111, 17);
this.RewindIsThreadedCheckbox.TabIndex = 17;
this.RewindIsThreadedCheckbox.Text = "Threaded Rewind";
this.RewindIsThreadedCheckbox.UseVisualStyleBackColor = true;
//
// RewindConfig
//
this.AcceptButton = this.OK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.Cancel;
this.ClientSize = new System.Drawing.Size(383, 404);
this.ClientSize = new System.Drawing.Size(383, 424);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.StateSizeLabel);
@ -612,5 +624,6 @@
private System.Windows.Forms.Label label4;
private System.Windows.Forms.NumericUpDown BufferSizeUpDown;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.CheckBox RewindIsThreadedCheckbox;
}
}

8
BizHawk.MultiClient/config/RewindConfig.cs
View File

@ -18,7 +18,7 @@ namespace BizHawk.MultiClient
private void RewindConfig_Load(object sender, EventArgs e)
{
StateSize = Global.Emulator.SaveStateBinary().Length;
RewindIsThreadedCheckbox.Checked = Global.Config.Rewind_IsThreaded;
DiskBufferCheckbox.Checked = Global.Config.Rewind_OnDisk;
BufferSizeUpDown.Value = Global.Config.Rewind_BufferSize;
@ -106,6 +106,12 @@ namespace BizHawk.MultiClient
Global.Config.Rewind_LargeStateSize = (int)(LargeStateUpDown.Value * 1024);
Global.Config.Rewind_OnDisk = DiskBufferCheckbox.Checked;
Global.Config.Rewind_BufferSize = (int)BufferSizeUpDown.Value;
if (Global.Config.Rewind_IsThreaded != RewindIsThreadedCheckbox.Checked)
{
Global.MainForm.FlagNeedsReboot();
Global.Config.Rewind_IsThreaded = RewindIsThreadedCheckbox.Checked;
}
Close();
}